Commit Graph

8834 Commits

Author SHA1 Message Date
72fdbe5295 Web:Studio:Fix functions checkInnerWidth and checkHeightSettingsBlock. 2022-03-25 00:56:05 +03:00
831f70f817 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-24 21:06:02 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
01e283d2cc Web: Fix Wizard opening 2022-03-24 20:54:35 +03:00
ec215d8e93 Web:Studio:Refactoring the Customization component.
Added to state heightSettingsBlock, heightScrollBody. Refactoring the checkHeightSettingsBlock function.
2022-03-24 20:50:01 +03:00
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
2bd421994e Web: Fixed import. 2022-03-24 13:26:20 +03:00
f464eb6e35 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-24 12:08:58 +05:00
9d838b265d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-23 22:12:59 +03:00
c00cbf667d Web:Studio:Refactoring the LanguageAndTimeZone component. 2022-03-23 22:12:19 +03:00
c3af9b1998 Web:Studio:Refactoring the Customization component. 2022-03-23 22:11:15 +03:00
9660b325e9 Web:Components:Styling CustomizationNavbar. 2022-03-23 22:10:19 +03:00
643bf726b3 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-23 16:10:11 +05:00
cc5e397a9c Web: Client: Tests: update screenshots 2022-03-23 12:21:28 +03:00
4840745843 Web: Client: Tests: add fake qr image 2022-03-23 11:54:01 +03:00
d8bfe32537 Web: Client: Confirm: fix inputWidth 2022-03-23 11:46:57 +03:00
c0fc2eafd0 Web: Client: Confirm: hide qr code on tablet/mobile 2022-03-23 11:43:25 +03:00
4eb25bcab5 Web: Client: Confirm: fix withLoader 2022-03-23 11:39:07 +03:00
07e3e7b1b2 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-test 2022-03-23 10:54:23 +03:00
e05b78bef4 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-22 21:18:27 +03:00
626988a987 Web:Studio:Scrollbar styling. 2022-03-22 21:17:30 +03:00
51b44186a8 Web: Client: About: fix personal logo color 2022-03-22 18:00:09 +03:00
62afb4800a Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-22 13:46:03 +03:00
0b642fa5a1 Web:Studio:Added Scrollbar, LanguageTimeSettings styling. 2022-03-22 13:45:33 +03:00
251f149eb6 Web: Revert withoutBodyScroll after merge. 2022-03-22 13:19:35 +03:00
2559bec9e9 Web: RestoreBackup: Fixed offsetLeft of help button component. 2022-03-22 12:57:17 +03:00
bbc0d20321 Web: Backup: Changed translation. 2022-03-22 12:40:57 +03:00
5b6251f5e7 WEb: Backup: Deleted useless code. 2022-03-22 12:37:51 +03:00
21a2e75ae6 Web: RestoreBackup: Added toastr when file wasn't selected and restore button was clicked. 2022-03-22 12:36:00 +03:00
fd4320d147 Web: RestoreBackup: Added user agreement on restore to the dialog. 2022-03-22 12:27:27 +03:00
d13ef622f8 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-22 14:16:20 +05:00
a4deb55535 Web: AutoBackup: Added clarification on the time. 2022-03-21 17:32:46 +03:00
eff37db49c Web: Client: fixed maintenance timeout 2022-03-21 16:15:56 +05:00
6215091502 Web: Added red border when file is not selected and restore button clicked. 2022-03-21 13:53:59 +03:00
26272fc2a5 Web: Separated BackupTypes constant. 2022-03-21 12:06:10 +03:00
8a7641798b Web: Backup: Added organization name from settings. 2022-03-21 11:15:51 +03:00
8aa98ef263 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-21 11:06:16 +03:00
33e6f6faaf Web: Client: NavMenu: fix logo padding 2022-03-21 11:05:42 +03:00
f54b0d0f25 Web: files: Deleted useless code. 2022-03-21 10:45:55 +03:00
4e4bea4d02 Web: Components: Deleted useless classname. 2022-03-21 10:44:52 +03:00
bdc263796a Web: Client: Tests: update screenshots 2022-03-19 00:02:56 +03:00
b1f5d54cb1 Web: Client: Tests: fix create user page render 2022-03-18 23:50:28 +03:00
552e53c1bc Web: Client: Tests: update create user page render test 2022-03-18 23:40:24 +03:00
bd7389fe27 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-test
# Conflicts:
#	yarn.lock
2022-03-18 22:50:34 +03:00
ef600712b8
Merge pull request #591 from ONLYOFFICE/feature/refactoring-pagelayout
Feature/refactoring pagelayout
2022-03-18 19:09:26 +03:00
d343631578 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-18 17:02:57 +03:00
08ba1b82ae Web:Studio:Styling CustomizationNavbar. 2022-03-18 17:01:55 +03:00
4bbc3e2b5e Web:Studio:Styling LanguageAndTimeZone.Adding a scroll check. 2022-03-18 17:01:01 +03:00
9ca8191ddd Web: ManualBackup: Added import. 2022-03-18 15:58:30 +03:00
4a959f3667 Web: Backup: Fixed a bug of false disable of third-party resources. 2022-03-18 15:52:25 +03:00
786fdb761d Web: PreparationPortal: Renamed file. 2022-03-18 15:35:58 +03:00
e99b63c443 Web: PreparationPortal: Fixed position of image on mobile. 2022-03-18 15:34:13 +03:00
c61df3290c Web: AutoBackup: Fixed dropdown height for time and count of copies. 2022-03-18 15:18:14 +03:00
a53456691d Web: Backup: Fixed double of toastr when create backup. 2022-03-18 15:08:17 +03:00
5f529fd959 Web: Client: added banner utils for mobile layout 2022-03-18 15:47:53 +05:00
eab3a2899b Web: Client: added timeout for campaigns 2022-03-18 15:47:10 +05:00
Timofey Boyko
a93ac93785 Web:Client:Studio: fix display header-navigation-items 2022-03-18 13:03:49 +03:00
Timofey Boyko
052a76aa36 Web:Login: fix errors after merge 2022-03-18 11:15:50 +03: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
9e5d6c4080 Web:Client:Studio: change 'pagelayout' component to 'section' component 2022-03-17 16:36:04 +03:00
Timofey Boyko
21993a7d41 Web:Client:Studio: create new article v1.2.1 and change 'pagelayout' component to 'article' and 'sections' components 2022-03-17 16:34:00 +03:00
Timofey Boyko
829c4a5e1a Web:Client:Studio: fix open catalog for mobile devices 2022-03-17 16:32:41 +03:00
26d092085e Web: Login: fix enter action 2022-03-17 16:26:49 +03:00
Timofey Boyko
5e4798285a Web:Login: change 'pagelayout' component to 'section' component 2022-03-17 16:21:59 +03:00
9bc3adb433 Web: Login: fix 2022-03-17 15:56:23 +03:00
00e5b2ebf6 Web: Login: fix show error logic 2022-03-17 15:46:09 +03:00
c08b673421 Web: Login: fix enter action 2022-03-17 15:39:45 +03:00
679d0d51aa Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-17 12:42:26 +03:00
04a5e4d1cc Web: Client: Confirm: fix 2022-03-17 12:42:16 +03:00
4ea8d65c08 Web: Login: fix field jumping 2022-03-17 12:28:20 +03:00
b1894a03f3 Web: Login: fix show error 2022-03-17 12:25:46 +03:00
a82c27a19c Web:Studio:Added Consumer, renaming the checkInnerWidth function to checkSectionWidth, adding to the state sectionWidth. 2022-03-16 19:10:05 +03:00
d4938aac6f Web: Login: fix forgot email input 2022-03-16 18:04:43 +03:00
06c946a2bf Web:Studio:Border styling. 2022-03-16 17:41:36 +03:00
bfb27ce17f Web: Login: fix registration email input 2022-03-16 17:33:26 +03:00
4f799f1916 Web:Studio:Passing props sectionWidth to child components. 2022-03-16 17:24:33 +03:00
5be408a827 Web:Studio:Removed Consumer, added checkInnerWidth call when mounting, added sectionWidth prop in LanguageAndTimeZone component. 2022-03-16 17:23:33 +03:00
4a2be198cd Web:Studio:Added sectionWidth. 2022-03-16 17:21:16 +03:00
8af77e313f Web: Layout: Fixed scroll on mobile. (Added showing header if visible space is empty, added hiding the header if the scrolled part is larger than the header) 2022-03-16 17:14:34 +03:00
c77f35895c Web: Login: use email input 2022-03-16 16:27:33 +03:00
b6c595bb8a Web:Studio:Added Consumer and conditions for mobile display. 2022-03-16 15:46:59 +03:00
f212ffb5d1 Web:Studio:Added Consumer. 2022-03-16 15:46:02 +03:00
c001de8f74 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-16 13:03:29 +03:00
7ad41b219e Web: Client: Confirm: fix button size 2022-03-16 12:49:31 +03:00
9056b14453 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-16 12:11:48 +03:00
ba7ea3f9d6 Web:Studio:Styling, added "resize" event, added checkInnerWidth function, removed Consumer, added useEffect, useState hooks for Customization component. 2022-03-16 12:11:08 +03:00
fcb41aeb9e Web:Studio:Styling, added a "resize" event, changed the checkInnerWidth function, removed the Consumer for the LanguageAndTimeZone component. 2022-03-16 12:07:33 +03:00
b637ccc76a WEb: RestoreBackup: Added loader for restore button. 2022-03-16 12:05:17 +03:00
6f7cb4c6f4 Web:Studio:Changed the margin-right of the arrow-button for the HeaderContainer. 2022-03-16 12:03:34 +03:00
a7c631d11c Web: Client: Confirm: fix style, button size 2022-03-16 11:54:05 +03:00
b05aa5048b Web:Studio:Styling the PortalRenaming component. 2022-03-16 11:36:26 +03:00
2ea15ac80f Web: Login: fix button size 2022-03-16 11:36:00 +03:00
d9dec883b8 Web:Studio:Styling the CustomizationNavbar component. 2022-03-16 11:35:54 +03:00
f9b1e26b0b Web:Studio:Styling the CustomTitles component. 2022-03-16 11:35:28 +03:00
c4c02698d3 Web:Studio:Changed the name "Time Zone" to "Time zone". 2022-03-16 11:32:41 +03:00
0a87411fbc Web: Login: fix buttons size 2022-03-16 11:26:28 +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
1f7f9e0aa6 Web: Backup: Added translations (en). 2022-03-16 10:05:29 +03:00
2d2182d171 Web: RestoreStorage: Deleted unused code. 2022-03-15 16:36:37 +03:00
9886c434b2 Web: Login: fix 2022-03-15 14:32:53 +03:00
2f4a93188f Web: delete feature disallow char 2022-03-15 13:57:33 +03:00
39bca9a805 Web: RestoreBackup: Fixed page crash. 2022-03-15 13:47:55 +03:00
de81329df2 WEb: Backup: Added help button component. 2022-03-15 12:43:02 +03:00
8231afe6d1 Web: Client: fixed visible for banner 2022-03-15 14:38:26 +05:00
969f62a99c Web: PreparationPortal: Removed settings request. 2022-03-15 10:05:05 +03:00
8cbc15a15d Web: Backup: Fixed language for weekdays and for help url. 2022-03-15 09:09:22 +03:00
bce9e824c8 Web: Deleted useless code. 2022-03-15 08:13:23 +03:00
mushka
57f75cd8a5 merge with feature/virtual-rooms-1.2 2022-03-14 18:53:15 +03:00
48f747fa5e Web: Client: added inMaintenance prop 2022-03-14 19:40:08 +05:00
55ef22b5f5 Web: Login: fix 2022-03-14 17:13:22 +03:00
5ea216e0c9 Web: Login: fix 2022-03-14 17:08:33 +03:00
4538a11b89 Web: Login: fix 2022-03-14 14:21:42 +03:00
115aa461c6 Merge branch 'develop' into hotfix/campaigns-banner 2022-03-14 15:51:38 +05: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
edc20a1f9e Web: Login: fix email input behavior 2022-03-14 11:48:45 +03:00
5cff781339 Web:Studio:Added a CustomizationNavbar component to Customization. Refactoring of the Customization component. 2022-03-13 16:30:53 +03:00
b089ee1105 Web:Studio:Added CustomizationNavbar component. 2022-03-13 16:29:09 +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
4b32423c3c Web: Backup: MobileView: Added showing and hiding of section header. 2022-03-11 16:49:22 +03:00
36959d8eec Web: Backup: Fixed styles for backup. 2022-03-11 16:40:00 +03:00
934b9824d4 Web: Changed translation according layouts. 2022-03-11 16:07:05 +03:00
32f4b30e3e WEb: AutoBackup: Refactoring, deleted useless code. 2022-03-11 15:55:43 +03:00
0533670187 Web: RestoreBackup: Deleted useless code, refactoring. 2022-03-11 15:38:32 +03:00
12174c73b1 Web: ManualBackup: Refactoring, deleted useless code. 2022-03-11 15:23:48 +03:00
ef2e13007e Web: Backup: Adding storage information from the store. 2022-03-11 15:04:42 +03:00
mushka
25ad35ab6a added Normal Touchscreen/Desktop differentiation 2022-03-11 13:41:48 +03:00
95742e0ad6 Web: Backup: changed routing for mobile view. 2022-03-11 11:37:54 +03:00
ed4cb3ab74 Web: Arrangement of translations alphabetically. 2022-03-10 18:35:16 +03:00
ed9ea31b73 Web: Backup: Deleted useless translations. 2022-03-10 17:52:57 +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
79e1b0e082 Web: Login: disable with error 2022-03-10 17:01:42 +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
64dfd61858 Merge branch 'develop' into feature/backup 2022-03-10 12:15:26 +03:00
5585a28f0b Web: Login: use email inputs 2022-03-10 11:58:12 +03:00
a43c41b251 Web: Added translation for Data Management on en, ru. 2022-03-10 11:21:24 +03:00
899e8bfb84 Web: Client: disallow char on email 2022-03-10 11:08:47 +03:00
c95d3e910d Web: Arrangement of translations alphabetically. 2022-03-10 10:22:26 +03:00
ae267b9e18 WEb: Separated translations. 2022-03-10 09:24:03 +03:00
3bbf82d918 add new lines 2022-03-09 19:07:24 +03:00
d2a1d0b3b8 Web: Client: delete useless 2022-03-09 18:01:27 +03:00
37f42e57c4 Web: RestoreBackup: Deleted useless code. 2022-03-09 17:53:39 +03:00
eafb96796b Web: RestoreBackup: Added socketHelper to the backup list dialog. 2022-03-09 17:49:23 +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
e38ac6393b Web: RestoreProgress: Fixed storage. 2022-03-09 15:42:22 +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
2aa0a97f98 Web: AutoBackup/ManualBackup: Deleted useless code. 2022-03-09 12:10:36 +03:00
ce4f4cb9b6 Web: AutoBackup: Renaming. 2022-03-09 12:04:45 +03:00
69ea81d70e Web: Login: Tests: update screenshots 2022-03-09 11:55:46 +03:00
aaf50bdc85 Web: BackupStore: Fixed backup progress. 2022-03-09 11:54:14 +03:00
947115a6ca Web: Login: fix modal style 2022-03-09 11:43:08 +03:00
df920f7b4e Web: Login: delete useless 2022-03-09 11:30:34 +03:00
c0b0a26faa Web: Backup: Moved common third-party list to the story. 2022-03-09 11:08:58 +03:00
7130cd884a Web: Fixed translation for max copies. 2022-03-09 10:42:38 +03:00
17743d3e9b Web: Files: Added translation for fr, de, it, zh-CH languages translation. 2022-03-09 10:39:38 +03:00
b43220100f Web: BackupStore: Fixed period label. 2022-03-05 14:53:14 +03:00
44dd382bbe Web: Client: add error translate 2022-03-05 14:32:50 +03:00
ef2d2e5a1c Web: Backup: Moved backup progress to the store, refactoring. 2022-03-05 14:30:07 +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
14c51ff4a6 Web: Login: fix form jump 2022-03-05 11:57:41 +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
1fce535cfb WEb: Backup: Added constants. 2022-03-04 17:00:04 +03:00
d6fe627217 Web: AutoBackup: Refactoring. 2022-03-04 16:12:06 +03:00
10e8ab7a12 Web: Backup: Moved auto backup information to the store. 2022-03-04 15:55:04 +03:00
a603abf556 Web: Login: disabled social buttons on loading 2022-03-04 12:32:39 +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
aa4a65ba8f Web: Login: fix styles 2022-03-03 22:23:25 +03:00
e9cfff3013 Web: Login: add cancel buttons 2022-03-03 22:16:06 +03:00
48f9afd6b0 Web: Login: delete useless 2022-03-03 21:51:09 +03:00
a83ad2abdd Web: Login: delete useless 2022-03-03 18:37:50 +03:00
ab12f85eb4 Web: Client: add loader 2022-03-03 17:58:47 +03:00
6209ff6d93 Web: Login: fix modal 2022-03-03 17:51:51 +03:00
2961873796 Web: Client: fix password change page render 2022-03-03 17:31:44 +03:00
a3530a2e33 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/confirm-test 2022-03-03 17:25:25 +03:00
8bba8e8345 Web: Login: wait all promise 2022-03-03 17:22:02 +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
a27734ed97 Web: Added new translations. 2022-03-03 14:06:06 +03:00
9c98b70686 Web: Login: add loader 2022-03-03 13:13:56 +03:00
5a355090dd Web: Login: add loader 2022-03-03 13:08:56 +03:00
f161598193 Merge branch 'feature/login-redesign' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-03 12:54:59 +03:00
6822fafda0 Web: Login: fix buttons width 2022-03-03 12:47:20 +03:00
6102b15c6d Web: Login: fix dialog 2022-03-03 12:44:09 +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
85e8ceede5 Web: Added new translations for help information. 2022-03-02 18:54:39 +03:00
2978adcdf3 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-02 18:18:05 +03:00
1abe5f4122 Merge branch 'develop' into feature/login-redesign 2022-03-02 18:15:03 +03:00
1ce9b25093 Web: Campaigns: Added more locales 2022-03-02 17:43:10 +03:00
6fe7eb39cf Web: Deleted close button from dialog. 2022-03-02 16:33:02 +03:00
53eef1101b WEb: PreparationPortal: Deleted useless code. 2022-03-02 16:26:18 +03:00
d565fffc07 Web: Added preparation portal dialog. 2022-03-02 16:19:34 +03:00
57633ad222 Web: Client: Tests: change password test 2022-03-02 12:30:13 +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
f57cff1dcc Merge branch 'develop' into feature/backup 2022-03-02 11:21:57 +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
4b59e111af Web: PreparationPortal: Added progress initiation when restore portal. 2022-03-02 11:12:59 +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
9e8b80c6dd Api: added form method support 2022-03-01 14:10:41 +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
Timofey
7bd66a04ab Web:Client:NavMenu: add special name for catalog burger for mobile view 2022-03-01 17:53:48 +08:00
fd51115811 Web: ManualBackup: Fixed progress for desktop view. 2022-03-01 09:05:19 +03:00
Timofey
062cb1e6cd Web:Studio: disable settings icon in header 2022-03-01 01:39:24 +08:00
fb1dea3522 Web: Client: add test:ui script 2022-02-28 19:49:36 +03:00
a18bcf07b8 Web: Client: Tests: change/activation email tests 2022-02-28 19:49:06 +03:00
eea48ab5eb Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/confirm-test 2022-02-28 19:26:48 +03:00
de5af49552 WEb: AutoBackup: Deleted isDesktop prop; 2022-02-28 18:47:42 +03:00
e4deaa19b0 Web: Settings: Added backup store. 2022-02-28 18:31:11 +03:00
bbe35750f5 Merge branch 'develop' into hotfix/campaigns-banner 2022-02-28 19:08:13 +05:00
9a64032650 Web: Client: added snackbar props for home 2022-02-28 18:25:48 +05:00
bb27fc60a7 Web: Components: added margin for home page 2022-02-28 18:25:08 +05:00
7a52c38871 Web: added set snackbar state 2022-02-28 18:24:41 +05:00
9aff975cd4 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-02-28 16:17:48 +03:00
322b07dd5e Web: Login: Tests: update screenshots 2022-02-28 16:16:50 +03:00
45a2868f77 Web: Login: Tests: add pause 2022-02-28 16:16:30 +03:00
9354bce5a0 Web: Login: fix panel width 2022-02-28 16:02:28 +03:00
20c0900e12 Web: Login: fix panel width 2022-02-28 15:54:22 +03:00
c2518d3b1e Web: AutoBackup: Fixed styles of schedule component for desktop. 2022-02-28 15:08:58 +03:00
f576f80fb7 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-02-28 11:25:07 +03:00
9120fc230f Web: Renamed translations keys, deleted useless. 2022-02-28 11:24:54 +03:00
6c8165ecdc Merge branch 'feature/backup' of https://github.com/ONLYOFFICE/AppServer into feature/backup 2022-02-25 19:08:08 +03:00
eae8b7c0bb Web: Socket: Added "restore-backup" event listeners 2022-02-25 19:08:02 +03:00
Dmitry Kulak
92d3a3275f Web: Studio: Homepage: Fixed greeting message styles 2022-02-25 18:57:24 +03:00
93e5cf889c Web: RestoreBackup: Added error handler for local file. 2022-02-25 17:17:18 +03:00
2bb84187e3 Web: Backup: Added help information for modules. 2022-02-25 17:10:27 +03:00
0302dfd9ac Web: ManualBackup: Fixed temporary link for desktop version. 2022-02-25 16:27:17 +03:00
f07aa0a183 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	config/nginx/onlyoffice.conf
#	packages/asc-web-common/constants/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2022-02-25 16:05:43 +03:00
d9a8fd58ba Web: Backup: Added max length to the text. 2022-02-25 12:05:43 +03:00