Timofey Boyko
|
fe3f9b59e8
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-25 10:11:00 +03:00 |
|
Timofey Boyko
|
bc68ffe870
|
Web:Studio: fixed selected options of group and people selector, fix bugs with display admin selector
|
2022-03-25 10:10:49 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a4deb55535
|
Web: AutoBackup: Added clarification on the time.
|
2022-03-21 17:32:46 +03: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 |
|
