Commit Graph

831 Commits

Author SHA1 Message Date
aa28b2cbfd Figure caption with editor menu 2023-05-11 11:43:14 +00:00
1cd95f955b Add growing textarea component 2023-05-11 11:33:01 +00:00
Igor
a3b2288e21 Merge branch 'feature/save_topics' into 'main'
main topic select, save topics

See merge request discoursio/discoursio-webapp!81
2023-05-11 11:29:00 +00:00
bniwredyc
835e6fcee9 save topics fixes 2023-05-11 13:06:29 +02:00
887c7487ee Fixed main topic style on the article settings page 2023-05-10 23:52:11 +03:00
bniwredyc
01f33413eb main topic select, save topics WiP 2023-05-10 22:20:53 +02:00
ilya-bkv
2f0a5b9cab Delete cover image 2023-05-10 17:07:41 +03:00
ilya-bkv
4501aa3251 - show existed link in url popup
- hide Panel after click on menu item
- hide Cooperate button in Article
- revert drafts list in DraftView
2023-05-10 04:53:48 +03:00
bniwredyc
9a1862b575 fixed lint validation, chores, lint, safe lib updates 2023-05-10 01:15:26 +02:00
ilya-bkv
82430404e3 [editor] add text highlight action 2023-05-09 20:31:28 +03:00
bniwredyc
480d14ed6f Merge remote-tracking branch 'gitlab/dev' into editor_settings/upload_cover_image 2023-05-09 14:55:19 +02:00
ilya-bkv
21f84f2292 resolve conversation 2023-05-09 14:25:40 +03:00
ilya-bkv
28e0e4e33a styles minifix 2023-05-09 08:09:09 +03:00
ilya-bkv
7332e3ebad remove trash word 2023-05-09 08:05:06 +03:00
ilya-bkv
2ea3216bff Card upload 2023-05-09 07:58:00 +03:00
ilya-bkv
39c99091f9 [WIP] init 2023-05-08 21:23:51 +03:00
Igor
b14eb97307 Merge branch 'feature/publish' into 'dev'
working publish

See merge request discoursio/discoursio-webapp!73
2023-05-08 18:05:46 +00:00
bniwredyc
1752bf5198 code review 2023-05-08 20:01:11 +02:00
bniwredyc
961a122279 working publish 2023-05-08 19:29:26 +02:00
be27e86d24 Fixed plus control style 2023-05-08 20:06:55 +03:00
Igor
55efdebcf0 Merge branch 'scroll_to_top_beauty' into 'dev'
missed change

See merge request discoursio/discoursio-webapp!69
2023-05-07 19:35:44 +00:00
bniwredyc
a8fb3b58a5 beautiful scroll to top 2023-05-07 21:33:20 +02:00
ilya-bkv
26d75b99ed [security] upload image from url to aws 2023-05-07 22:10:44 +03:00
Igor
0ba32d0608 Merge branch 'drafts-2' into 'dev'
[WiP] save, publish

See merge request discoursio/discoursio-webapp!67
2023-05-07 16:45:39 +00:00
bniwredyc
93b2690ff4 missed change 2023-05-07 17:51:59 +02:00
bniwredyc
796ca57167 Merge remote-tracking branch 'gitlab/dev' into drafts-2 2023-05-07 17:44:47 +02:00
Igor
4f1cc94168 Merge branch 'editor_float_image' into 'dev'
Editor float image + figure

See merge request discoursio/discoursio-webapp!66
2023-05-07 15:40:54 +00:00
bniwredyc
d61a1ba303 add image url as default caption 2023-05-07 17:32:28 +02:00
bniwredyc
afbaa3791e Merge branch 'editor_float_image' into drafts-2
# Conflicts:
#	src/components/Editor/Editor.tsx
2023-05-07 17:15:30 +02:00
bniwredyc
1f15a1f4e7 Merge branch 'editor_float_image' into drafts-2 2023-05-07 16:29:58 +02:00
bniwredyc
1679c8289d minor fix 2023-05-07 16:21:35 +02:00
bniwredyc
35271ea152 lint, safe lib updates 2023-05-07 15:47:10 +02:00
bniwredyc
4d31dcf2c3 floating image + figure 2023-05-07 15:16:03 +02:00
f7232cadb1 Fixed header controls style 2023-05-06 19:40:43 +03:00
de61fa09bc Fixed topics control style 2023-05-06 19:12:17 +03:00
525ca626fb Added scroll up button in the editor 2023-05-06 18:04:50 +03:00
ilya-bkv
9a8a358a8e [Wip] init Floating extention 2023-05-06 15:38:22 +03:00
bniwredyc
a84bc48910 shout save 2023-05-05 22:05:50 +02:00
bniwredyc
c4ec7d0a7e Merge remote-tracking branch 'gitlab/dev' into drafts
# Conflicts:
#	src/components/Editor/Editor.tsx
#	src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.module.scss
#	src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
#	src/components/Editor/EditorFloatingMenu/Menu/Menu.tsx
#	src/components/Editor/UploadModal/UploadModalContent.tsx
2023-05-04 21:57:02 +02:00
bniwredyc
378fc65955 Merge remote-tracking branch 'gitlab/dev' into drafts 2023-05-04 19:42:39 +02:00
bniwredyc
382da58af2 WIP 2023-05-04 19:38:50 +02:00
ilya-bkv
0ea62ea236 fix broken float menu logic 2023-05-04 19:59:38 +03:00
036b43c528 Add Horizontal Rule action 2023-05-04 15:55:38 +00:00
bniwredyc
0c849a99e9 git push gitlabMerge remote-tracking branch 'gitlab/dev' into drafts 2023-05-04 17:13:23 +02:00
bniwredyc
283818d12d bubble menu fixes 2023-05-04 17:09:09 +02:00
ilya-bkv
d9a1f60fc0 fix uploaded image link + editor image align menu 2023-05-04 16:36:53 +03:00
bniwredyc
2e4c9d03d6 separate menu for images in editor 2023-05-04 14:16:39 +02:00
ilya-bkv
62f6c26c49 fix closr upload modal event 2023-05-04 07:57:42 +03:00
08cc22b93c Add image by URL, Upload (choose file by button and D&D) 2023-05-04 04:43:52 +00:00
bniwredyc
e6ce826e56 new shout creation flow WIP 2023-05-03 18:26:57 +02:00
bniwredyc
cfb744c0a0 lint 2023-05-01 20:32:32 +02:00
bniwredyc
0c959b80ad lib updates, build fix, unused code deleted 2023-04-30 18:45:59 +02:00
bniwredyc
62399ce138 НMerge branch 'dev' into create-shout-2 2023-04-30 17:40:42 +02:00
ilya-bkv
d43a14a5a8 build test 2023-04-29 18:43:36 +03:00
ilya-bkv
b8c8113700 build test 2023-04-29 18:37:23 +03:00
ilya-bkv
b30e3c3141 Linter fixies 2023-04-29 16:54:15 +03:00
ilya-bkv
e39b6f4068 resolve nextSibling error + refactoring Feed Sidebar 2023-04-29 16:43:50 +03:00
ilya-bkv
80876c5fc7 [hotfix] resolve imports in FullArticle 2023-04-29 13:10:26 +03:00
ec6f7e0ec6 Merge branch 'editor' of gitlab.com:discoursio/discoursio-webapp into editor 2023-04-26 02:37:29 +00:00
ilya-bkv
c173ff3135 Hotfix - save Introduce field 2023-04-22 19:07:58 +03:00
ilya-bkv
24c028a233 hotfix followed request 2023-04-22 18:32:21 +03:00
f19de68568 Show author subscriptions 2023-04-22 14:36:38 +00:00
bniwredyc
a23d476da4 WIP 2023-04-21 17:10:23 +02:00
dab4bcd41e Anchor revert 2023-04-20 14:01:15 +00:00
bniwredyc
11f0a25a96 WIP 2023-04-20 15:58:56 +02:00
bniwredyc
61a6448b61 Merge remote-tracking branch 'gitlab/dev' into create-shout-2 2023-04-17 13:04:01 +02:00
bniwredyc
432a14bb21 Merge remote-tracking branch 'gitlab/editor' into create-shout-2 2023-04-17 12:59:38 +02:00
a2b55b9beb 156/comments microfixies 2023-04-17 10:31:20 +00:00
7afa2a8c12 Добавил иконки кнопкам в шапке для мобильной версии 2023-04-12 23:32:38 +03:00
bniwredyc
e55389fa18 Merge branch 'dev' into show_followers 2023-04-11 16:07:57 +02:00
bniwredyc
656be9495b Merge remote-tracking branch 'gitlab/editor' into create-shout-2 2023-04-11 15:58:12 +02:00
bniwredyc
ac3f29defc create shout -> edit 2023-04-11 15:57:48 +02:00
c3378d3c7b Editor panel 2023-04-07 00:40:34 +03:00
59c1f1b3a5 Added create article controls to the header 2023-04-06 00:51:01 +03:00
bniwredyc
547ea6d687 build fix, lint, minor fix 2023-04-04 02:18:25 +02:00
ilya-bkv
74f14f8399 hide dropdown 2023-04-03 21:13:28 +03:00
bniwredyc
bc2abbc2bd Merge branch 'dev' into editor 2023-04-03 17:23:02 +02:00
bniwredyc
0d8c382015 build fix 2023-04-03 16:31:12 +02:00
ilya-bkv
4a8c2bea77 perfectionism mode 2023-04-03 16:38:44 +03:00
bniwredyc
71fb5c5276 build fix 2023-04-03 15:11:02 +02:00
bniwredyc
3549e57506 scroll to anchor fixes, profile comments link fix 2023-04-03 14:55:00 +02:00
7c1a51f638 Merge branch 'feature/161_scroll_to_comments' into 'dev'
[161] scroll to comments

See merge request discoursio/discoursio-webapp!45
2023-04-01 04:20:14 +00:00
492dabb7b9 [161] scroll to comments 2023-04-01 04:20:14 +00:00
bniwredyc
9583ccdc81 collaborative editing (hocuspocus), lib updates, fixes 2023-03-31 01:27:21 +02:00
89cd0f4791 Merge branch 'router-fix' into 'dev'
router fix

See merge request discoursio/discoursio-webapp!46
2023-03-30 09:50:59 +00:00
bniwredyc
cb8d3f0f0b Merge remote-tracking branch 'gitlab/dev' into editor
# Conflicts:
#	package-lock.json
#	package.json
#	src/components/Views/AllAuthors.tsx
#	src/components/Views/AllTopics.tsx
2023-03-30 02:46:57 +02:00
bniwredyc
3dd2bd6901 Merge branch 'editor' of gitlab.com:discoursio/discoursio-webapp into editor 2023-03-30 02:40:31 +02:00
bniwredyc
04924e4777 working hocuspocus 2023-03-30 02:34:40 +02:00
85516d2f75 Fixed blocks position in the header 2023-03-30 00:42:01 +03:00
55cf0e1ffd Fixed article controls style 2023-03-29 23:47:54 +03:00
0a6271c57e Fixed article controls style 2023-03-29 23:18:25 +03:00
bniwredyc
5102b502b1 router fix 2023-03-29 19:02:31 +02:00
bniwredyc
94891bb5d2 wss 2023-03-29 19:00:09 +02:00
bniwredyc
de984f9801 nope 2023-03-29 18:01:56 +02:00
bniwredyc
0984bd3899 fix 2023-03-29 17:46:29 +02:00
bniwredyc
0ac10e7831 hocuspocus 2023-03-29 17:36:12 +02:00
bniwredyc
e7e4de6cb1 test 2023-03-29 12:28:40 +02:00
bniwredyc
7a950608a6 test 2023-03-29 12:22:03 +02:00
bniwredyc
00dbeb1136 itty-bitty-little test 2023-03-29 12:14:39 +02:00
bniwredyc
1ce57f925f WIP 2023-03-29 10:51:27 +02:00
bniwredyc
5a3560fc12 shout create 2023-03-27 16:45:07 +02:00
bniwredyc
5b791d7a26 WIP 2023-03-26 20:31:34 +02:00
369f721bd8 Add LinkForm component 2023-03-26 16:56:49 +00:00
ilya-bkv
2be4ec7f22 revert edior form 2023-03-26 10:19:36 +03:00
ilya-bkv
3b3d4fecbe link form setup 2023-03-25 07:42:45 +03:00
bniwredyc
e8d6bcff7f simpleimage proxy, minor fixes 2023-03-24 20:36:43 +01:00
bniwredyc
d5a5e79daa Merge remote-tracking branch 'gitlab/editor' into editor 2023-03-24 14:41:35 +01:00
bniwredyc
0fc0fd10f0 topic select WIP 2023-03-24 14:39:52 +01:00
f73456cea5 Fixed profile left column 2023-03-24 01:05:23 +03:00
9b22627908 Followers list on authors page.
Replaced "compact" props with "hideWriteButton" in the author card component.
2023-03-24 00:39:13 +03:00
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
ilya-bkv
1c1cfe9b40 Show followers list 2023-03-05 16:31:36 +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
b3b1c48d92 likes dislikes 2023-02-28 18:13:14 +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
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
20b60d6427 New reactions counter 2023-02-11 10:49:31 +00:00
ilya-bkv
6a02c05882 Publish button 2023-02-11 13:36:32 +03:00
ilya-bkv
9cf2ffa1c9 [WiP] add font styles 2023-02-11 13:31:28 +03:00
ilya-bkv
4f47409d5e [WiP] initial text 2023-02-11 12:32:52 +03:00
b2b32b996a Add check sign to profile saving success message 2023-02-11 01:10:16 +03:00
bniwredyc
20ecc28ad9 Merge remote-tracking branch 'gitlab/dev' into minor-fixes 2023-02-10 12:19:37 +01:00
bniwredyc
47f9c10496 minor changes 2023-02-10 12:11:24 +01:00
Igor
c4124013d5 Merge branch 'page-gallery' into 'dev'
Fixed slider on page gallery

See merge request discoursio/discoursio-webapp!15
2023-02-10 10:56:15 +00:00
Igor
6f90e4c10e Merge branch 'beautiful-profile-save' into 'dev'
Beautiful profile save

See merge request discoursio/discoursio-webapp!14
2023-02-10 10:52:30 +00:00
bniwredyc
878f0cb307 lint & build 2023-02-10 09:33:26 +01:00
bniwredyc
ebfb6eeef1 code review 2023-02-09 23:56:00 +01:00
3b7d669dad Fixed slider on page gallery 2023-02-10 01:54:53 +03:00
bniwredyc
688e302392 snackbar 2023-02-09 23:39:52 +01:00
6912ed4392 Fixed share popup icons vertical alignment 2023-02-09 22:40:06 +03:00
bniwredyc
6a1860d824 beautiful profile update 2023-02-09 18:53:11 +01:00
Igor
5a9abfa619 Merge branch 'upload-fix-2' into 'dev'
Upload to stroj

See merge request discoursio/discoursio-webapp!12
2023-02-09 16:58:57 +00:00
ilya-bkv
08e4ed0eef upload to storj 2023-02-09 16:09:46 +01:00
2a91b04148 Fixed share popup style 2023-02-08 23:43:59 +03:00
bniwredyc
a84dac9577 Merge remote-tracking branch 'gitlab/dev' into feed-article-popup 2023-02-07 14:31:18 +01:00
bniwredyc
593357073d Merge branch 'dev' into feed-article-popup 2023-02-07 14:29:12 +01:00
bniwredyc
979c7880c0 code review 2023-02-07 14:20:07 +01:00
01187e880f Editable comments 2023-02-07 12:48:45 +00:00
bniwredyc
e686738d34 Merge branch 'dev' into feedback 2023-02-07 11:47:08 +01:00
0d0494a83a Feed article actions popup 2023-02-07 00:35:08 +03:00
eac6ad7d4c Merge remote-tracking branch 'hub/dev' into dev 2023-02-01 11:10:57 +03:00
a330684621 Merge remote-tracking branch 'hub/create-settings-page' into dev 2023-02-01 11:06:43 +03:00
ilya-bkv
25d60971ec [CommentEditor] added Login message 2023-02-01 09:10:40 +03:00
b70e80dacd Merge branch 'feedback' of gitlab.com:discoursio/discoursio-webapp into feedback 2023-01-31 20:40:12 +03:00
dbc11b049a fix-inbox-ws 2023-01-31 20:31:13 +03:00
bniwredyc
6945f7ede5 Merge remote-tracking branch 'gitlab/dev' into feedback 2023-01-31 15:28:14 +01:00
ilya-bkv
2c063df914 resolve conversation 2023-01-31 16:58:28 +03:00
ilya-bkv
335069ff83 hotfix sharing 2023-01-31 15:47:44 +03:00
Ilya Y
714c11e591 Social share (#88)
add social sharing and og:meta
2023-01-31 15:47:44 +03:00
12f5479957 Feed styles fixes 2023-01-31 02:09:33 +03:00
b4ad24e0cf feedback-newsletter-bump-wip 2023-01-30 18:10:27 +03:00
be941828f4 Merge, fixes and bump 2023-01-30 16:42:07 +03:00
ilya-bkv
6d51f8e67b hotfix sharing 2023-01-30 14:52:43 +03:00
Ilya Y
e56ff28d04
Social share (#88)
add social sharing and og:meta
2023-01-30 13:39:36 +03:00
a13b2a57a1 captl 2023-01-28 14:00:06 +03:00
d2100cc865 fkc 2023-01-28 03:31:46 +03:00
e280709697 check-req 2023-01-28 02:07:25 +03:00
47a647c1d7 Fixed props type 2023-01-27 22:29:18 +03:00
0606bbfa0b Comments block on the feed page 2023-01-27 00:42:47 +03:00