Commit Graph

1052 Commits

Author SHA1 Message Date
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
f8a7e98a8e Merge branch 'show_author_subscriptions' into 'dev'
Show author subscriptions

See merge request discoursio/discoursio-webapp!54
2023-04-22 14:36:38 +00:00
f19de68568 Show author subscriptions 2023-04-22 14:36:38 +00:00
bniwredyc
a23d476da4 WIP 2023-04-21 17:10:23 +02:00
Igor
4f772a7a6c Merge branch 'anchor_revert' into 'dev'
Anchor revert

See merge request discoursio/discoursio-webapp!52
2023-04-20 14:01:15 +00: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
ae32a0c4e4 Merge branch '156/comments_microfixies' into 'dev'
156/comments microfixies

See merge request discoursio/discoursio-webapp!51
2023-04-17 10:31:20 +00:00
a2b55b9beb 156/comments microfixies 2023-04-17 10:31:20 +00:00
7afa2a8c12 Добавил иконки кнопкам в шапке для мобильной версии 2023-04-12 23:32:38 +03:00
Igor
2fb7e89793 Merge branch 'show_followers' into 'dev'
Show followers list

See merge request discoursio/discoursio-webapp!42
2023-04-11 14:13:18 +00: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
Igor
21282aad92 Merge branch 'editor-build-fix' into 'editor'
build fix, lint, minor fix

See merge request discoursio/discoursio-webapp!49
2023-04-04 01:08:15 +00:00
bniwredyc
547ea6d687 build fix, lint, minor fix 2023-04-04 02:18:25 +02:00
Igor
a822edd6f7 Merge branch 'hide_editor_dropdown' into 'editor'
hide dropdown

See merge request discoursio/discoursio-webapp!48
2023-04-03 23:26:24 +00: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
Igor
e218ef43f5 Merge branch 'scroll-to-links-fix' into 'dev'
scroll to anchor fixes, profile comments link fix

See merge request discoursio/discoursio-webapp!47
2023-04-03 14:54:37 +00:00
bniwredyc
0d8c382015 build fix 2023-04-03 16:31:12 +02:00
bniwredyc
4feab7060c Merge branch 'scroll-to-links-fix' of gitlab.com:discoursio/discoursio-webapp into scroll-to-links-fix 2023-04-03 16:26:50 +02:00
bniwredyc
dace7daca8 wait for page to load befor scroll to anchor 2023-04-03 16:22:59 +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