|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
|
|
ebbd473ecf
|
Web: fixed getOforms language
|
2022-04-21 15:33:48 +03:00 |
|
|
|
50d627e58c
|
Web: Files: fixed getOforms
|
2022-04-21 13:57:04 +03:00 |
|
|
|
2bf6dec41d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2022-04-21 10:53:58 +03:00 |
|
Timofey Boyko
|
414976c49f
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 10:41:06 +03:00 |
|
Timofey Boyko
|
dfe16d0671
|
Web:Common:Store: update 'setTheme' method for settingsStore
|
2022-04-21 10:32:56 +03:00 |
|
Timofey Boyko
|
01a04029e5
|
Web:Common:Store: add new method 'changeTheme' for user store
|
2022-04-21 10:31:32 +03:00 |
|
|
|
bcef47efa2
|
Web:Common:Added tenantAlias, setTenantAlias to SettingsStore.
|
2022-04-20 18:24:21 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
|
|
e8c46ba42c
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2022-04-19 14:04:10 +03:00 |
|
|
|
b6d838eaa3
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 11:16:50 +03:00 |
|
|
|
5945e063dc
|
Web:Common:Added setCultures from SettingsStore.
|
2022-04-19 10:33:17 +03:00 |
|
Timofey Boyko
|
4f61253687
|
Web:Common:SettingsStore: add theme-key to local storage when set theme method is called
|
2022-04-18 12:16:55 +03:00 |
|
Timofey Boyko
|
d9dec59157
|
Web:Common:Store: change default theme to base
|
2022-04-18 12:05:09 +03:00 |
|
Timofey Boyko
|
797c96a46e
|
Web:Common:Store: add new theme key 'system' for setTheme method
|
2022-04-18 11:51:01 +03:00 |
|
Timofey Boyko
|
4d65b5fcc8
|
Web:Common:Store: remove change theme method from settings store
|
2022-04-18 10:59:35 +03:00 |
|
|
|
6dbf77317d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-18 10:32:31 +03:00 |
|
|
|
fbb04ea80f
|
Web: Common: TfaStore: delete useless
|
2022-04-14 12:41:24 +03:00 |
|
|
|
6d7bb2747b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-04-14 11:14:24 +03:00 |
|
|
|
21489279b4
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2022-04-08 16:42:11 +03:00 |
|
|
|
31dadfd140
|
Web: removed unused code
|
2022-04-08 15:45:08 +03:00 |
|
|
|
231395fd05
|
Web: Common: delete useless
|
2022-04-08 13:18:30 +03:00 |
|
|
|
6d0f4fb37d
|
Web: Common: delete useless
|
2022-04-08 12:24:14 +03:00 |
|
|
|
342c938415
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-07 11:17:57 +03:00 |
|
|
|
12c67953e5
|
Web: Common: SettingsStore: add setMailDomainSettings
|
2022-04-05 15:35:40 +03:00 |
|
|
|
1627a3edf7
|
Web: Common: add avaliable to tfa store
|
2022-04-05 14:40:45 +03:00 |
|
|
|
ca4d825cf8
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-05 14:32:33 +03:00 |
|
|
|
62daba2e97
|
Web: Common: fix crash
|
2022-04-05 14:32:02 +03:00 |
|
|
|
331ab31e02
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
|
2022-04-05 11:18:28 +03:00 |
|
|
|
50b523b862
|
Web: Common: SettingsStore: fix
|
2022-04-05 11:09:50 +03:00 |
|
|
|
fc83ee53a8
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-04 15:18:12 +03:00 |
|
|
|
3d3d383681
|
Web: Files: fixed FormGallery thumbnails
|
2022-04-04 15:17:24 +03:00 |
|
|
|
2c98be7110
|
Web: Common: SettingsStore: delete duplicate
|
2022-04-04 14:13:01 +03:00 |
|
Timofey Boyko
|
7081c3610a
|
Web:Common:Store: add isMobileArticle var
|
2022-04-04 10:52:25 +03:00 |
|
|
|
fdfa1142c4
|
Merge branch 'feature/virtual-rooms-1.2' into feature/confirm-redesign
|
2022-04-01 18:18:35 +03:00 |
|
|
|
8c782a7903
|
Web: Files: added OFORMs gallery
|
2022-03-31 16:10:16 +03:00 |
|
|
|
7abe990d96
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-28 12:36:11 +05:00 |
|
|
|
ec9fa063f8
|
Web: Common: fix unlink two-factor app
|
2022-03-26 13:03:13 +03:00 |
|
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
|
|
d13ef622f8
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-22 14:16:20 +05:00 |
|
Timofey Boyko
|
27fab6de23
|
Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout
|
2022-03-18 11:05:58 +03:00 |
|
Timofey Boyko
|
6b0978b4ad
|
Web:Common:Store: remove useless code
|
2022-03-17 15:24:35 +03:00 |
|
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
|
|
77be460447
|
Web: Common: custom redirect path on logout
|
2022-03-05 13:43:37 +03:00 |
|
|
|
2309bc060f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-02 11:25:08 +03:00 |
|
|
|
2b97c30707
|
Web:Common:Added a setPortalPasswordSettings request to the SettingsStore.
|
2022-03-02 11:10:30 +03:00 |
|
|
|
f3afd79a3f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
# packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
# packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/components/PageLayout/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/context-menu/styled-context-menu.js
# packages/asc-web-components/drop-down/index.js
# packages/asc-web-components/link-with-dropdown/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/themes/dark.js
# products/ASC.Files/Client/public/images/files.menu.svg
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/QuickButtons.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.People/Client/public/images/people.menu.svg
# products/ASC.People/Client/src/components/GroupSelector/index.js
# products/ASC.People/Client/src/components/PeopleSelector/index.js
# products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
# products/ASC.People/Client/src/pages/Home/index.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
|
2022-03-01 13:50:26 +03:00 |
|
|
|
bbe35750f5
|
Merge branch 'develop' into hotfix/campaigns-banner
|
2022-02-28 19:08:13 +05:00 |
|
|
|
507334e438
|
Web: Common: added snackbar exist prop
|
2022-02-28 18:17:09 +05:00 |
|
|
|
32868de412
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# public/locales/de/Common.json
|
2022-02-22 13:53:00 +03:00 |
|
