Commit Graph

95 Commits

Author SHA1 Message Date
c5906a2762 mrged-testing 2022-12-02 09:28:05 +03:00
c086a242b7 Fixed all authors page style 2022-12-01 00:50:33 +03:00
a880c6e7d9 Added subscription and security pages settings 2022-11-29 01:14:19 +03:00
d68cb92462 Merge remote-tracking branch 'origin/prepare-inbox' into testing 2022-11-27 14:02:16 +03:00
304c5e420f Merge remote-tracking branch 'origin/dev' into testing 2022-11-27 14:01:55 +03:00
d0a165c3f4 media-audio-view 2022-11-27 14:00:44 +03:00
9b4cede871 beautiful all-topics and all-authors, some icons 2022-11-27 11:15:03 +03:00
Tony
769788b99f
Merge pull request #67 from Discours/profile
Profile settings
2022-11-27 09:09:02 +03:00
ilya-bkv
ea9d440cdf Invite users modal 2022-11-27 08:49:48 +03:00
57f1d026da WIP Comments 2022-11-27 00:27:54 +03:00
7224b87797 Merge branch 'dev' of github.com:Discours/discoursio-webapp into dev 2022-11-25 16:30:06 +03:00
b0f4f92aa9 Profile settings 2022-11-25 00:37:43 +03:00
ilya-bkv
6a94474732 Resolve Conversation 2022-11-24 09:52:31 +03:00
Igor Lobanov
e8df43bfb5 Merge remote-tracking branch 'origin/dev' into prepare-inbox 2022-11-23 23:47:55 +01:00
c4ecec9c06 Create rating control. Refactoring style. 2022-11-23 22:14:59 +03:00
ilya-bkv
57a216de03 [WIP] Chat creation 2022-11-23 07:12:11 +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
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
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
ca525e7370 Merge branch 'dev' of https://github.com/Discours/discoursio-webapp into search-component 2022-11-19 15:30:49 +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
89450336e7 authors-with-counters 2022-11-19 11:09:52 +03:00
e80a9ec7e7 Added search component 2022-11-18 21:33:31 +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
a8247bafd6 need some cosmetics 2022-11-17 23:08:12 +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
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
ilya-bkv
ecde2d8c99 Textarea autoresize 2022-11-16 07:56:15 +03:00
39aec90013 merging 2022-11-15 17:24:50 +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
e645fae850 Fixed all topics and all authors style 2022-11-15 00:58:33 +03:00
50dfab4254 Fixed topics page style 2022-11-15 00:17:20 +03:00
843912b95d postmerge-fixes 2022-11-14 20:41:05 +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
11874c6c1d auth context
topic page fix, getAuthor, getTopic
newapi -> testapi
fixes
2022-11-14 01:09:20 +01:00
c269e0d632 Fixed header navigation style 2022-11-13 13:36:44 +03:00