Timofey Boyko
|
414976c49f
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 10:41:06 +03:00 |
|
Timofey Boyko
|
e5ce29f635
|
Web:Studio:Shell: update theme when current user theme changed
|
2022-04-21 10:36:22 +03:00 |
|
|
b4c6e550dc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 18:31:08 +03:00 |
|
|
03f24dacac
|
Web:Studio:Fix location.pathname.
|
2022-04-20 18:29:13 +03:00 |
|
|
49e50093bc
|
Web:Studio:Delete console.log.
|
2022-04-20 18:28:34 +03:00 |
|
|
d703edba81
|
Web:Studio:Added tenantAlias, checkChanges function to PortalRenaming.
|
2022-04-20 18:26:23 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
|
8ca6d0d0d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 17:27:53 +03:00 |
|
Timofey Boyko
|
2c9a22e1d4
|
Web:Studio:NavMenu: increase z-index for header-nav component
|
2022-04-20 16:27:55 +03:00 |
|
|
a4dcddc78d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 14:33:39 +03:00 |
|
Vashchuk Nikita
|
bb8d0d7566
|
fix
|
2022-04-20 14:29:39 +03:00 |
|
|
aa16542fb4
|
Web: Login: fix style
|
2022-04-20 12:58:20 +03:00 |
|
|
3d8e1b9c65
|
Web:Studio:Fix loaders settings.
|
2022-04-20 12:45:17 +03:00 |
|
|
f72dbca58e
|
Web: Login: fix checkbox wrapper
|
2022-04-20 12:34:21 +03:00 |
|
|
cc999eddbf
|
Web: Login: delete useless
|
2022-04-19 18:16:43 +03:00 |
|
|
48700b3efa
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 17:59:13 +03:00 |
|
|
1286610463
|
Web:Studio:Fix loader WelcomePageSettings.
|
2022-04-19 17:58:54 +03:00 |
|
|
e825bc6b5b
|
Web: Client: NavMenu: fix avatar size
|
2022-04-19 16:10:18 +03:00 |
|
|
f60cdb970d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 14:20:19 +03:00 |
|
|
f7bc235471
|
Web: Client: Home: align tiles
|
2022-04-19 14:20:19 +03:00 |
|
|
32ff86acbe
|
Web:Studio:LoaderArticleBody fix styles.
|
2022-04-19 14:19:53 +03:00 |
|
|
17dcbec78f
|
Web: Client: NavMenu: hide icon on home
|
2022-04-19 14:13:47 +03:00 |
|
|
afb18aa7cc
|
Web:Studio:Removed Automatic time zone setting.
|
2022-04-19 14:05:10 +03:00 |
|
Vashchuk Nikita
|
13fddb0dd2
|
fix
|
2022-04-19 14:02:06 +03:00 |
|
|
ebff3a8f80
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 13:41:21 +03:00 |
|
|
c2b75de71b
|
Web: Client: fixed settingsModule
|
2022-04-19 12:42:36 +03:00 |
|
|
4b21b34f58
|
Web: Login: fix show error
|
2022-04-19 12:25:25 +03:00 |
|
|
9cfc7da713
|
Web: Client: removed route to settings for personal
|
2022-04-19 12:19:55 +03:00 |
|
|
b6d838eaa3
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 11:16:50 +03:00 |
|
|
c392c3ae62
|
Web:Studio:Added HOC withLoading, removed HOC withCultureNames, added mapCulturesToArray function, refactoring.
|
2022-04-19 11:14:00 +03:00 |
|
|
9d8083f1ed
|
Web:Studio: Removed setIsLoadingArticleSettings.
|
2022-04-19 10:45:45 +03:00 |
|
|
cec7ce193c
|
Web:Studio:Added CommonStore.
|
2022-04-19 10:45:15 +03:00 |
|
|
83cdd51272
|
Web:Components: Removed LoaderSubmenu.
|
2022-04-19 10:44:38 +03:00 |
|
|
f146c36274
|
Web:Studio:Added LoaderArticleBody.
|
2022-04-19 10:44:10 +03:00 |
|
|
323f17da3a
|
Web:Studio:Added loadBaseInfo.
|
2022-04-19 10:43:35 +03:00 |
|
|
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 |
|