|
|
8a9fbe70c6
|
Web: Files: Added reset of tree.
|
2022-04-12 13:52:23 +03:00 |
|
|
|
193c1b2c9c
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-12 12:01:25 +03:00 |
|
|
|
866a6f6c26
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 16:37:37 +03:00 |
|
|
|
fdfdf4e547
|
Web:Studio:Fix border width.
|
2022-04-11 16:10:12 +03:00 |
|
Timofey Boyko
|
63c812cbf0
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 13:22:22 +03:00 |
|
Timofey Boyko
|
9c01f05de8
|
Web:Studio:Settings: hide article when catalog item changed
|
2022-04-11 13:22:04 +03:00 |
|
|
|
01e745f47b
|
Web:Studio:Fix loaders styles.
|
2022-04-11 12:26:58 +03:00 |
|
|
|
8f623ae40a
|
Web: Files: Fixed styles.
|
2022-04-11 11:20:38 +03:00 |
|
|
|
d07c5e071e
|
Web: Files: Renamed function, refactoring.
|
2022-04-11 11:14:05 +03:00 |
|
|
|
38aa42fdf8
|
Web: Files: Refactoring, deleted useless code.
|
2022-04-11 10:30:23 +03:00 |
|
|
|
952996f534
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-10 20:08:22 +03:00 |
|
|
|
a2c1e836c0
|
Web:Studio:Added LoaderSubmenu.
|
2022-04-10 19:57:43 +03:00 |
|
|
|
34f223d67c
|
Web:Studio:Added LoaderSectionHeader.
|
2022-04-10 19:24:05 +03:00 |
|
|
|
b20f4cfed1
|
Web: Backup: Added new translation.
|
2022-04-10 13:14:40 +03:00 |
|
|
|
34d4b5dbaa
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-10 12:29:24 +03:00 |
|
|
|
87e1222783
|
Web: Files: SelectFile: Changed logic.
|
2022-04-08 17:12:48 +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 |
|
|
|
d2ba43ce4b
|
Web:Studio:Added setIsLoadingArticleSettings method.
|
2022-04-08 16:37:33 +03:00 |
|
|
|
f835484454
|
Web: Client: Settings: fix width
|
2022-04-08 16:12:34 +03:00 |
|
|
|
b2d162b630
|
Web: Client: Settings: use SaveCancelButtons
|
2022-04-08 16:01:03 +03:00 |
|
|
|
9aa95c6462
|
Web: Client: fix isSaving
|
2022-04-08 15:18:58 +03:00 |
|
|
|
136fa429b7
|
Web: Client: Settings: return isLoading
|
2022-04-08 15:01:53 +03:00 |
|
|
|
9932e76cc4
|
Web: Refactoring, added styles.
|
2022-04-08 14:25:26 +03:00 |
|
|
|
e251a58ad0
|
Web: Client: Settings: add button loader
|
2022-04-08 13:33:50 +03:00 |
|
|
|
3fc58edcb9
|
Web: Client: init settings outside shell
|
2022-04-08 13:19:50 +03:00 |
|
|
|
d04de3b4f7
|
Web: Client: Settings: delete console
|
2022-04-08 12:33:03 +03:00 |
|
|
|
4a3325b988
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-08 12:24:25 +03:00 |
|
|
|
797c71551b
|
Web: Client: move init tfa to setupStore
|
2022-04-08 12:23:54 +03:00 |
|
|
|
b72d14dc98
|
Web: Client: Tests: add trusted mail settings change test server error
|
2022-04-08 12:09:12 +03:00 |
|
|
|
f9c5bc65ce
|
Web: Client: Settings: delete useless
|
2022-04-07 22:04:16 +03:00 |
|
|
|
54fb5f3ab7
|
Web: Client: Settings: fix
|
2022-04-07 20:39:58 +03:00 |
|
|
|
8ccb5bd793
|
Web: Client: Settings add try/catch
|
2022-04-07 20:38:13 +03:00 |
|
|
|
851614569f
|
Web: Client: Settings: fix header title
|
2022-04-07 18:33:39 +03:00 |
|
|
|
d5f3b4f0e6
|
Web:Studio:Added loaderCustomization, loaderCustomizationNavbar, loaderDescriptionCustomization.
|
2022-04-07 18:23:33 +03:00 |
|
|
|
a97b34d144
|
Web: Client: Settings: delete useless
|
2022-04-07 16:23:33 +03:00 |
|
|
|
eeac7377be
|
Web: Client: delete useless
|
2022-04-07 16:19:08 +03:00 |
|
|
|
0e4d12236e
|
Web: Client: Settings: fix header title
|
2022-04-07 14:26:13 +03:00 |
|
|
|
0581bf7b49
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-07 14:21:17 +03:00 |
|
|
|
0d612a5330
|
Web: Client: Settings: add learn more link in tooltip
|
2022-04-07 14:20:20 +03:00 |
|
|
|
fae0973b4a
|
Web: Client: fix show errors
|
2022-04-07 14:04:13 +03:00 |
|
|
|
5c93fd9fbf
|
Web: Client: Settings: fix
|
2022-04-07 12:48:18 +03:00 |
|
|
|
a68d6ffcdf
|
Web:Studio:Added PortalRenaming to settingsTree. Refactoring Customization.
|
2022-04-06 22:27:25 +03:00 |
|
|
|
c6b81c6e94
|
Merge branch 'feature/virtual-rooms-1.2' into feature/trusted-mail
|
2022-04-06 21:32:36 +03:00 |
|
|
|
3ef7ae85de
|
Web: SelectFolder: Optimization, refactoring.
|
2022-04-06 18:04:43 +03:00 |
|
|
|
2db86b4d71
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-06 17:08:18 +03:00 |
|
|
|
1755d03b4e
|
Web:Studio:Styling Settings. Added locales en PortalRenamingMobile.
|
2022-04-06 17:07:48 +03:00 |
|
|
|
5ac990887b
|
Web: Client: fixed ProfileActions
|
2022-04-06 15:56:51 +03:00 |
|
|
|
48240c6f77
|
Web:Studio:Added locales en PleaseNote, PleaseNoteDescription, PortalRenaming, PortalRenamingDescription, PortalRenamingDescriptionTooltip, PortalRenamingLabelText, PortalRenamingSettingsTooltip. Added tooltip PortalRenamingTooltip.
|
2022-04-06 12:37:15 +03:00 |
|
|
|
2c4c61a341
|
Web: Client: Settings: add id
|
2022-04-06 12:02:29 +03:00 |
|
|
|
33001bf8f7
|
Web: Client: Tests: add trusted mail settings change tests
|
2022-04-06 12:01:47 +03:00 |
|
|
|
1cb67aacdb
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-06 11:32:46 +03:00 |
|
|
|
7ec70e37fa
|
Web: Client: Settings: show error
|
2022-04-06 11:32:29 +03:00 |
|
|
|
ef7a1be29d
|
Web: Client: Settings: fix session logic
|
2022-04-06 10:58:35 +03:00 |
|
|
|
5e890f81c9
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-05 23:05:08 +03:00 |
|
|
|
1137946577
|
Web:Studio:Added functionality to the PortalRenaming component.
|
2022-04-05 23:04:50 +03:00 |
|
|
|
fa9b365211
|
Web:Studio:Added the PORTAL_RENAMING route.
|
2022-04-05 23:03:42 +03:00 |
|
|
|
7deb741978
|
Web:Studio:Added SuccessfullySavePortalNameMessage locales en.
|
2022-04-05 23:02:45 +03:00 |
|
|
|
4960c16805
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-05 18:05:12 +03:00 |
|
|
|
3b7c80b7b8
|
Web: Client: Settings: fix
|
2022-04-05 17:59:50 +03:00 |
|
|
|
b97ad7459a
|
Web: Client: Settings: fix btn size
|
2022-04-05 17:27:48 +03:00 |
|
|
|
c79f294bb3
|
Web: Client: Settings: fix
|
2022-04-05 17:21:04 +03:00 |
|
|
|
adeff36777
|
Web: Client: Settings: use session storage for tfa
|
2022-04-05 16:42:44 +03:00 |
|
|
|
6f28c9d187
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-05 16:33:20 +03:00 |
|
|
|
e13661c109
|
Web: Client: Settings: use session storage
|
2022-04-05 16:32:41 +03:00 |
|
|
|
d98ba7574c
|
Web: Client: Settings: use session storage
|
2022-04-05 16:13:54 +03:00 |
|
|
|
ccbd8c88f5
|
Web: Client: Settings: use settings store
|
2022-04-05 15:35:59 +03:00 |
|
|
|
5725a87887
|
Web: Client: Settings: use data from store
|
2022-04-05 14:41:16 +03:00 |
|
|
|
47199aca82
|
Web: Client: Settings: fix dark theme
|
2022-04-05 13:29:02 +03:00 |
|
|
|
c7edba4cad
|
Web: Client: Settings: add redirect
|
2022-04-05 12:25:25 +03:00 |
|
|
|
9a1ba0a597
|
Web: Client: Settings: fix learn more
|
2022-04-05 11:59:28 +03:00 |
|
|
|
7645d0bb1c
|
Web: Client: Settings: delete useless after merge
|
2022-04-05 11:20:28 +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 |
|
|
|
5917b4dcb9
|
Web: Client: Settings: add learn more wrapper
|
2022-04-05 11:15:58 +03:00 |
|
|
|
f818a364aa
|
Web: Client: Settings: get settings from store
|
2022-04-05 11:10:07 +03:00 |
|
|
|
6fef466d23
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
|
2022-04-04 22:12:05 +03:00 |
|
|
|
5b825dc6ac
|
Merge pull request #579 from ONLYOFFICE/feature/add-units
add new lines
|
2022-04-04 19:38:45 +03:00 |
|
|
|
45d2a31d03
|
Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
# public/locales/de/Common.json
|
2022-04-04 19:34:51 +03:00 |
|
|
|
9ce0f807c5
|
Web: Client: Settings: show loader
|
2022-04-04 19:31:43 +03:00 |
|
|
|
cb2d6653a8
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 19:30:42 +03:00 |
|
|
|
17787d55ad
|
Web: Fixed toast error for backup
|
2022-04-04 19:27:53 +03:00 |
|
|
|
d0d2abecea
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 19:27:44 +03:00 |
|
|
|
d7ec0e118c
|
Web:Studio:Add PortalRenaming.
|
2022-04-04 19:27:24 +03:00 |
|
|
|
f70f51df64
|
Web: Client: Settings: fix style
|
2022-04-04 19:14:27 +03:00 |
|
|
|
70d41327c9
|
Web: Client: Settings: fix style
|
2022-04-04 19:09:42 +03:00 |
|
|
|
ac5c548fff
|
Web: Fixed toastr for backup.
|
2022-04-04 19:03:58 +03:00 |
|
|
|
31011bdbc6
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
# Conflicts:
# web/ASC.Web.Client/tests/action_tests.js
|
2022-04-04 17:12:54 +03:00 |
|
|
|
fd2f767063
|
Web: Client: fix mobile view size
|
2022-04-04 17:12:02 +03:00 |
|
|
|
f677b0e484
|
Web: Client: delete space
|
2022-04-04 17:11:44 +03:00 |
|
|
|
d866dfecfb
|
Web: Client: fix
|
2022-04-04 16:59:38 +03:00 |
|
|
|
1ff94b3d0c
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 15:53:01 +03:00 |
|
|
|
3016f43fab
|
Web:Studio:Added Welcome Page Settings mobile render test, Welcome Page Settings Restore to Default button test, Welcome Page Settings Save button test.
|
2022-04-04 15:52:41 +03:00 |
|
|
|
1252ccfc38
|
Web:Studio:Added id for TextInput and SaveCancelButtons.
|
2022-04-04 15:50:10 +03:00 |
|
|
|
fefad51e53
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 15:43:07 +03:00 |
|
|
|
4934edcfba
|
Web:Fixed backup styles after merge.
|
2022-04-04 15:40:45 +03:00 |
|
Timofey Boyko
|
d4b24c6ed7
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 15:34:52 +03:00 |
|
|
|
04907c4532
|
Web: Client: add missed paths
|
2022-04-04 15:11:09 +03:00 |
|
Timofey Boyko
|
6e2c8f0a13
|
Web:Studio:NavMenu: add avatar and change position of catalog-burger for mobile devices
|
2022-04-04 15:03:53 +03:00 |
|
|
|
e49cbbd0fe
|
Web: Client: Settings: fix logic
|
2022-04-04 14:45:13 +03:00 |
|
Timofey Boyko
|
9b46a23930
|
Web:Studio:NavMenu: fix styles of avatar for mobile devices
|
2022-04-04 14:37:36 +03:00 |
|
Timofey Boyko
|
fc09b493ed
|
Web:Studio:NavMenu: delete useless code from profile-actions
|
2022-04-04 14:36:45 +03:00 |
|
