Commit Graph

551 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
62399ce138 НMerge branch 'dev' into create-shout-2 2023-04-30 17:40:42 +02:00
ilya-bkv
e39b6f4068 resolve nextSibling error + refactoring Feed Sidebar 2023-04-29 16:43:50 +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
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
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
bc2abbc2bd Merge branch 'dev' into editor 2023-04-03 17:23:02 +02: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
492dabb7b9 [161] scroll to comments 2023-04-01 04:20:14 +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
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
bniwredyc
e8d6bcff7f simpleimage proxy, minor fixes 2023-03-24 20:36:43 +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
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
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
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
251df4b2c0 New grid 2023-03-10 17:42:48 +00:00
bniwredyc
195781741c editor very WIP 2023-03-08 17:35:13 +01:00
ilya-bkv
b71161ed2d Show new comments 2023-03-06 17:06:48 +03:00
ilya-bkv
1c1cfe9b40 Show followers list 2023-03-05 16:31:36 +03:00
bniwredyc
0a6063d1d0 build fix, chores: lib updates, lint 2023-03-04 18:26:28 +01:00
bniwredyc
9b2cd4be2d likes/dislikes refactoring, who voted popup 2023-03-03 19:26:26 +01:00
a036299887 Fixed comments on the feed page 2023-03-01 20:53:23 +03:00
bniwredyc
b3b1c48d92 likes dislikes 2023-02-28 18:13:14 +01:00
c8985e6d10 wschats-andn-followers 2023-02-23 17:07:25 +03:00
bniwredyc
f5272383c2 goodbye astro, i18n 2023-02-17 10:21:02 +01:00
63ea0b8d63 Show user followers 2023-02-13 13:48:05 +00:00
ilya-bkv
4f47409d5e [WiP] initial text 2023-02-11 12:32:52 +03:00
bniwredyc
878f0cb307 lint & build 2023-02-10 09:33:26 +01:00