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 |
|
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 |
|
Igor
|
20dde76aab
|
Merge branch 'minor-fixes-2' into 'dev'
Minor fixes
See merge request discoursio/discoursio-webapp!63
|
2023-05-04 20:03:04 +00: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 |
|
|
|
b3b6c1b970
|
Merge branch 'editor/add_horisontal_rule' into 'dev'
Add Horizontal Rule action
See merge request discoursio/discoursio-webapp!62
|
2023-05-04 15:55:38 +00:00 |
|
|
|
036b43c528
|
Add Horizontal Rule action
|
2023-05-04 15:55:38 +00:00 |
|
Igor
|
3b1a70f598
|
Merge branch 'drafts' into 'dev'
separate menu for images in editor
See merge request discoursio/discoursio-webapp!61
|
2023-05-04 15:16:47 +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 |
|
Igor
|
2e3e32aabf
|
Merge branch 'drafts' into 'dev'
separate menu for images in editor
See merge request discoursio/discoursio-webapp!60
|
2023-05-04 12:18:09 +00: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 |
|
|
|
0de5cf76f2
|
Merge branch 'editor/paste_image' into 'dev'
Add image by URL, Upload (choose file by button and D&D)
See merge request discoursio/discoursio-webapp!56
|
2023-05-04 04:43:52 +00:00 |
|
|
|
08cc22b93c
|
Add image by URL, Upload (choose file by button and D&D)
|
2023-05-04 04:43:52 +00:00 |
|
Igor
|
821fb428de
|
Merge branch 'create-shout-2' into 'dev'
Create shout new flow WIP
See merge request discoursio/discoursio-webapp!59
|
2023-05-03 16:46:26 +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 |
|
|
|
38b0176a14
|
Merge branch 'hotfix/import' into 'dev'
Linter fixies
See merge request discoursio/discoursio-webapp!58
|
2023-04-29 13:54:55 +00:00 |
|
ilya-bkv
|
b30e3c3141
|
Linter fixies
|
2023-04-29 16:54:15 +03:00 |
|
|
|
635a14cfb4
|
Merge branch 'hotfix/render_routing_fix' into 'dev'
resolve nextSibling error + refactoring Feed Sidebar
See merge request discoursio/discoursio-webapp!57
|
2023-04-29 13:44:49 +00: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 |
|
ilya-bkv
|
71b65a8370
|
types.gen.ts
|
2023-04-26 06:40:58 +03:00 |
|
|
|
731b23b2d9
|
Merge branch 'editor' into 'dev'
Merge branch 'editor' of gitlab.com:discoursio/discoursio-webapp into editor
See merge request discoursio/discoursio-webapp!55
|
2023-04-26 02:37:29 +00: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 |
|
|
|
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 |
|
