Commit Graph

530 Commits

Author SHA1 Message Date
3c1b2ef550 merged-dev 2022-11-26 01:54:56 +03:00
1a97852efb loadchats-api 2022-11-26 00:47:13 +03:00
ae1203f5b9 session api upgrade 2022-11-25 19:24:36 +03:00
7224b87797 Merge branch 'dev' of github.com:Discours/discoursio-webapp into dev 2022-11-25 16:30:06 +03:00
Igor Lobanov
7bd9320d24 fixes 2022-11-25 12:03:51 +01:00
Igor Lobanov
539c0454ff author loading fix 2022-11-25 10:38:40 +01:00
2831d0015f fix-author-page 2022-11-25 11:24:07 +03:00
a15069120b lintable 2022-11-25 11:19:04 +03:00
54817e506d inbox api fixes 2022-11-25 10:36:45 +03:00
4071af4b82 lint 2022-11-25 10:25:06 +03:00
aea582cf5e all-authors-topics-stat-fixes 2022-11-25 08:54:19 +03:00
b0f4f92aa9 Profile settings 2022-11-25 00:37:43 +03:00
451602beb5 new-types 2022-11-24 21:24:42 +03:00
ilya-bkv
b46603c553 Merge remote-tracking branch 'origin/prepare-inbox' into prepare-inbox 2022-11-24 18:39:43 +03:00
ilya-bkv
abd18c24a2 init inbox context 2022-11-24 18:39:31 +03:00
e398e6c373 getSession 2022-11-24 17:59:37 +03:00
ilya-bkv
de061f4793 Merge remote-tracking branch 'origin/prepare-inbox' into prepare-inbox 2022-11-24 15:58:17 +03:00
ilya-bkv
e2679ce6b1 Wip 2022-11-24 15:58:07 +03:00
6bb9e2a674 try-envs 2022-11-24 15:54:34 +03:00
88b4e2bb60 s3-fixes 2022-11-24 15:47:04 +03:00
866cf3c559 aws s3 uploader 2022-11-24 12:50:30 +03:00
ilya-bkv
9af56f3425 Merge remote-tracking branch 'origin/prepare-inbox' into prepare-inbox
# Conflicts:
#	src/stores/inbox.ts
2022-11-24 12:08:56 +03:00
ilya-bkv
68ac7b82ba Wip 2022-11-24 12:07:52 +03:00
07f3a65c40 update-api 2022-11-24 12:06:48 +03:00
1054dee23d merged 2022-11-24 11:07:56 +03:00
7a6b028d1b Merge branch 'prepare-inbox' into prepare-comments 2022-11-24 11:04:48 +03:00
fe066b7e3f fixed-comments 2022-11-24 10:33:16 +03:00
ilya-bkv
11cbdd47af Linter fix 2022-11-24 10:11:24 +03:00
ilya-bkv
6a94474732 Resolve Conversation 2022-11-24 09:52:31 +03:00
ilya-bkv
271e67f305 [WIP] cleanup 2022-11-24 08:38:44 +03:00
Igor Lobanov
e8df43bfb5 Merge remote-tracking branch 'origin/dev' into prepare-inbox 2022-11-23 23:47:55 +01:00
48153582fe Merge remote-tracking branch 'origin/dev' into prepare-comments 2022-11-24 00:10:51 +03:00
abb2075069 Minor style fixes 2022-11-23 23:47:06 +03:00
c4ecec9c06 Create rating control. Refactoring style. 2022-11-23 22:14:59 +03:00
Igor Lobanov
ffc0b7abf9 lint 2022-11-23 13:31:13 +01:00
45526a1823 something 2022-11-23 14:57:14 +03:00
20a368fa6b fixes 2022-11-23 14:34:43 +03:00
6e37701420 control-fix 2022-11-23 12:53:43 +03:00
8cc0fd1359 linter, linter, let me work 2022-11-23 09:01:38 +03:00
978eb1e4d9 fix-linter 2022-11-23 08:38:55 +03:00
75af4d5ce0 Merge branch 'prepare-comments' into prepare-inbox 2022-11-23 08:33:30 +03:00
3d2224e7f2 pseudonames 2022-11-23 08:28:41 +03:00
ilya-bkv
4ddf3dce53 Merge remote-tracking branch 'origin/dev' into prepare-inbox 2022-11-23 08:20:02 +03:00
ilya-bkv
57a216de03 [WIP] Chat creation 2022-11-23 07:12:11 +03:00
817d2e2d74 fix-condition 2022-11-22 22:04:55 +03:00
76460a1289 working load 2022-11-22 21:20:26 +03:00
dda1aa55fa trig-test-build 2022-11-22 17:05:41 +03:00
3624004e03 all-topics-all-authors-cosmetics-and-refactoring 2022-11-22 12:27:01 +03:00
ilya-bkv
62926197d1 Merge remote-tracking branch 'origin/auth-fixes' into prepare-inbox 2022-11-22 06:22:25 +03:00
Igor Lobanov
ff04a63ebc fixes 2022-11-22 04:05:20 +01:00
Tony
4b50de13a7
Merge pull request #63 from Discours/search-fixes
Search fixes
2022-11-22 01:32:19 +03:00
ilya-bkv
e558b1814d Merge remote-tracking branch 'origin/dev' into prepare-inbox 2022-11-21 17:06:17 +03:00
Igor Lobanov
1d9773183e lint 2022-11-21 14:02:04 +01:00
Igor Lobanov
6df6866756 default api url testapi -> v2 2022-11-21 12:32:24 +01:00
f72e12ebf8 fix-error-log 2022-11-21 11:41:11 +03:00
6d03373f9c fix viewed 2022-11-21 11:38:34 +03:00
4b87a699e4 merged 2022-11-21 09:35:32 +03:00
ilya-bkv
9f0502cab0 Merge remote-tracking branch 'origin/dev' into prepare-inbox
# Conflicts:
#	src/utils/config.ts
2022-11-21 09:01:20 +03:00
f6b084f66f premerge 2022-11-21 08:55:22 +03:00
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
382d420f38 lint 2022-11-21 01:26:20 +01:00
Igor Lobanov
c1cc1a3ad9 refactoring fixes 2022-11-21 01:12:20 +01:00
Igor Lobanov
995a7be94e Merge branch 'search-component' of github.com:Discours/discoursio-webapp into search-component 2022-11-21 01:02:00 +01:00
bee558834f Minor style fix 2022-11-21 01:19:03 +03:00
296011eb57 Style fixes 2022-11-21 01:10:07 +03:00
Igor Lobanov
90532fe7bb Merge branch 'search-component' of github.com:Discours/discoursio-webapp into search-component 2022-11-20 22:26:10 +01:00
Igor Lobanov
1cf942f6c8 i like to move it. move it 2022-11-20 22:25:59 +01:00
94f9e77203 Style fixes 2022-11-21 00:23:12 +03:00
2457ae05ac Merge branch 'search-component' of https://github.com/Discours/discoursio-webapp into search-component 2022-11-20 23:09:40 +03:00
Igor Lobanov
36a4443ed2 WIP 2022-11-20 19:49:44 +01:00
5b711a1ad1 Merge branch 'search-component' of https://github.com/Discours/discoursio-webapp into search-component 2022-11-19 22:40:05 +03:00
ea80131505 testing, fixes 2022-11-19 20:16:52 +03:00
331ae50428 no-urql-cache 2022-11-19 16:43:25 +03:00
67f7c2ebbc Merge branch 'search-component' of https://github.com/Discours/discoursio-webapp into search-component 2022-11-19 16:35:09 +03:00
d728db06cf fix-topic-queries 2022-11-19 16:35:00 +03:00
73b61b3828 Merge branch 'search-component' of https://github.com/Discours/discoursio-webapp into search-component
 Conflicts:
	src/components/Views/AllAuthors.tsx
	src/components/Views/AllTopics.tsx
2022-11-19 16:16:05 +03:00
9f537a75c1 Fixed alltopics and all authors page style 2022-11-19 16:04:42 +03:00
ca525e7370 Merge branch 'dev' of https://github.com/Discours/discoursio-webapp into search-component 2022-11-19 15:30:49 +03:00
f9fd41ddeb apitest 2022-11-19 14:50:51 +03:00
7cd37649a4 bumped 2022-11-19 11:53:27 +03:00
537a5a078d Merge branch 'dev' of github.com:Discours/discoursio-webapp into search-component 2022-11-19 11:26:19 +03:00
b41c93ff87 Update bootstrap package 2022-11-19 11:22:03 +03:00
8364acb85b linter-passing 2022-11-19 11:16:00 +03:00
89450336e7 authors-with-counters 2022-11-19 11:09:52 +03:00
8ffb0ca7ce Merge branch 'dev' into search-component 2022-11-19 08:01:20 +03:00
2fe1a67e23 author-fixes 2022-11-19 08:00:54 +03:00
180db86fd2 Added search component to the all authors page 2022-11-18 21:54:32 +03:00
e80a9ec7e7 Added search component 2022-11-18 21:33:31 +03:00
b64aa7eaa7 Merge branch 'dev' of github.com:Discours/discoursio-webapp into dev 2022-11-18 08:53:43 +03:00
f733195aa7 migration bio fix 2022-11-18 08:52:42 +03:00
Igor Lobanov
e6ca25fffa Merge remote-tracking branch 'origin/dev' into refactoing-catch-up
# Conflicts:
#	src/components/Views/Search.tsx
2022-11-18 03:46:11 +01:00
Igor Lobanov
46b4ecc7ea catch up with backend refactoring 2022-11-18 03:23:04 +01:00
e39414d975 search-wip, bio fix 2022-11-18 02:20:40 +03:00
a8247bafd6 need some cosmetics 2022-11-17 23:08:12 +03:00
2f65142236 linter-pass-sort-fix 2022-11-17 20:32:21 +03:00
b1b3e12811 abc sort fix 2022-11-17 20:20:19 +03:00
94ff466e3d some fixes 2022-11-17 09:56:24 +03:00
e65b075dca Merge remote-tracking branch 'origin/dev' into client-routing-minor-fixes 2022-11-17 09:39:37 +03:00
528d0273e5 config 2022-11-17 09:33:24 +03:00
ff85721961 loadby-refactored-merged 2022-11-17 09:32:48 +03:00
74415132fa Load more button minor fix 2022-11-17 00:15:01 +03:00
2341e83772 Home page fixes 2022-11-17 00:08:04 +03:00
ilya-bkv
a0a7a5146a WIP 2022-11-16 22:39:50 +03:00
ilya-bkv
d504e02ccb WIP 2022-11-16 22:38:16 +03:00
251177374b codegened 2022-11-16 19:38:36 +03:00
4d9930a4ff loadby-author-fix 2022-11-16 18:27:01 +03:00
ilya-bkv
d708347a95 Routes to /inbox 2022-11-16 16:44:41 +03:00
ilya-bkv
f3eccb1ff2 Merge remote-tracking branch 'origin/layouts' into prepare-inbox 2022-11-16 15:26:44 +03:00
ilya-bkv
b15b31dd2f Add markdown, message component [WiP] 2022-11-16 15:25:37 +03:00
326395e40c dev-sync 2022-11-16 11:23:19 +03:00
b5c0eb88fe fix-queries 2022-11-16 10:42:43 +03:00
d370bc4fe4 linter-is-sick 2022-11-16 09:41:26 +03:00
0c0084365d wip-refactoring 2022-11-16 09:34:22 +03:00
ilya-bkv
ecde2d8c99 Textarea autoresize 2022-11-16 07:56:15 +03:00
f0f944e31a apifix 2022-11-15 19:59:27 +03:00
da09e084c1 working 2022-11-15 19:50:15 +03:00
Igor Lobanov
28fa18b7c0 ClientContainer -> ShowOnlyOnClient, topic and author page fixes 2022-11-15 17:16:31 +01:00
8ac3e50d21 type-fix2 2022-11-15 18:34:57 +03:00
8ae646a7f0 type-fix 2022-11-15 18:34:10 +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
b207fb9e0c linter fixies 2022-11-15 16:55:00 +03:00
ilya-bkv
724ab4717d Merge with dev 2022-11-15 15:48:42 +03:00
a9a22cd7f6 postmerge 2022-11-15 15:15:35 +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
d47396bb9c enable ssr for those 2022-11-15 12:38:12 +03:00
ac3b4b82d8 Fixed header icons position 2022-11-15 01:10:26 +03:00
e645fae850 Fixed all topics and all authors style 2022-11-15 00:58:33 +03:00
058a763f49 Fixed connect page 2022-11-15 00:57:19 +03:00
50dfab4254 Fixed topics page style 2022-11-15 00:17:20 +03:00
59c2283b39 Header minor fixes 2022-11-14 23:32:17 +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
cc54f055f3 wip 2022-11-14 16:07:49 +03:00
Igor Lobanov
338d9e3d08 code review 2022-11-14 11:02:08 +01: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
6fc26283bd fix-ackee-increment 2022-11-14 11:03:48 +03:00
9e04595b3e ackee-test 2022-11-14 09:52:08 +03:00
10e6938b11 tracker-script 2022-11-14 09:28:46 +03:00