Commit Graph

130 Commits

Author SHA1 Message Date
TimofeyBoyko
34557b2e40 Merge branch 'develop' into feature/accounts-list 2022-08-31 16:31:29 +03:00
370696aba0 Web: Fixed property name for ColorTheme component, changed type => themeId 2022-08-31 15:38:39 +03:00
TimofeyBoyko
073b37aa86 Web:Common:Filter: fix after merge 2022-08-31 11:48:40 +03:00
58c2b8b392 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-31 11:42:02 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
TimofeyBoyko
52629d16df Web:Common:Filter: add support dark theme 2022-08-31 11:28:17 +03:00
50659cdeb9 Common: ColorTheme: fix 2022-08-30 17:03:45 +03:00
6da7e16e52 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-30 14:13:58 +03:00
778b27ed5c
Merge branch 'develop' into feature/security-history-audit 2022-08-30 12:55:38 +03:00
d0da69a74b
Merge branch 'develop' into feature/settings-menu 2022-08-30 12:11:59 +03:00
TimofeyBoyko
b737830e69 Web:Common:Api: delete useless code 2022-08-30 11:57:06 +03:00
5829654183 Web:Common:Fix. 2022-08-30 10:35:24 +03:00
605aee5529 Merge branch 'develop' into feature/security-history-audit 2022-08-30 11:55:19 +05: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
c46fa39060 Merge branch 'develop' into bagfix/init-reset-stores
# Conflicts:
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/index.Files.js
2022-08-29 18:27:33 +03:00
TimofeyBoyko
2c3dd7276d Merge branch 'develop' into feature/accounts-list 2022-08-29 18:22:45 +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
45935a2ace Web: Change order of loading stores + added reset People/Files stores on logout 2022-08-29 13:58:30 +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
e3e47364e0 Merge branch 'develop' into feature/security-history-audit 2022-08-29 13:36:09 +05: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
TimofeyBoyko
8c9db6685c Web:Common:Section: fix section width 2022-08-29 10:42:19 +03:00
8abc7f4095 Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 09:51:34 +03:00
TimofeyBoyko
937d99249e Merge branch 'develop' into feature/accounts-list 2022-08-29 09:47:42 +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
a5e0f98c66 Web: Common: update api for login/audit history 2022-08-26 19:21:03 +05:00
082614ef85 Web:Common:Fix ColorTheme IconButton. 2022-08-26 11:30:33 +03:00
TimofeyBoyko
18cad0911c Merge branch 'develop' into feature/accounts-list 2022-08-26 06:56:29 +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