Commit Graph

157 Commits

Author SHA1 Message Date
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
fbb04ea80f Web: Common: TfaStore: delete useless 2022-04-14 12:41: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
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
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
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
Timofey
8c73f93eed Web:Files:Catalog: fix section rerender when catalog opening on mobile 2022-02-18 20:46:49 +08:00
5e12bf583c Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’ 2022-02-15 18:39:14 +03:00
b03a466591 Web: Common: add set roomsMode 2022-02-06 22:55:15 +03:00
3a16fdccfd Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-03 21:05:07 +03:00
Timofey
223c04a3c7 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-03 20:59:26 +08:00
867d3f4ec7 Web: Common: add roomsMode flag 2022-02-03 01:38:35 +03:00
f6a1d10a98 Web: Common: added maintenance exist param 2022-02-01 13:22:39 +05:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08:00
4fd451f5a7 Web: Common: added checkedMaintenance for banner 2022-01-25 20:31:48 +05:00
Timofey
f5ae02dfc9 Merge branch 'develop' into feature/catalog 2022-01-21 21:06:40 +08:00
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
2022-01-17 19:02:40 +03:00
77937390ef Web: Fix crash of Wizard with default en-US language 2022-01-14 19:12:58 +03:00
8b327ceb66 Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage 2022-01-12 20:13:30 +03:00
441d8875ba Web:Common:Store: change default theme 2021-12-29 23:14:21 +08:00
0ad204743f Merge branch 'develop' into feature/dark-theme 2021-12-29 20:25:29 +08:00
f129a98d93 Web:Common:Store: add array for available themes 2021-12-28 21:35:47 +08:00
2140ccff0b Web:Client: add the ability to get default theme from browser theme and save it in local storage 2021-12-28 19:01:03 +08:00
6fde793f14 Web:add opportunity change theme in profile menu 2021-12-22 22:22:35 +08:00
04ff7308b8 Web:Common:Store: add theme support 2021-12-14 15:52:49 +08:00
a012038f3b Merge branch 'develop' into feature/catalog 2021-12-02 14:59:31 +08:00