|
|
9174a20871
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/api/portal/index.js
# packages/asc-web-common/components/Loaders/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/save-cancel-buttons/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/store/ContextOptionsStore.js
# public/locales/de/Common.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
# web/ASC.Web.Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2022-03-24 14:39:52 +03:00 |
|
Timofey Boyko
|
5df365a59a
|
Web:Common: rename page layout component to section component and update stories, readme and sub-components
|
2022-03-16 15:22:48 +03:00 |
|
|
|
a61ba5697c
|
Web: Common: Added constants.
|
2022-03-15 12:14:41 +03:00 |
|
|
|
bce9e824c8
|
Web: Deleted useless code.
|
2022-03-15 08:13:23 +03:00 |
|
|
|
4b06ae5f0e
|
Web: Files: Common: Added redirect to preparation portal.
|
2022-02-18 10:01:55 +03:00 |
|
|
|
aa6c02b190
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-20 16:26:34 +03:00 |
|
|
|
009a801be7
|
Web: Personal: fixed redirect to login
|
2021-09-07 11:38:24 +03:00 |
|
|
|
b46a3ae6f0
|
Web: Common: PrivateRoute: fixed redirect to login
|
2021-08-24 11:47:00 +03:00 |
|
|
|
3d662a53ee
|
Web: Added transition to the preparation page.
|
2021-07-01 12:12:09 +03:00 |
|
Vladislav Makhov
|
0af3acb46b
|
web: common: add redirect from root in personal
|
2021-06-03 16:30:56 +03:00 |
|
|
|
fc822e5ad5
|
Web: Fix setModuleInfo usage
|
2021-05-20 11:27:50 +03:00 |
|
|
|
a8a6121e59
|
Web: Proxy fixes
|
2021-03-22 17:35:33 +03:00 |
|
Alexey Kostenko
|
3524f3b6c6
|
Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage)
|
2021-03-22 15:27:36 +03:00 |
|
|
|
f3f4037282
|
Web: Fixed Wizard
|
2021-03-18 21:54:03 +03:00 |
|
Alexey Kostenko
|
7cb59e3189
|
Web: Files/People: fixed direct link transition
|
2021-03-04 17:31:37 +03:00 |
|
Alexey Kostenko
|
9e80a2010c
|
Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module)
|
2021-03-04 13:13:26 +03:00 |
|
TatianaLopaeva
|
5212633a8d
|
Web: Moved errors from Common to the Web Client.
|
2021-03-03 11:15:11 +03:00 |
|
Artem Tarasov
|
487fd2affc
|
Web: Components/Common: fix imports
|
2021-02-26 00:19:45 +03:00 |
|
Artem Tarasov
|
48b3c6b445
|
Web: Common: fix after merge, fix imports and hierarchy
|
2021-02-25 17:20:11 +03:00 |
|
