Commit Graph

175 Commits

Author SHA1 Message Date
0359611cf3 Merge branch 'develop' into feature/oforms-scroll 2022-08-29 16:33:05 +03:00
45935a2ace Web: Change order of loading stores + added reset People/Files stores on logout 2022-08-29 13:58:30 +03:00
9154b971c0 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
2022-08-29 13:06:44 +03:00
24ece95419 Web: Fix invalid plugins check on login 2022-08-29 11:29:08 +03:00
1078c7f138 Web: Common: fixed getOforms 2022-08-29 11:27:13 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +03:00
mushka
b4a23f95b7 added isRoom property and calculateIsRoom method to infoPanelStore 2022-08-26 19:10:00 +03:00
mushka
50eb4cf072 Merge branch 'develop' into feature/doc-space-info-panel 2022-08-25 21:38:52 +03:00
e7f3976dbb Web: Fixed login page. 2022-08-24 17:59:50 +03:00
TimofeyBoyko
2a2cf185e5 Web:Common:SettingsStore: add enablePlugins and pluginOptions 2022-08-24 12:33:37 +03:00
6c331a3074 Web: Added functionality for the grace period. 2022-08-24 10:25:08 +03:00
Artem Tarasov
6f9120ee03 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/store/TargetUserStore.js
#	packages/common/store/AuthStore.js
#	packages/common/store/SettingsStore.js
#	packages/common/utils/index.ts
#	packages/login/src/Login.jsx
#	packages/login/src/RoomsLogin.jsx
2022-08-24 10:17:39 +03:00
3854d484a4 Web: Added an alert about a free tariff. 2022-08-22 11:59:18 +03:00
a47c4c09fb Web: Added due date, added date conversion according to page language. 2022-08-18 13:47:33 +03:00
e78b02cd0b Web: Added portal quota, added translations. 2022-08-18 12:28:17 +03:00
12a83327b0 Web: Added payments page. 2022-08-16 10:49:34 +03:00
b82a4206e0 Merge branch 'develop' into feature/settings-common 2022-08-12 18:04:11 +03:00
mushka
a85c33db50 added isRoom method to InfoPanelStore 2022-08-09 19:05:36 +03:00
28e0d02b28 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/index.js
2022-08-06 23:12:39 +03:00
7741d235f7 Web: Optimization of store 2022-08-04 17:34:53 +03:00
mushka
5cd4263b38 Merge branch 'develop' into feature/doc-space-info-panel 2022-08-04 15:21:06 +03:00
359c160ac1 Web: Refactoring routes urls 2022-07-31 13:52:35 +03:00
256c2de843 Web: Removed modules dependencies and People and Files mobx providers 2022-07-28 16:11:55 +03:00
53737a06e8 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/editor/src/client/components/DynamicComponent.js
#	packages/editor/src/client/components/Editor.js
#	packages/editor/src/client/components/SelectFileDialog.js
#	packages/editor/src/client/components/SelectFolderDialog.js
#	packages/editor/src/client/components/SharingDialog.js
#	packages/editor/src/client/helpers/utils.js
#	packages/editor/src/client/helpers/withDialogs.js
#	packages/editor/src/server/lib/helpers/index.js
2022-07-28 10:38:29 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00