Commit Graph

1896 Commits

Author SHA1 Message Date
a7c631d11c Web: Client: Confirm: fix style, button size 2022-03-16 11:54:05 +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
2f4a93188f Web: delete feature disallow char 2022-03-15 13:57:33 +03:00
mushka
57f75cd8a5 merge with feature/virtual-rooms-1.2 2022-03-14 18:53:15 +03:00
780ec9a251 Web: Client: fix 2022-03-14 12:49:50 +03:00
dcb22b1189 Web: Client: fix password input behavior 2022-03-14 12:28:41 +03:00
7e54c41394 Web: Client: fix email input behavior 2022-03-14 11:53:46 +03:00
6552301f90 Web:Studio:Added the field-container-width class for the Automatic time zone setting. 2022-03-11 18:33:24 +03:00
015998da34 Web:Studio:Removed passing props sectionWidth for the LanguageAndTimeZone component. 2022-03-11 18:23:09 +03:00
f05f986f7e Web:Studio:Added the checkSectionWidth function to change the view, added a Consumer to the LanguageAndTimeZone component. Added a condition for heading not to be shown on mobile. 2022-03-11 18:22:11 +03:00
mushka
25ad35ab6a added Normal Touchscreen/Desktop differentiation 2022-03-11 13:41:48 +03:00
aa5fde9b18 Web:Studio:Changed translation of CustomizationDescription for locales ru. Added translation of CustomizationDescription for locales en. 2022-03-10 17:06:50 +03:00
644d6ac8b6 Web:Studio:Page layout Customization. 2022-03-10 16:24:47 +03:00
2738687cfd Web:Studio:Added translation for the Title in the CustomTitles component. 2022-03-10 16:21:14 +03:00
48c35f981b Web:Studio:Added locales en for CustomTitlesTooltip tooltip. 2022-03-10 16:18:46 +03:00
mushka
c3c59ceaff changed size names in app buttons 2022-03-10 15:59:04 +03:00
899e8bfb84 Web: Client: disallow char on email 2022-03-10 11:08:47 +03:00
d2a1d0b3b8 Web: Client: delete useless 2022-03-09 18:01:27 +03:00
949acc338d Web: Client: fix styles 2022-03-09 16:53:49 +03:00
c3e92ba5ee Web: Client: fix 2022-03-09 16:22:09 +03:00
5655f57acd Web:Studio:Changed CustomTitlesSettingsDescription and LanguageAndTimeZoneSettingsDescription for locales en, pt-BR, ru, de, fr, it. Added CustomTitlesWelcome for locales en, pt-BR, de, fr, it. 2022-03-09 12:16:04 +03:00
44dd382bbe Web: Client: add error translate 2022-03-05 14:32:50 +03:00
8e23ef6a15 Web: Client: fix text error 2022-03-05 14:02:15 +03:00
7abf49c62a Web: Client: fix autoFocus 2022-03-05 13:58:35 +03:00
d8f5861c7e Web: Client: logout user on confirm 2022-03-05 13:44:06 +03:00
cd8e90cb9c Web: Client: email autofocus 2022-03-05 11:55:16 +03:00
f3df5c04a3 Web: Client: fix validate inputs 2022-03-05 11:39:20 +03:00
e3285ce44e Web: Client: fix by layout 2022-03-05 11:02:48 +03:00
fe1c01e4c1 Web:Studio:Styling the Customization Component. 2022-03-05 10:18:06 +03:00
264637510d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-05 09:15:15 +03:00
cde35d334f Web:Studio:Styling the Customization Component. 2022-03-05 09:14:55 +03:00
9be309da10 Web:Studio:Added encoding of uploaded logo to base64. 2022-03-04 18:30:42 +03:00
bf46d007a7 Web: Client: fix page change password crash 2022-03-04 10:50:43 +03:00
4965f9ffb6 Web:Studio:Added a CustomizationDescription in the Customization component. Added ru locales for CustomizationDescription. 2022-03-04 09:29:12 +03:00
ab12f85eb4 Web: Client: add loader 2022-03-03 17:58:47 +03:00
2961873796 Web: Client: fix password change page render 2022-03-03 17:31:44 +03:00
da121a1bfe Web: Client: disable code route for standart mode 2022-03-03 17:14:03 +03:00
80194bb222 Web:Studio:Changed setMailDomainSettings, setLifetimeAuditSettings. Added setDNSSettings, getAuditTrailReport to SettingsSetupStore. 2022-03-03 16:05:52 +03:00
03d8f803cd Web:Studio:Encoding images in base64 format. Checking the save White label method when loading an image. 2022-03-03 10:22:19 +03:00
Timofey Boyko
48ad201583 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-02 11:57:20 +03:00
Timofey Boyko
fdd1975a3a Web:Client: fix double settings item in user actions 2022-03-02 11:56:17 +03:00
Timofey Boyko
02b225b78b Web:Client: fix double navigation icon 2022-03-02 11:54:39 +03:00
ea9a0c5703 Web:Studio:Added theme for links in WhiteLabel component. 2022-03-02 11:43:59 +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
f2505f7575 Web:Studio:Added layout to the PortalRenaming component. 2022-03-02 11:21:40 +03:00
6aa9a4a926 Added the WhiteLabe component to the Customization component. 2022-03-02 11:17:08 +03:00
efcfd69ef3 Web:Studio:Added setWhiteLabelSettings, restoreWhiteLabelSettings to the WhiteLabe component. Added the onSave method to the WhiteLabe component. 2022-03-02 11:16:19 +03:00
97b3b8daf7 Web:Common:Added setWhiteLabelSettings, restoreWhiteLabelSettings, setPortalRename, setMailDomainSettings, setIpRestrictions, setIpRestrictionsEnable, setMessageSettings, setCookieSettings, setLifetimeAuditSettings to SettingsSetupStore. 2022-03-02 11:13:02 +03:00
Timofey
19937f50dd Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-01 22:05:41 +08: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