Commit Graph

1080 Commits

Author SHA1 Message Date
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
Igor
4a64289621 Merge branch 'voters_list' into 'dev'
Add voters list component

See merge request discoursio/discoursio-webapp!41
2023-03-09 23:58:56 +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
Igor
9e69f280cf Merge branch 'comments_reactions' into 'dev'
Comments rating

See merge request discoursio/discoursio-webapp!38
2023-03-09 17:11:26 +00:00
ilya-bkv
5f844b0be9 fix after merge 2023-03-09 20:07:32 +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
Igor
191e3066db Merge branch 'fixies_after_remove_astro' into 'dev'
[146] Astro fixies

See merge request discoursio/discoursio-webapp!39
2023-03-09 14:18:20 +00: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
Igor
58a2091e0d Merge branch 'show_new_comments' into 'dev'
Show new comments

See merge request discoursio/discoursio-webapp!36
2023-03-06 14:12:18 +00:00
ilya-bkv
b71161ed2d Show new comments 2023-03-06 17:06:48 +03:00
ilya-bkv
1c1cfe9b40 Show followers list 2023-03-05 16:31:36 +03:00
Igor
a7b0df4b24 Merge branch 'chores' into 'dev'
build fix, chores: lib updates, lint

See merge request discoursio/discoursio-webapp!35
2023-03-04 17:30:10 +00:00
bniwredyc
0a6063d1d0 build fix, chores: lib updates, lint 2023-03-04 18:26:28 +01:00
Igor
27fc91bb87 Merge branch 'rating-fixes' into 'dev'
likes/dislikes refactoring, who voted popup

See merge request discoursio/discoursio-webapp!34
2023-03-03 18:37:48 +00:00
bniwredyc
9b2cd4be2d likes/dislikes refactoring, who voted popup 2023-03-03 19:26:26 +01:00
Igor
a62f9ba06d Merge branch 'rating-fixes' into 'dev'
like dislike logic update

See merge request discoursio/discoursio-webapp!33
2023-03-02 18:51:35 +00: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
Igor
79870a4b99 Merge branch 'main-page-hotfix' into 'dev'
main page hotfix

See merge request discoursio/discoursio-webapp!32
2023-02-28 17:40:18 +00:00
bniwredyc
9bff38f921 main page hotfix 2023-02-28 18:39:20 +01:00
Igor
5cde651005 Merge branch 'ratings' into 'dev'
likes dislikes

See merge request discoursio/discoursio-webapp!31
2023-02-28 17:16:56 +00:00
bniwredyc
b3b1c48d92 likes dislikes 2023-02-28 18:13:14 +01:00
Igor
dc85e222b6 Merge branch 'comment-edit-and-remove-fix' into 'dev'
comments edit and remove fix

See merge request discoursio/discoursio-webapp!30
2023-02-25 14:17:11 +00:00
bniwredyc
0645afa4e9 comments edit and remove fix 2023-02-25 15:16:11 +01:00
Igor
cfaaebe942 Merge branch 'config-test' into 'dev'
default vercel config test

See merge request discoursio/discoursio-webapp!29
2023-02-25 13:10:30 +00: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
bniwredyc
0eeaee8034 default vercel config test 2023-02-20 22:17:02 +01: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