Igor
|
2c252b8dce
|
Merge branch 'editor_settings/upload_cover_image' into 'dev'
Editor settings/upload cover image
See merge request discoursio/discoursio-webapp!74
|
2023-05-09 13:07:53 +00: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 |
|
bniwredyc
|
aa6199f2b5
|
publish hotfix
|
2023-05-08 20:26:42 +02: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 |
|
|
|
8bc9d4d592
|
Merge branch 'add_customl_scroll' into 'dev'
Custom scrollbar
See merge request discoursio/discoursio-webapp!70
|
2023-05-08 12:25:48 +00:00 |
|
|
|
98822b3a66
|
Custom scrollbar
|
2023-05-08 12:25:48 +00: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 |
|
Igor
|
948060ebdf
|
Merge branch 'security_upload_file_from_url_to_aws' into 'dev'
Upload image from url to aws
See merge request discoursio/discoursio-webapp!68
|
2023-05-07 19:15:51 +00: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 |
|
ilya-bkv
|
993debf1da
|
[editor] fix image max-height
|
2023-05-07 19:12:25 +03: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
|
d384bf9d7d
|
api changes
|
2023-05-07 17:23:48 +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 |
|
Igor
|
64680d815e
|
Merge branch 'component-generator' into 'dev'
hygen component generator
See merge request discoursio/discoursio-webapp!64
|
2023-05-06 11:14:02 +00:00 |
|
bniwredyc
|
ff094f7c75
|
hygen component generator
|
2023-05-06 13:11:45 +02: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 |
|
