|
fe6372962c
|
Web: Client: Tests: fix tests
|
2022-03-31 22:46:25 +03:00 |
|
|
d5459374b9
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign
|
2022-03-31 19:05:05 +03:00 |
|
|
9929a88f9e
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 19:03:50 +03:00 |
|
|
c503c32333
|
Web:Studio:Styling Settings.
|
2022-03-31 18:24:55 +03:00 |
|
|
710df955dc
|
Web:Studio:Added upper case.
|
2022-03-31 18:24:03 +03:00 |
|
|
968e85b080
|
Web:Studio:Adding the CustomTitles Component.
|
2022-03-31 16:04:42 +03:00 |
|
|
52c0a7680e
|
Web:Studio:Fix tests.
|
2022-03-31 16:03:39 +03:00 |
|
|
90ac7fa268
|
Web: Client: Tests: fix TfaActivation render
|
2022-03-31 16:02:36 +03:00 |
|
|
90a3513630
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign
|
2022-03-31 15:47:47 +03:00 |
|
|
b232abe163
|
Web: Client: Settings: fix
|
2022-03-31 14:30:34 +03:00 |
|
|
2e7c530c26
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 13:13:13 +03:00 |
|
|
87d5128b9b
|
Web: Client: Settings: add learn more block
|
2022-03-31 13:12:43 +03:00 |
|
|
b26f0e3423
|
Web: Client: add settings translates
|
2022-03-31 13:12:18 +03:00 |
|
|
e87aa1a80f
|
Web: Client: delete useless
|
2022-03-31 12:33:46 +03:00 |
|
|
83ba8fa153
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 12:18:55 +03:00 |
|
|
0128dd6d32
|
Web:Studio:Changing tests Customization change language, Customization change time zone, Customization cancel button test language, Customization cancel button test time zone.
|
2022-03-31 12:18:22 +03:00 |
|
|
af580ca041
|
Web: Client: Settings: show SMSC balance
|
2022-03-31 01:10:33 +03:00 |
|
|
a7b00a4286
|
Web: Client: add settings translates
|
2022-03-31 01:10:06 +03:00 |
|
|
227821700b
|
Web: Client: Settings: move access-rights
|
2022-03-31 00:54:01 +03:00 |
|
|
ec9a865a44
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 00:45:18 +03:00 |
|
|
c1f7a0f880
|
Web: Client: Settings: fix
|
2022-03-31 00:40:39 +03:00 |
|
|
ab8bc6e7dc
|
Web: Client: Settings: fix
|
2022-03-31 00:12:47 +03:00 |
|
|
26d96e3404
|
Web: Client: Settings: tfa refactoring, redesign
|
2022-03-31 00:08:30 +03:00 |
|
|
3af4bbc87a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-30 23:10:52 +03:00 |
|
|
dd5e90e423
|
Web:Studio:Add Language and Time Zone Settings page mobile render test.
|
2022-03-30 23:09:58 +03:00 |
|
|
6500c666d0
|
Web: Client: Settings: fix title
|
2022-03-30 22:33:43 +03:00 |
|
|
8d3beb4215
|
Web: Client: Settings: add category wrapper
|
2022-03-30 22:23:58 +03:00 |
|
|
58662d60d0
|
Web: Client: Settings: open correct tab
|
2022-03-30 22:02:52 +03:00 |
|
|
eff126236a
|
Web: Client: add settings translates
|
2022-03-30 20:56:56 +03:00 |
|
|
dbfae6d641
|
Web: Client: Settings: refactoring portal access page, add mobile layout
|
2022-03-30 20:56:40 +03:00 |
|
|
2dcace061b
|
Web: Client: Settings: fix crash admins page
|
2022-03-30 20:16:39 +03:00 |
|
|
9d6a9f00cf
|
Web: Client: Settings: add new security layout
|
2022-03-30 19:58:46 +03:00 |
|
|
5368ac030d
|
Web: Client: AccessRights: fix style
|
2022-03-30 19:40:18 +03:00 |
|
|
bd122ed006
|
Web: Client: add settings translates
|
2022-03-30 19:39:34 +03:00 |
|
Timofey Boyko
|
3b2ead5568
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-30 18:17:50 +03:00 |
|
|
9b2080db04
|
Web:Studio:Improved the Change language and Change time zone tests. Added tests Cancel button test language and Cancel button test time zone.
|
2022-03-30 16:25:29 +03:00 |
|
|
5a5b388e0f
|
Web: Client: fixed skip maintenance render
|
2022-03-30 17:40:40 +05:00 |
|
Timofey Boyko
|
bf87c78046
|
Web:Studio: change position nav menu
|
2022-03-30 11:34:51 +03:00 |
|
|
d92451193d
|
Web: Client: Tests: update screenshots
|
2022-03-29 23:34:23 +03:00 |
|
|
f7e95db28f
|
Web:Studio:Added mock timezones data.
|
2022-03-29 22:33:30 +03:00 |
|
|
9fdddf09ea
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-29 22:02:30 +03:00 |
|
|
df13a06d39
|
Web: Client: Confirm: fix tablet layout
|
2022-03-29 21:59:51 +03:00 |
|
|
ab05212f59
|
Web:Studio:Added Change language and Change time zone tests.
|
2022-03-29 21:45:21 +03:00 |
|
|
047a2f18a0
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign
|
2022-03-29 20:31:17 +03:00 |
|
Timofey Boyko
|
a38283c33f
|
Web:Client: remove page scrolling for tablet devices and move it to section
|
2022-03-29 10:34:43 +03:00 |
|
|
0efe18f99f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-28 22:26:23 +03:00 |
|
|
0bc5bc13f6
|
Web:Studio:Moved the checkScrollSettingsBlock function to a separate utils.js file.
|
2022-03-28 22:24:21 +03:00 |
|
|
fe65e040cb
|
Web:Studio:Refactoring of the Customization component. Added SettingsPageLayout, SettingsPageMobileView components.
|
2022-03-28 22:22:29 +03:00 |
|
|
1b6a7ab2ba
|
Web:Studio:Added SettingsPageLayout, SettingsPageMobileView components.
|
2022-03-28 22:18:16 +03:00 |
|
|
51039fa773
|
Web:Studio:Removed CustomizationNavbar component.
|
2022-03-28 22:16:36 +03:00 |
|
|
2112d4d02a
|
Web:Studio:Created a settingsCustomization folder. Moved the CustomTitles, LanguageAndTimeZone, PortalRenaming components there.
|
2022-03-28 22:15:41 +03:00 |
|
|
66c5d14883
|
Web:Studio:Added isMobileViewLanguageTimeSettings to LanguageAndTimeZone component. Added the checkScrollSettingsBlock function to the LanguageAndTimeZone component.
|
2022-03-28 22:14:34 +03:00 |
|
|
c0251f71f3
|
Web: Client: Home: fix tiles align
|
2022-03-28 18:21:17 +03:00 |
|
|
d6aaabdd34
|
Web: Client: removed commented code
|
2022-03-28 17:39:59 +05:00 |
|
|
098f054737
|
Web: Client: Tests: update screenshots
|
2022-03-28 15:17:39 +03:00 |
|
|
8235533e10
|
Web: Client: Tests: delete useless
|
2022-03-28 15:16:37 +03:00 |
|
|
cbc143e072
|
Web: Client: Confirm: fix buttons position
|
2022-03-28 14:50:30 +03:00 |
|
|
e3a32cb4bf
|
Web: Client: Confirm: redesign ChangePhone page
|
2022-03-28 14:41:06 +03:00 |
|
|
89bf79e2d3
|
Web: Client: add translates
|
2022-03-28 14:40:32 +03:00 |
|
|
d0c2138f54
|
Web: Client: Confirm: fix class name
|
2022-03-28 14:38:58 +03:00 |
|
|
1842c39fd8
|
Web: Client: Confirm: redesign ChangeOwner page
|
2022-03-28 14:15:33 +03:00 |
|
|
fc68063599
|
Web: Client: fixed margin top in home page
|
2022-03-28 14:26:58 +05:00 |
|
|
7abe990d96
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-28 12:36:11 +05:00 |
|
|
1eae6d41cd
|
Web: Client: Confirm: fix buttons size
|
2022-03-26 13:42:26 +03:00 |
|
|
a98b6c22d9
|
Web: Client: Confirm: redesign TfaAuth page
|
2022-03-26 13:40:32 +03:00 |
|
|
c0a41e5843
|
Web: Client: Confirm: redesign TfaActivation page
|
2022-03-26 13:33:23 +03:00 |
|
|
aeb3bd8812
|
Web: Client: Confirm: redesign ProfileRemove page
|
2022-03-26 11:53:03 +03:00 |
|
|
fe890702e8
|
Web: Client: Confirm: change password page fix
|
2022-03-26 11:37:50 +03:00 |
|
|
26d96145de
|
Web: Client: Confirm: redesign ChangePassword page
|
2022-03-26 00:17:56 +03:00 |
|
|
ded958daee
|
Web: Client: add password error message helper
|
2022-03-25 21:32:37 +03:00 |
|
|
ed282be5be
|
Web: Client: Confirm: redesign ActivateUser page
|
2022-03-25 21:20:20 +03:00 |
|
|
e4fb488e30
|
Web: Client: Confirm: fix getSettings
|
2022-03-25 21:19:43 +03:00 |
|
|
d00d8806ab
|
Web: Client: Confirm: add styles
|
2022-03-25 21:19:16 +03:00 |
|
|
7cb19512bb
|
Web:Studio:Removed redundant content.
|
2022-03-25 11:07:33 +03:00 |
|
|
68b5a46647
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-25 10:47:48 +03:00 |
|
|
f5b7efe5d7
|
Web:Studio:Fix styles.
|
2022-03-25 10:39:27 +03:00 |
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
a82c27a19c
|
Web:Studio:Added Consumer, renaming the checkInnerWidth function to checkSectionWidth, adding to the state sectionWidth.
|
2022-03-16 19:10:05 +03:00 |
|
|
06c946a2bf
|
Web:Studio:Border styling.
|
2022-03-16 17:41:36 +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 |
|
|
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 |
|