Commit Graph

94 Commits

Author SHA1 Message Date
ilya-bkv
6e21d0640b Merge remote-tracking branch 'origin/dev' into prepare-inbox
# Conflicts:
#	src/components/Inbox/Message.module.scss
#	src/components/Views/Inbox.tsx
#	src/styles/Inbox.scss
#	src/utils/config.ts
2022-11-21 08:38:34 +03:00
ilya-bkv
ad55c1972b [WIP] Refactor message card 2022-11-21 08:06:53 +03:00
Igor Lobanov
46b4ecc7ea catch up with backend refactoring 2022-11-18 03:23:04 +01:00
528d0273e5 config 2022-11-17 09:33:24 +03:00
ilya-bkv
d504e02ccb WIP 2022-11-16 22:38:16 +03:00
251177374b codegened 2022-11-16 19:38:36 +03:00
b5c0eb88fe fix-queries 2022-11-16 10:42:43 +03:00
0c0084365d wip-refactoring 2022-11-16 09:34:22 +03:00
f0f944e31a apifix 2022-11-15 19:59:27 +03:00
da09e084c1 working 2022-11-15 19:50:15 +03:00
2813fe9766 apiurl 2022-11-15 18:28:57 +03:00
a69ce90f2d layouts-apifixed 2022-11-15 18:27:02 +03:00
39aec90013 merging 2022-11-15 17:24:50 +03:00
ilya-bkv
724ab4717d Merge with dev 2022-11-15 15:48:42 +03:00
3831b148a9 merge-wip-prepare-inbox 2022-11-15 15:15:07 +03:00
ilya-bkv
16dfe9d57b Merge remote-tracking branch 'origin/dev' into prepare-inbox
# Conflicts:
#	src/components/Nav/AuthModal/ForgotPasswordForm.tsx
#	src/graphql/types.gen.ts
#	src/stores/auth.ts
#	src/utils/apiClient.ts
#	src/utils/config.ts
2022-11-15 15:14:19 +03:00
9164383fa3 new-api-refactoring 2022-11-15 15:05:56 +03:00
ilya-bkv
8e88d2a68b Create chat 2022-11-15 12:45:55 +03:00
bfd931f98f public-env 2022-11-14 22:01:03 +03:00
4c0cd1b0bb env-name 2022-11-14 20:53:12 +03:00
843912b95d postmerge-fixes 2022-11-14 20:41:05 +03:00
9965a21e6b linter-pass 2022-11-14 20:09:51 +03:00
63bbd38db2 -config-fix 2022-11-14 19:56:11 +03:00
ilya-bkv
b5c2684721 update markup 2022-11-14 12:50:27 +03:00
88efe043d5 Merge branch 'prepare-inbox' of github.com:Discours/discoursio-webapp into layouts 2022-11-14 12:48:26 +03:00
faab8ad544 Soundwave component 2022-11-14 12:30:20 +03:00
Igor Lobanov
269f7328d8 testapi -> newapi 2022-11-14 09:24:20 +01:00
9e04595b3e ackee-test 2022-11-14 09:52:08 +03:00
10e6938b11 tracker-script 2022-11-14 09:28:46 +03:00
Igor Lobanov
f66015cd77 more error handling 2022-11-14 02:17:12 +01:00
11874c6c1d auth context
topic page fix, getAuthor, getTopic
newapi -> testapi
fixes
2022-11-14 01:09:20 +01:00
42489bb297 fixed 2022-11-13 15:14:04 +03:00
28f52ba745 refactoring-wpi 2022-11-13 12:25:31 +03:00
405fbb4db1 layout upgrade 2022-11-12 21:59:29 +03:00
30fe44979e wip-layouts 2022-11-12 21:14:20 +03:00
Igor Lobanov
a169fc3b81 fixes and lint 2022-11-10 16:17:57 +01:00
Igor Lobanov
31d837eca2 New editor WIP 2022-11-10 16:00:38 +01:00
3af9f5d7e4 Merge remote-tracking branch 'origin/dev' into prepare-inbox 2022-11-03 08:06:51 +03:00
Igor Lobanov
d903f233cf
Merge pull request #48 from Discours/editor2
Editor 2
2022-11-02 19:03:02 +01:00
6b53746c5f fixed-api 2022-11-02 16:44:00 +03:00
416a3f0ad5 Merge branch 'auth' into testing 2022-11-02 10:11:13 +03:00
62fe2c8484 fixes 2022-11-02 10:10:44 +03:00
5fc3596a65 Merge branch 'auth' into testing 2022-11-02 09:56:45 +03:00
ef4fc43d72 fix-sendlink-response 2022-11-02 09:56:01 +03:00
23bb1c193c fixconfig 2022-11-02 09:26:07 +03:00
12f30b29a0 merged-dev 2022-11-02 01:29:08 +03:00
1c38fc124b forget password send link, localized 2022-11-02 01:25:18 +03:00
Igor Lobanov
0f0b2645aa editor styles isolated, editor sidebar esc and outside click handling 2022-11-01 23:05:08 +01:00
Igor Lobanov
5bcef1d1e2 Merge remote-tracking branch 'origin/dev' into editor
# Conflicts:
#	src/components/Feed/Row3.tsx
#	src/components/Nav/AuthModal/EmailConfirm.tsx
#	src/components/Nav/AuthModal/ForgotPasswordForm.tsx
#	src/components/Nav/AuthModal/LoginForm.tsx
#	src/components/Nav/AuthModal/RegisterForm.tsx
#	src/components/Nav/AuthModal/index.tsx
#	src/components/Nav/Header.tsx
#	src/components/Nav/Modal.tsx
#	src/components/Nav/Popup.tsx
#	src/components/Nav/Private.tsx
#	src/components/Root.tsx
#	src/components/Topic/Card.tsx
#	src/components/Views/AllAuthors.tsx
#	src/components/Views/Author.tsx
#	src/components/Views/Home.tsx
#	src/components/Views/Topic.tsx
#	src/graphql/mutation/auth-confirm-email.ts
#	src/locales/ru.json
#	src/pages/welcome.astro
#	src/stores/auth.ts
#	src/stores/ui.ts
#	src/stores/zine/authors.ts
#	src/utils/apiClient.ts
#	src/utils/config.ts
2022-10-31 14:06:32 +01:00
Igor Lobanov
4d69749f55 logger restored 2022-10-31 13:49:41 +01:00