Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05:00 |
|
Viktor Fomin
|
50c55f0e29
|
Common: fix logo
|
2022-11-22 13:06:07 +05:00 |
|
|
999e892b7e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-17 17:30:46 +03:00 |
|
|
8e54e59bec
|
Web: Common/Editor: Added a request for requests in advance.
|
2022-11-11 13:52:10 +03:00 |
|
|
7803b0e33c
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-08 16:54:02 +03:00 |
|
|
36bd8eab14
|
Web:Common:Delete onSaveSelectedNewThemes.
|
2022-11-02 16:05:02 +03:00 |
|
|
31c6e0a7aa
|
Web:Common:Add delete method.
|
2022-11-01 18:26:05 +03:00 |
|
Viktor Fomin
|
9510ccbc74
|
Common: SettingsStore: fix logo url
|
2022-10-31 13:29:40 +05:00 |
|
|
2facf7fa7c
|
Web:Common:Add onSaveSelectedNewThemes.
|
2022-10-30 16:40:20 +03:00 |
|
Viktor Fomin
|
d66cf18981
|
Common: SettingsStore: fix
|
2022-10-27 00:29:44 +05:00 |
|
Viktor Fomin
|
cb5836bed2
|
Merge branch 'develop' into bugfix/login
|
2022-10-20 17:54:36 +05:00 |
|
Viktor Fomin
|
de26960561
|
Common: SettingsStore: auto theme
|
2022-10-20 17:43:11 +05:00 |
|
|
285c831477
|
Web:Client:Delete greetingSettingsIsDefault, greetingSettingsIsDefault.
|
2022-10-20 14:08:47 +03:00 |
|
|
c79b525da3
|
Web:Client:Add additionalResourcesIsDefault, companyInfoSettingsIsDefault, greetingSettingsIsDefault, getGreetingSettingsIsDefault, setAdditionalResourcesIsDefault, setCompanyInfoSettingsIsDefault.
|
2022-10-14 17:26:54 +03:00 |
|
|
9b596d6932
|
Web:Common:Add docSpaceLogo, setDocSpaceLogo.
|
2022-09-15 21:19:38 +03:00 |
|
|
1154018e52
|
Web:Common:Fixed api request.
|
2022-09-14 18:29:03 +03:00 |
|
|
edd01a2d91
|
Web:Common:Add whiteLabelLogoUrls.
|
2022-09-14 17:25:31 +03:00 |
|
|
9b15ddf9ac
|
Web:Common:Add whiteLabel methods.
|
2022-09-14 13:59:17 +03:00 |
|
|
229400b830
|
Web:Common:Removed the removal of extra fields from the object in the methods getAdditionalResources, getCompanyInfoSettings.
|
2022-09-14 12:48:09 +03:00 |
|
|
7decafcdc0
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-14 10:18:22 +03:00 |
|
|
0f063b7502
|
Web:Common:Removed unnecessary fields from the object, added a defaultAdditionalResources entry to localStorage.
|
2022-09-13 10:38:25 +03:00 |
|
|
0bf768efda
|
Web:Common:Add defaultWelcomePageSettings in localStorage.
|
2022-09-13 10:13:10 +03:00 |
|
|
5a399eac99
|
Web:Common:Added an entry in the localStorage of the default setting data CompanyInfoSettings.
|
2022-09-12 21:08:50 +03:00 |
|
|
f5256c80d0
|
Web:Common:Add method setGreetingSettings.
|
2022-09-12 17:31:08 +03:00 |
|
|
478af8492d
|
Web:Common:Add data in methods setAdditionalResources.
|
2022-09-10 20:44:22 +03:00 |
|
|
377d3be960
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-10 19:46:57 +03:00 |
|
|
b8f5438c19
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-09 17:10:04 +03:00 |
|
|
f0bf37760b
|
Web:Common:Add methods setAdditionalResources, getAdditionalResources, restoreAdditionalResources.
|
2022-09-09 10:34:45 +03:00 |
|
|
8acc4c5418
|
Web:Common:Moved company settings request after authorization.
|
2022-09-07 12:11:39 +03:00 |
|
|
c41525179c
|
Web:Common:Add methods restoreCompanyInfoSettings, getCompanyInfoSettings, setCompanyInfoSettings, setCompanyInfoSettingsData.
|
2022-09-06 11:03:01 +03:00 |
|
|
055be3cdbe
|
Merge branch 'develop' into feature/accounts-scroll
|
2022-09-05 17:25:28 +03:00 |
|
|
c27a8fc0d3
|
Web: People: added infinite-loader to accounts
|
2022-09-05 14:33:55 +03:00 |
|
Artem Tarasov
|
0621fd9c86
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/dialogs/ConnectDialog/index.js
# packages/login/src/Login.jsx
# packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# yarn.lock
|
2022-08-30 18:38:12 +03:00 |
|
Vlada Gazizova
|
2f822b0406
|
Merge branch 'develop' into feature/settings-common
|
2022-08-29 22:27:08 +03:00 |
|
|
0359611cf3
|
Merge branch 'develop' into feature/oforms-scroll
|
2022-08-29 16:33:05 +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 |
|
TimofeyBoyko
|
2a2cf185e5
|
Web:Common:SettingsStore: add enablePlugins and pluginOptions
|
2022-08-24 12:33:37 +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 |
|
|
b82a4206e0
|
Merge branch 'develop' into feature/settings-common
|
2022-08-12 18:04:11 +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 |
|
|
359c160ac1
|
Web: Refactoring routes urls
|
2022-07-31 13:52:35 +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 |
|