Commit Graph

692 Commits

Author SHA1 Message Date
ilya-bkv
e517b04b69 refactoring and minimize 2023-03-23 22:33:04 +03:00
ilya-bkv
fb035b6355 Merge remote-tracking branch 'origin/editor' into editor
# Conflicts:
#	src/components/Editor/EditorBubbleMenu.tsx
2023-03-23 22:30:49 +03:00
ilya-bkv
102ad86b59 refactoring and minimize 2023-03-23 22:29:40 +03:00
bniwredyc
5d5b2fc9ff Merge remote-tracking branch 'gitlab/editor' into editor 2023-03-23 18:56:06 +01:00
bniwredyc
a305da39fc Merge remote-tracking branch 'gitlab/dev' into editor
# Conflicts:
#	public/locales/en/translation.json
#	public/locales/ru/translation.json
#	src/components/Article/FullArticle.tsx
2023-03-23 18:54:33 +01:00
bniwredyc
32b53ae5cb Merge branch 'editor' of gitlab.com:discoursio/discoursio-webapp into editor
# Conflicts:
#	src/components/Editor/Editor.tsx
2023-03-23 18:47:36 +01:00
ilya-bkv
87f66d83b6 cleanup code 2023-03-23 20:24:28 +03:00
bniwredyc
5cce55de44 Merge branch 'editor' of gitlab.com:discoursio/discoursio-webapp into editor 2023-03-23 18:19:55 +01:00
bniwredyc
73f9013dc0 topic selector WIP 2023-03-23 18:15:50 +01:00
Igor
fc3f944a22 Merge branch 'more-gqls' into 'dev'
subs, queries

See merge request discoursio/discoursio-webapp!28
2023-03-23 13:26:34 +00:00
ilya-bkv
9090560302 Bullet and Numeric list 2023-03-22 15:07:28 +03:00
ilya-bkv
f50a072293 Headers & Blockquote 2023-03-22 10:47:51 +03:00
ilya-bkv
5b4b4e8f2d Add Link editor 2023-03-20 12:19:14 +03:00
97c6fe2ca0 Fixed sidebar on the feed page 2023-03-13 23:19:10 +03:00
bniwredyc
293e7a06e4 bold, create page title 2023-03-13 14:31:21 +01:00
bniwredyc
64e7ec03f3 Merge remote-tracking branch 'gitlab/create-settings-page' into editor
# Conflicts:
#	src/components/Pages/CreateSettingsPage.tsx
#	src/pages/CreateSettingsPage.module.scss
2023-03-12 21:16:20 +01:00
Igor
72ebe6b55e Merge branch 'new-grid' into 'dev'
New grid

See merge request discoursio/discoursio-webapp!40
2023-03-10 17:42:48 +00:00
251df4b2c0 New grid 2023-03-10 17:42:48 +00:00
ilya-bkv
69f17e4425 add named export 2023-03-10 02:56:19 +03:00
ilya-bkv
07bddd2c15 linter fix 2023-03-10 02:42:38 +03:00
ilya-bkv
21ad1bdf9e Add voters list component 2023-03-10 02:39:07 +03:00
ilya-bkv
401eecdc18 Merge remote-tracking branch 'origin/dev' into comments_reactions
# Conflicts:
#	public/locales/en/translation.json
#	public/locales/ru/translation.json
2023-03-09 20:06:06 +03:00
ilya-bkv
c421467f04 [146] handle voting error 2023-03-09 20:01:39 +03:00
ilya-bkv
06e68fca4a [146] resolve conversation 2023-03-09 19:19:28 +03:00
ilya-bkv
57d6ac14db [146] Astro fixies 2023-03-09 17:08:43 +03:00
ilya-bkv
4389124912 Comments rating 2023-03-09 15:34:08 +03:00
3d6d64bf23 Added buttons to the bubble menu 2023-03-08 20:44:09 +03:00
bniwredyc
195781741c editor very WIP 2023-03-08 17:35:13 +01:00
a3e7ff4374 Create article settings page 2023-03-07 01:24:09 +03:00
ilya-bkv
b71161ed2d Show new comments 2023-03-06 17:06:48 +03:00
bniwredyc
0a6063d1d0 build fix, chores: lib updates, lint 2023-03-04 18:26:28 +01:00
bniwredyc
9b2cd4be2d likes/dislikes refactoring, who voted popup 2023-03-03 19:26:26 +01:00
bniwredyc
9294052226 like dislike logic update 2023-03-02 19:48:39 +01:00
a036299887 Fixed comments on the feed page 2023-03-01 20:53:23 +03:00
bniwredyc
9bff38f921 main page hotfix 2023-02-28 18:39:20 +01:00
bniwredyc
b3b1c48d92 likes dislikes 2023-02-28 18:13:14 +01:00
bniwredyc
0645afa4e9 comments edit and remove fix 2023-02-25 15:16:11 +01:00
c8985e6d10 wschats-andn-followers 2023-02-23 17:07:25 +03:00
da48621e71 Merge branch 'Only_new_comments_filter' into 'dev'
[117] only new comments filter

See merge request discoursio/discoursio-webapp!27
2023-02-21 12:41:34 +00:00
ilya-bkv
bf54a2294b [117] only new comments filter 2023-02-21 15:33:46 +03:00
dc3b509c9e chat-creation-hotfix 2023-02-20 20:01:23 +03:00
547eecc279 drafts-gql 2023-02-20 18:30:52 +03:00
cd6ecce305 new gqls 2023-02-20 15:59:16 +03:00
ilya-bkv
466458014a [hotfix] Reactive reaction create 2023-02-17 21:12:28 +03:00
bniwredyc
f5272383c2 goodbye astro, i18n 2023-02-17 10:21:02 +01:00
edd13682b1 Hide comment editor 2023-02-13 14:12:49 +00:00
63ea0b8d63 Show user followers 2023-02-13 13:48:05 +00:00
ilya-bkv
1cfbffc213 Hide comment editor for no auth users 2023-02-13 16:34:10 +03:00
ilya-bkv
ca7a421728 Merge remote-tracking branch 'origin/dev' into dev 2023-02-11 14:33:43 +03:00
ilya-bkv
0f42c8bb95 [hotfix] remove hardcode link 2023-02-11 14:33:32 +03:00