Commit Graph

7 Commits

Author SHA1 Message Date
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
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
11f0a25a96 WIP 2023-04-20 15:58:56 +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