Commit Graph

114 Commits

Author SHA1 Message Date
66412730de Merge branch 'develop' into feature/invite-panel 2022-08-31 09:03:17 +03:00
6b25c3d7af Web: Client: InvitePanel: Added invitePanel at DialogsStore, added translation keys at InviteDialog, fixed adding and deleting operation with invite list, fixed styles of icons 2022-08-30 18:08:58 +03:00
d0da69a74b
Merge branch 'develop' into feature/settings-menu 2022-08-30 12:11:59 +03:00
5829654183 Web:Common:Fix. 2022-08-30 10:35:24 +03:00
60086b1a68 Merge branch 'develop' into feature/invite-panel 2022-08-30 09:04:22 +03:00
38b217d65e Web: Client: InvitePanel: Added user search, added email validation, added editing for manual added items, fixed invite panel state 2022-08-30 08:55:19 +03:00
e6e45ce2d7 Web:Common:Fix. 2022-08-29 22:43:29 +03:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +03:00
d8d40b1ae1 Web:Common:Add SliderTheme, IndicatorLoaderTheme. 2022-08-29 21:42:47 +03:00
aca4d65f2b Merge branch 'develop' into feature/oforms-scroll 2022-08-29 17:32:48 +03:00
dc235a5bc9
Merge branch 'develop' into feature/create-room 2022-08-29 17:15:20 +03:00
69ecaa8df4 Merge branch 'develop' into feature/settings-menu 2022-08-29 16:37:58 +03:00
0359611cf3 Merge branch 'develop' into feature/oforms-scroll 2022-08-29 16:33:05 +03:00
efafaf51d8 Web:Common:Fix styles ArticleHeader. 2022-08-29 16:15:33 +03:00
1c660c75e8 Web:Client:Fix loader ArticleHeader. 2022-08-29 13:49:15 +03:00
mushka
18b56dbc3e Merge branch 'develop' into feature/create-room 2022-08-29 12:36:47 +03:00
3413367480
Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 12:21:19 +03:00
24ece95419 Web: Fix invalid plugins check on login 2022-08-29 11:29:08 +03:00
9dfe51c614 Web: Common: added oforms filter 2022-08-29 11:28:05 +03:00
1078c7f138 Web: Common: fixed getOforms 2022-08-29 11:27:13 +03:00
8abc7f4095 Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 09:51:34 +03:00
bbca780d4c Merge branch 'develop' into feature/invite-panel 2022-08-29 09:04:37 +03:00
4092aa546a Web: Client: Added base invite panel 2022-08-29 08:50:37 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
ed5f62a877 Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
2022-08-26 18:48:20 +03:00
082614ef85 Web:Common:Fix ColorTheme IconButton. 2022-08-26 11:30:33 +03:00
mushka
8d3a731e60 removed for-dev console.log 2022-08-25 18:16:03 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
04fb7ade63 Web: People: fixed row styles 2022-08-25 10:54:04 +03:00
TimofeyBoyko
674073825e Web:Common:Api: add 'request' func to plugins api 2022-08-24 19:53:33 +03:00
mushka
8ddbc66c6f created new RoomsTypeTranslations constant 2022-08-24 19:38:03 +03:00
mushka
b8637a31c1 added new isRoomsStorage param to saveThirdparty api call 2022-08-24 19:35:34 +03:00
mushka
55faeac29e created new loaders for CreateEditRoomDialog 2022-08-24 17:57:05 +03:00
TimofeyBoyko
6ac0fe0546 Web:Delete useless code 2022-08-24 12:57:11 +03:00
TimofeyBoyko
2a2cf185e5 Web:Common:SettingsStore: add enablePlugins and pluginOptions 2022-08-24 12:33:37 +03:00
TimofeyBoyko
051c9e207a Web:Common:API: move api for plugins from client to common 2022-08-24 12:32:26 +03:00
mushka
23a5faa0a4 cleaned up api/rooms 2022-08-23 14:30:16 +03:00
mushka
afc24f98cc added removeLogo api call to api/rooms 2022-08-23 14:29:47 +03:00
a75f794d3f Web:Components:Change padding for settingsStudio. 2022-08-23 13:50:46 +03:00
1f2cceda94 Web: Common: hidden Selecto for infinite scroll 2022-08-22 14:38:00 +03:00
8e9d2c6d93 Web: Common: upgraded react-selecto 2022-08-22 14:30:42 +03:00
36c30428fc Merge branch 'develop' into feature/settings-common 2022-08-19 15:05:33 +03:00
2925eb27aa Web:Common:Fix. 2022-08-19 14:38:36 +03:00
e5e1d966d1 Web: Files: restored paging, added withPaging parameter 2022-08-19 12:37:30 +03:00
40f2ef1fc2 Web:Common:Fix. 2022-08-19 10:00:34 +03:00
b7eec9fa1d Web:Common:Fix isVersion error. 2022-08-19 10:00:18 +03:00
d293be6d57 Web:Common:Add LinkTheme. 2022-08-19 09:27:04 +03:00
fa01d5bd18 Web:Common: Fix currentColorScheme. 2022-08-18 17:56:17 +03:00
7a83e1d713 Web:Common:Changing badge styles. 2022-08-18 17:53:35 +03:00