|
|
e0f8e6eea4
|
Web:Studio:Added HOC withLoading.
|
2022-04-19 10:26:48 +03:00 |
|
|
|
f48809b13a
|
Web:Components:Added HOC withLoading.
|
2022-04-19 10:25:22 +03:00 |
|
|
|
3344a1652e
|
Web:Studio:Added HOC withLoading.
|
2022-04-19 10:22:21 +03:00 |
|
Timofey Boyko
|
d6fcc35703
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-18 15:11:50 +03:00 |
|
Timofey Boyko
|
f927aaacb3
|
Web:Studio: add check theme key from local storage
|
2022-04-18 14:47:31 +03:00 |
|
Timofey Boyko
|
f14712dde1
|
Web:Studio:Shell: update check theme method
|
2022-04-18 12:13:45 +03:00 |
|
|
|
58f88b94ad
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-18 11:23:56 +03:00 |
|
|
|
c225e5b90a
|
Web: Client: Settings: fix title width
|
2022-04-18 11:23:47 +03:00 |
|
Timofey Boyko
|
35f8826dec
|
Web:Studio: add action check of user actions for profile menu
|
2022-04-18 11:03:44 +03:00 |
|
|
|
c0406b0727
|
Web: Client: Settings: fix checkbox area click
|
2022-04-17 19:53:14 +03:00 |
|
Timofey Boyko
|
5ef5873978
|
Merge branch 'feature/redesign-profile-menu' of github.com:ONLYOFFICE/AppServer into feature/redesign-profile-menu
|
2022-04-15 19:04:19 +03:00 |
|
Timofey Boyko
|
7f6db27bf8
|
Web:Studio:ProfileMenu: change top and right indents for dropdown container
|
2022-04-15 19:03:43 +03:00 |
|
Timofey Boyko
|
216896b421
|
Web:Studio:ProfileMenu: delete useless code
|
2022-04-15 18:59:12 +03:00 |
|
Timofey Boyko
|
1d68ac11b2
|
Web:Studio:ProfileMenu: add control panel for mobile devices
|
2022-04-15 18:58:48 +03:00 |
|
|
|
b5b49d7bc9
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-profile-menu
|
2022-04-15 18:31:51 +03:00 |
|
|
|
7dbc67f0e1
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-15 18:13:54 +03:00 |
|
|
|
d8cefc614f
|
Web: Editor: Added icons url.
|
2022-04-15 17:59:39 +03:00 |
|
Timofey Boyko
|
8176228189
|
Web:Studio:NavMenu: add mobile view for profile menu
|
2022-04-15 16:41:01 +03:00 |
|
|
|
34ef545449
|
Web: Backup: Fixed buttons styles.
|
2022-04-15 16:07:56 +03:00 |
|
|
|
e7e34ba101
|
Web: Backup: Fixed styles for empty list.
|
2022-04-15 16:02:18 +03:00 |
|
|
|
4e0f74f839
|
Web: Editor: Disabled button when file name is empty.
|
2022-04-15 14:58:27 +03:00 |
|
Timofey Boyko
|
515839ae4f
|
Web:Studio:ProfileAction: add 'key' for logount button
|
2022-04-15 14:38:06 +03:00 |
|
Timofey Boyko
|
a05408c1cc
|
Web:Studio:NavMenu: redesign logout button
|
2022-04-15 14:14:55 +03:00 |
|
Timofey Boyko
|
2f409bfad5
|
Web:Studio:NavMenu: remove toggle theme from profile menu
|
2022-04-15 13:54:14 +03:00 |
|
Timofey Boyko
|
f20600c5c7
|
Web:Studio:NavMenu: remova top-arrow of profile menu
|
2022-04-15 13:49:25 +03:00 |
|
Timofey Boyko
|
bde27048dc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-15 13:42:50 +03:00 |
|
|
|
e603b26caa
|
refactoring
|
2022-04-15 13:27:48 +03:00 |
|
|
|
cb2580dd50
|
refactoring
|
2022-04-15 12:08:06 +03:00 |
|
|
|
ce73b308e3
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-15 11:46:28 +03:00 |
|
|
|
989037866e
|
Web: Files: Optimization, refactoring.
|
2022-04-15 10:13:23 +03:00 |
|
|
|
6ecc8e7071
|
code cleanup
|
2022-04-14 22:42:15 +03:00 |
|
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
|
|
26947072c6
|
Merge branch 'feature/backend-refactor' into feature/warnings
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
# common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
# common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/StaticUploader.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Core/CollaboratorSettings.cs
# web/ASC.Web.Core/CustomNavigationSettings.cs
# web/ASC.Web.Core/EmailActivationSettings.cs
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
# web/ASC.Web.Core/Notify/SpamEmailSettings.cs
# web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
# web/ASC.Web.Core/PersonalSettings.cs
# web/ASC.Web.Core/PrivacyRoomSettings.cs
# web/ASC.Web.Core/PromotionsSettings.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsSender.cs
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
# web/ASC.Web.Core/StudioAdminMessageSettings.cs
# web/ASC.Web.Core/StudioDefaultPageSettings.cs
# web/ASC.Web.Core/StudioTrustedDomainSettings.cs
# web/ASC.Web.Core/TariffSettings.cs
# web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
# web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
# web/ASC.Web.Core/TipsSettings.cs
# web/ASC.Web.Core/Users/CustomNamingPeople.cs
# web/ASC.Web.Core/Users/UserHelpTourSettings.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
# web/ASC.Web.Core/Utility/ColorThemesSettings.cs
# web/ASC.Web.Core/Utility/PasswordSettings.cs
# web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
# web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
# web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
# web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
# web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
# web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-04-14 15:21:06 +03:00 |
|
|
|
cc34c5b3c5
|
Web: Client: Tests: add custom scenario for tfa
|
2022-04-14 13:25:09 +03:00 |
|
|
|
1c8094139f
|
Web: Client: Tests: add mock
|
2022-04-14 13:24:35 +03:00 |
|
|
|
d2178d4f85
|
Web: Client: Settings: fix tfa logic
|
2022-04-14 12:46:58 +03:00 |
|
|
|
2359ac34c9
|
Web: Client: SettingsStore: add setIsInit
|
2022-04-14 12:41:59 +03:00 |
|
|
|
7c93072aae
|
Web: Files: SelectFolderDialog/SelectFileDialog: Fixed aside styles.
|
2022-04-14 11:18:04 +03:00 |
|
|
|
6ddeff2d51
|
Web: Files: SelectFolderDialog/SelectFileDialog: Fixed styles according layouts.
|
2022-04-14 11:03:31 +03:00 |
|
|
|
49145aa463
|
Web: Files: Changed titles of dialogs, added isLoading prop for tree component.
|
2022-04-13 16:09:37 +03:00 |
|
|
|
65df8f6bfc
|
Web: Client: Settings: move checkWidth
|
2022-04-13 15:32:15 +03:00 |
|
|
|
b5845e221c
|
Web: Client: Settings: use isSaving
|
2022-04-13 15:18:23 +03:00 |
|
|
|
816e25772c
|
Web: Client: add command
|
2022-04-13 14:52:30 +03:00 |
|
|
|
1dcc6b035b
|
Web: Client: Tests: fix action tests
|
2022-04-13 14:52:11 +03:00 |
|
|
|
6ff7c9b09d
|
Web: Client: Tests: fix mock
|
2022-04-13 14:51:52 +03:00 |
|
|
|
7a9e914a55
|
Web: Client: Settings: fix init
|
2022-04-13 14:51:14 +03:00 |
|
Timofey Boyko
|
792bd7065f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-13 10:22:20 +03:00 |
|
|
|
4828678e03
|
merge from feature/backend-refactor
|
2022-04-12 22:04:10 +03:00 |
|
|
|
f9720af935
|
Settings: EnableAdmMess
|
2022-04-12 21:26:32 +03:00 |
|
|
|
0bfffed690
|
Web: Files: Refactoring, deleted useless code.
|
2022-04-12 16:17:44 +03:00 |
|
|
|
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 |
|
|
|
b31015bddd
|
fix portalrename
|
2022-04-12 09:28:49 +03:00 |
|
|
|
50655ae61c
|
added portal rename method
|
2022-04-11 18:19:56 +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 |
|
|
|
c33e724a3d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:28:02 +03:00 |
|
|
|
01e745f47b
|
Web:Studio:Fix loaders styles.
|
2022-04-11 12:26:58 +03:00 |
|
|
|
433c684d09
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:08:50 +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 |
|
|
|
70ee53b5cb
|
Web: Files: SelectFolder: Added "canCreate" prop.
|
2022-04-11 09:42:42 +03:00 |
|
|
|
751e2b2bd1
|
Web: Files: SelectFolder: Fixed styles of aside view, refactoring.
|
2022-04-11 09:01:18 +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 |
|
|
|
f9da8e4026
|
iprestrictions
fix Verify
add check enable
add api method
|
2022-04-07 13:19:30 +03:00 |
|
|
|
5c93fd9fbf
|
Web: Client: Settings: fix
|
2022-04-07 12:48:18 +03:00 |
|
|
|
e2e335ae90
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-06 22:27:44 +03:00 |
|
|
|
a68d6ffcdf
|
Web:Studio:Added PortalRenaming to settingsTree. Refactoring Customization.
|
2022-04-06 22:27:25 +03:00 |
|
