|
|
03b03ed910
|
Merge branch 'develop' into feature/sso
# Conflicts:
# packages/client/public/images/actions.upload.react.svg
# packages/client/public/images/empty_screen_privacy.png
# packages/client/public/locales/en/SingleSignOn.json
# packages/client/public/locales/ru/SingleSignOn.json
# packages/client/src/helpers/constants.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
# packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
# packages/client/src/store/SsoFormStore.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
|
2022-08-02 12:05:15 +03:00 |
|
TimofeyBoyko
|
177e415b83
|
Web:PortalSettings:Integration: add submenu for thirdparty and plugins
|
2022-08-02 10:21:09 +03:00 |
|
TimofeyBoyko
|
4f32b96e45
|
Web:Pages:PortalSettings: add integration routes
|
2022-08-02 10:20:19 +03:00 |
|
TimofeyBoyko
|
126bb7fc05
|
Web:PortalSettings:Utils: fix checkPropertyByLink if item is undefined
|
2022-08-02 09:57:27 +03:00 |
|
TimofeyBoyko
|
158cb45d90
|
Web:PortalSettings:Utils: add integration-plugin to settingsTree
|
2022-08-02 09:55:34 +03:00 |
|
|
|
27fa822017
|
Web: Commented useless code
|
2022-08-01 19:47:29 +03:00 |
|
|
|
72878d5ca8
|
Web: Fix open NavMenu on Mobile
|
2022-08-01 18:47:11 +03:00 |
|
|
|
ac3683d7ab
|
Web: Fix i18n ns name for Files.json
|
2022-08-01 18:12:15 +03:00 |
|
|
|
af5cfe6553
|
Web: Rename translation file on 'en'
|
2022-08-01 18:03:27 +03:00 |
|
|
|
ebc6ce1d67
|
Web: Commented console logs
|
2022-08-01 17:53:26 +03:00 |
|
|
|
d093c97b97
|
Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)
|
2022-08-01 15:37:33 +03:00 |
|
|
|
fd21ad788c
|
Web: Portal-Settings: Hide security/admins
|
2022-08-01 14:53:26 +03:00 |
|
|
|
3ed5ca8706
|
Web: Fix old url to /filter
|
2022-08-01 14:52:18 +03:00 |
|
|
|
fa04e92286
|
Web: Added TODO: Change url by category
|
2022-08-01 13:30:26 +03:00 |
|
|
|
ec70758d79
|
Web: Fix some old urls to /filter
|
2022-08-01 13:29:27 +03:00 |
|
|
|
d0289756ec
|
Web: Changed routing by new categoryType
|
2022-07-31 20:14:28 +03:00 |
|
|
|
359c160ac1
|
Web: Refactoring routes urls
|
2022-07-31 13:52:35 +03:00 |
|
|
|
d0637936cb
|
Web: Fix translation getDefaultFileName()
|
2022-07-31 13:13:16 +03:00 |
|
|
|
e0856c1503
|
Web: bootstrap: Commented registerSW
|
2022-07-31 12:53:20 +03:00 |
|
|
|
9890724990
|
Web: Accounts: Fix loaders
|
2022-07-31 12:52:53 +03:00 |
|
|
|
995d07deae
|
Web: Upgrade yarn to v3.2.2
|
2022-07-29 18:20:57 +03:00 |
|
|
|
211ac2666f
|
Web: Fix error on user equals null
|
2022-07-28 19:11:48 +03:00 |
|
|
|
027b23ba92
|
Web: Added toast
|
2022-07-28 19:10:58 +03:00 |
|
|
|
98645969b6
|
Web: Moved some files from past locations
|
2022-07-28 19:10:36 +03:00 |
|
|
|
a87497a385
|
Web: Moved src/components/pages/* to src/pages + Added new aliases SRD_DIR, PACKAGE and fix paths + Renamed /settings to /portal-settings
|
2022-07-28 17:34:27 +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 |
|
|
|
c5baa8834d
|
Web: Fix 'Accounts' imports, routes and includes
|
2022-07-26 12:51:52 +03:00 |
|
|
|
0ebd28f299
|
Web: Merged 'People' module with 'Client' and fixed paths
|
2022-07-25 22:19:47 +03:00 |
|
|
|
280f702cf9
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/NavMenu/index.js
# packages/client/src/store/ProfileActionsStore.js
# yarn.lock
|
2022-07-25 21:29:04 +03:00 |
|
|
|
f9640a400c
|
Web: Moved 'People' images and translations to 'Client'
|
2022-07-25 10:29:16 +03:00 |
|
|
|
7684fe7632
|
Web: Added 'Accounts' routing
|
2022-07-24 20:38:41 +03:00 |
|
|
|
c83811576c
|
Web: Fix files-settings routing
|
2022-07-24 20:17:45 +03:00 |
|
|
|
7db4dcd407
|
Web: Client: Added missing code
|
2022-07-24 20:03:48 +03:00 |
|
|
|
c956d8b696
|
Web: Merged 'Files' module with 'Client' and fixed paths
|
2022-07-24 19:57:03 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
