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 |
|
