Commit Graph

5 Commits

Author SHA1 Message Date
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
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
e6ce826e56 new shout creation flow WIP 2023-05-03 18:26:57 +02:00
ec6f7e0ec6 Merge branch 'editor' of gitlab.com:discoursio/discoursio-webapp into editor 2023-04-26 02:37:29 +00:00