Commit Graph

405 Commits

Author SHA1 Message Date
ebb302b403 Profile security page fixes 2022-11-30 21:15:01 +03:00
38cee93f33 reaction fix 2022-11-29 14:01:23 +03:00
a880c6e7d9 Added subscription and security pages settings 2022-11-29 01:14:19 +03:00
013bdd48d0 sendlink-template-patch 2022-11-27 22:19:06 +03:00
238449ba1d linting-passing-ritual-dance 2022-11-27 21:36:45 +03:00
6ca51225b1 fixing-slider 2022-11-27 20:30:59 +03:00
a3f63e0da0 slider-as-wrapper 2022-11-27 20:02:04 +03:00
8ad358d749 added video and show literature 2022-11-27 14:35:27 +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
ilya-bkv
ba7395f4b7 Chat list [WiP] 2022-11-27 10:10:04 +03:00
ae91ce27df Merge comments-fix 2022-11-27 09:37:21 +03:00
e232616cf2 cosmetics 2022-11-27 09:33:05 +03:00
Tony
769788b99f
Merge pull request #67 from Discours/profile
Profile settings
2022-11-27 09:09:02 +03:00
ilya-bkv
85f82d4898 Merge remote-tracking branch 'origin/prepare-inbox' into prepare-inbox 2022-11-27 08:50:05 +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
f6ec3558d6 wip-fixing 2022-11-26 19:51:08 +03:00
27514b495c hotixes-2 2022-11-26 04:46:34 +03:00
236806c79e minor fixes 2022-11-26 02:34:46 +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
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
ilya-bkv
abd18c24a2 init inbox context 2022-11-24 18:39:31 +03:00
ilya-bkv
e2679ce6b1 Wip 2022-11-24 15:58:07 +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
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
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
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
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
0c0084365d wip-refactoring 2022-11-16 09:34:22 +03:00
ilya-bkv
ecde2d8c99 Textarea autoresize 2022-11-16 07:56:15 +03:00
Igor Lobanov
28fa18b7c0 ClientContainer -> ShowOnlyOnClient, topic and author page fixes 2022-11-15 17:16:31 +01:00