|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
|
fd9dc93fe6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# config/kafka.json
|
2022-04-21 18:54:28 +03:00 |
|
|
0c141bba1a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 18:08:42 +03:00 |
|
|
1f9fa82051
|
Web:Studio:Added validation for setting Portal Renaming. Added locales en "PortalNameEmpty", "PortalNameIncorrect", "PortalNameLength".
|
2022-04-21 18:07:26 +03:00 |
|
|
1dff9e18c4
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-04-21 17:51:31 +03:00 |
|
|
d6feda992b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 17:33:16 +03:00 |
|
Timofey Boyko
|
8c12ec36d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 16:51:59 +03:00 |
|
Timofey Boyko
|
0428c3d6af
|
Web:Client:Components: set correct height for main and article containers for IOS devices
|
2022-04-21 16:51:51 +03:00 |
|
|
3373a01d9e
|
Web: Client: NavMenu: fix logo pos
|
2022-04-21 16:25:42 +03:00 |
|
|
41c505da8f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 14:48:35 +03:00 |
|
|
596153ac21
|
Web:Studio:Fix reminderTest.
|
2022-04-21 14:47:18 +03:00 |
|
Timofey Boyko
|
e33ff6a576
|
Web:Client:Components: return --vh for ios devices
|
2022-04-21 13:06:47 +03:00 |
|
|
301e70e605
|
Api: added continue, suspend, delete portal methods
|
2022-04-21 12:35:51 +03:00 |
|
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 |
|
|
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 |
|
|
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 |
|