Commit Graph

354 Commits

Author SHA1 Message Date
bniwredyc
35271ea152 lint, safe lib updates 2023-05-07 15:47:10 +02:00
525ca626fb Added scroll up button in the editor 2023-05-06 18:04:50 +03: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
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
b70e80dacd Merge branch 'feedback' of gitlab.com:discoursio/discoursio-webapp into feedback 2023-01-31 20:40:12 +03:00
dbc11b049a fix-inbox-ws 2023-01-31 20:31:13 +03:00
bniwredyc
6945f7ede5 Merge remote-tracking branch 'gitlab/dev' into feedback 2023-01-31 15:28:14 +01:00
12f5479957 Feed styles fixes 2023-01-31 02:09:33 +03:00
be941828f4 Merge, fixes and bump 2023-01-30 16:42:07 +03:00
47a647c1d7 Fixed props type 2023-01-27 22:29:18 +03:00
0606bbfa0b Comments block on the feed page 2023-01-27 00:42:47 +03:00
ilya-bkv
25d62ace6c [hotfix] default state i18n 2023-01-26 10:48:38 +03:00
Ilya Y
87a99d9e8d
Prosemirror integrate (#86)
Comment Editor
2023-01-26 09:59:43 +03:00
f22d6c60c5 Feed page fixes 2023-01-26 01:13:01 +03:00
4744bd81ab Minor fixes 2023-01-25 01:39:21 +03:00
9483b84bad Hide articles dates on the main page 2023-01-25 01:15:29 +03:00
5de1441895 Set default mode on the author page 2023-01-24 01:12:28 +03:00
95fd5e0f17 Style fixes 2023-01-24 00:31:47 +03:00
cdb0bab8c3 solid-primitives 2023-01-20 13:53:35 +03:00
9722c031a1 merged 2023-01-20 13:50:29 +03:00
Ilya Y
1977493dcd
Delete reaction (#85)
* Delete reactions
2023-01-20 07:40:55 +03:00
6ae1296596 merged 2023-01-08 00:47:45 +03:00
bniwredyc
0cd5dd1498 recursive comments 2023-01-04 14:26:18 +01:00
ilya-bkv
eb7e7bd063 Show profile tabs (comments and about) 2022-12-29 15:35:24 +03:00
3b2382b59b Fixed linter errors 2022-12-21 23:39:40 +03:00
09a4f90b1a Profile page fixes 2022-12-21 23:31:16 +03:00
Tony
0b70289195
Prepare inbox (#65)
Chat client - MVP
2022-12-17 06:27:00 +03:00
Igor Lobanov
e332a8a674 article page. & comments fix 2022-12-06 17:03:55 +01:00
0d3a7e5c64 merged 2022-12-03 10:15:13 +03:00
Igor Lobanov
e61181392c home page tops fix, all authors, all topics fixes and more 2022-12-02 16:28:07 +01:00
8256ed2c87 fixl 2022-12-02 14:42:06 +03:00
c1729ba18b linter-unfuck 2022-12-02 14:35:15 +03:00
cc87a21b46 fixed-profile 2022-12-02 09:54:28 +03:00
c5906a2762 mrged-testing 2022-12-02 09:28:05 +03:00
1831c9b61f Merge branch 'dev' of github.com:Discours/discoursio-webapp into dev 2022-12-01 12:53:43 +03:00
c086a242b7 Fixed all authors page style 2022-12-01 00:50:33 +03:00
38cee93f33 reaction fix 2022-11-29 14:01:23 +03:00
a880c6e7d9 Added subscription and security pages settings 2022-11-29 01:14:19 +03:00
238449ba1d linting-passing-ritual-dance 2022-11-27 21:36:45 +03:00
a3f63e0da0 slider-as-wrapper 2022-11-27 20:02:04 +03:00
d68cb92462 Merge remote-tracking branch 'origin/prepare-inbox' into testing 2022-11-27 14:02:16 +03:00
d0a165c3f4 media-audio-view 2022-11-27 14:00:44 +03:00
9b4cede871 beautiful all-topics and all-authors, some icons 2022-11-27 11:15:03 +03:00
ilya-bkv
ba7395f4b7 Chat list [WiP] 2022-11-27 10:10:04 +03:00
ilya-bkv
85f82d4898 Merge remote-tracking branch 'origin/prepare-inbox' into prepare-inbox 2022-11-27 08:50:05 +03:00
ilya-bkv
ea9d440cdf Invite users modal 2022-11-27 08:49:48 +03:00
f6ec3558d6 wip-fixing 2022-11-26 19:51:08 +03:00
27514b495c hotixes-2 2022-11-26 04:46:34 +03:00
aea582cf5e all-authors-topics-stat-fixes 2022-11-25 08:54:19 +03:00
ilya-bkv
abd18c24a2 init inbox context 2022-11-24 18:39:31 +03:00
ilya-bkv
e2679ce6b1 Wip 2022-11-24 15:58:07 +03:00
ilya-bkv
9af56f3425 Merge remote-tracking branch 'origin/prepare-inbox' into prepare-inbox
# Conflicts:
#	src/stores/inbox.ts
2022-11-24 12:08:56 +03:00
ilya-bkv
68ac7b82ba Wip 2022-11-24 12:07:52 +03:00
07f3a65c40 update-api 2022-11-24 12:06:48 +03:00
1054dee23d merged 2022-11-24 11:07:56 +03:00
7a6b028d1b Merge branch 'prepare-inbox' into prepare-comments 2022-11-24 11:04:48 +03:00
fe066b7e3f fixed-comments 2022-11-24 10:33:16 +03:00
ilya-bkv
11cbdd47af Linter fix 2022-11-24 10:11:24 +03:00
ilya-bkv
6a94474732 Resolve Conversation 2022-11-24 09:52:31 +03:00
Igor Lobanov
e8df43bfb5 Merge remote-tracking branch 'origin/dev' into prepare-inbox 2022-11-23 23:47:55 +01:00
abb2075069 Minor style fixes 2022-11-23 23:47:06 +03:00
c4ecec9c06 Create rating control. Refactoring style. 2022-11-23 22:14:59 +03:00
8cc0fd1359 linter, linter, let me work 2022-11-23 09:01:38 +03:00
978eb1e4d9 fix-linter 2022-11-23 08:38:55 +03:00
75af4d5ce0 Merge branch 'prepare-comments' into prepare-inbox 2022-11-23 08:33:30 +03:00
ilya-bkv
4ddf3dce53 Merge remote-tracking branch 'origin/dev' into prepare-inbox 2022-11-23 08:20:02 +03:00
ilya-bkv
57a216de03 [WIP] Chat creation 2022-11-23 07:12:11 +03:00
817d2e2d74 fix-condition 2022-11-22 22:04:55 +03:00
3624004e03 all-topics-all-authors-cosmetics-and-refactoring 2022-11-22 12:27:01 +03:00
ilya-bkv
62926197d1 Merge remote-tracking branch 'origin/auth-fixes' into prepare-inbox 2022-11-22 06:22:25 +03:00
Igor Lobanov
ff04a63ebc fixes 2022-11-22 04:05:20 +01:00
ilya-bkv
9f0502cab0 Merge remote-tracking branch 'origin/dev' into prepare-inbox
# Conflicts:
#	src/utils/config.ts
2022-11-21 09:01:20 +03:00
ilya-bkv
6e21d0640b Merge remote-tracking branch 'origin/dev' into prepare-inbox
# Conflicts:
#	src/components/Inbox/Message.module.scss
#	src/components/Views/Inbox.tsx
#	src/styles/Inbox.scss
#	src/utils/config.ts
2022-11-21 08:38:34 +03:00
ilya-bkv
ad55c1972b [WIP] Refactor message card 2022-11-21 08:06:53 +03:00
Igor Lobanov
382d420f38 lint 2022-11-21 01:26:20 +01:00
Igor Lobanov
995a7be94e Merge branch 'search-component' of github.com:Discours/discoursio-webapp into search-component 2022-11-21 01:02:00 +01:00
bee558834f Minor style fix 2022-11-21 01:19:03 +03:00
296011eb57 Style fixes 2022-11-21 01:10:07 +03:00
Igor Lobanov
90532fe7bb Merge branch 'search-component' of github.com:Discours/discoursio-webapp into search-component 2022-11-20 22:26:10 +01:00
Igor Lobanov
1cf942f6c8 i like to move it. move it 2022-11-20 22:25:59 +01:00
94f9e77203 Style fixes 2022-11-21 00:23:12 +03:00
73b61b3828 Merge branch 'search-component' of https://github.com/Discours/discoursio-webapp into search-component
 Conflicts:
	src/components/Views/AllAuthors.tsx
	src/components/Views/AllTopics.tsx
2022-11-19 16:16:05 +03:00
9f537a75c1 Fixed alltopics and all authors page style 2022-11-19 16:04:42 +03:00
8364acb85b linter-passing 2022-11-19 11:16:00 +03:00
89450336e7 authors-with-counters 2022-11-19 11:09:52 +03:00
180db86fd2 Added search component to the all authors page 2022-11-18 21:54:32 +03:00
e80a9ec7e7 Added search component 2022-11-18 21:33:31 +03:00
Igor Lobanov
e6ca25fffa Merge remote-tracking branch 'origin/dev' into refactoing-catch-up
# Conflicts:
#	src/components/Views/Search.tsx
2022-11-18 03:46:11 +01:00
Igor Lobanov
46b4ecc7ea catch up with backend refactoring 2022-11-18 03:23:04 +01:00
e39414d975 search-wip, bio fix 2022-11-18 02:20:40 +03:00
a8247bafd6 need some cosmetics 2022-11-17 23:08:12 +03:00
2f65142236 linter-pass-sort-fix 2022-11-17 20:32:21 +03:00
b1b3e12811 abc sort fix 2022-11-17 20:20:19 +03:00
94ff466e3d some fixes 2022-11-17 09:56:24 +03:00
e65b075dca Merge remote-tracking branch 'origin/dev' into client-routing-minor-fixes 2022-11-17 09:39:37 +03:00
ff85721961 loadby-refactored-merged 2022-11-17 09:32:48 +03:00
74415132fa Load more button minor fix 2022-11-17 00:15:01 +03:00
2341e83772 Home page fixes 2022-11-17 00:08:04 +03:00
ilya-bkv
a0a7a5146a WIP 2022-11-16 22:39:50 +03:00
ilya-bkv
d504e02ccb WIP 2022-11-16 22:38:16 +03:00
ilya-bkv
f3eccb1ff2 Merge remote-tracking branch 'origin/layouts' into prepare-inbox 2022-11-16 15:26:44 +03:00