Commit Graph

321 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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