|
93f637467b
|
backend: updated packages version
|
2022-04-27 14:26:38 +03:00 |
|
|
19cf415898
|
backend: updated packages version
|
2022-04-27 13:02:17 +03:00 |
|
|
fe39f4d398
|
fix namespaces
|
2022-04-26 21:34:27 +03:00 |
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
|
69da159039
|
Files: removed unnecessary
|
2022-04-26 17:07:32 +03:00 |
|
|
0ab3c53823
|
Files: changed sort
|
2022-04-26 15:53:06 +03:00 |
|
Vashchuk Nikita
|
258cf02d27
|
fix ssoHandler
|
2022-04-26 14:10:12 +03:00 |
|
Vashchuk Nikita
|
1431c5ec80
|
fix
|
2022-04-26 12:27:12 +03:00 |
|
Vashchuk Nikita
|
e812d3ec53
|
fix
|
2022-04-26 11:49:55 +03:00 |
|
|
2863e167c6
|
Files: fix
|
2022-04-26 02:15:32 +03:00 |
|
|
3d9e9eb94f
|
Files: refactor
|
2022-04-26 02:14:32 +03:00 |
|
|
35eb164fbe
|
Files: added usings
|
2022-04-26 02:14:17 +03:00 |
|
|
05ce39f359
|
Files: added area filter value, removed unnecessary
|
2022-04-26 02:14:06 +03:00 |
|
|
ff87612892
|
Files: added generic methods for virtual rooms
|
2022-04-26 02:13:30 +03:00 |
|
|
33d2f638ad
|
Files: added area filter
|
2022-04-26 02:13:05 +03:00 |
|
|
46b02d6b27
|
Files: added new variable
|
2022-04-26 02:12:44 +03:00 |
|
|
d38257f704
|
Files: redesigned virtual rooms getting method, removed unnecessary
|
2022-04-26 02:12:27 +03:00 |
|
|
47e4be2d28
|
Files: added filtres for rooms
|
2022-04-26 02:11:02 +03:00 |
|
Vashchuk Nikita
|
62c66e6e1f
|
Merge branch 'feature/SSO-new' of github.com:ONLYOFFICE/AppServer into feature/SSO-new
|
2022-04-25 21:42:36 +03:00 |
|
Vashchuk Nikita
|
422e87af13
|
added ssoHandler
|
2022-04-25 21:41:26 +03:00 |
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
|
dc939846c4
|
Merge pull request #632 from ONLYOFFICE/feature/backend-refactor
Feature/backend refactor
|
2022-04-25 16:03:27 +04:00 |
|
|
2a5aa715e4
|
fix tests
|
2022-04-25 11:09:51 +03:00 |
|
|
e38fcc1acb
|
Files: refactor api, added query parameters
|
2022-04-25 00:08:01 +03:00 |
|
|
88b59b1c30
|
refactoring
|
2022-04-22 16:24:54 +03:00 |
|
|
70006499f1
|
Files: removed unnecessary multipart api methods
|
2022-04-22 11:33:08 +03:00 |
|
|
639c6fc7cc
|
Files: removed unnecessary
|
2022-04-22 11:28:57 +03:00 |
|
|
04dd99ecf0
|
Files: fix cache key
|
2022-04-22 11:14:36 +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 |
|
|
6c9a9f7a8a
|
Merge pull request #628 from ONLYOFFICE/feature/virtual-rooms-1.2
Feature/virtual rooms 1.2
|
2022-04-21 12:09:30 -04:00 |
|
|
073ee2dc36
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-21 12:07:18 -04:00 |
|
|
750b49fd8c
|
Merge pull request #624 from ONLYOFFICE/feature/interface-theme
Feature/interface theme
|
2022-04-21 12:05:10 -04:00 |
|
|
60d728695c
|
fix slnf
|
2022-04-21 18:56:04 +03:00 |
|
|
05609787f2
|
Files: fix async
|
2022-04-21 18:55:49 +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 |
|
|
2d24cb25ae
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 18:17:56 +03:00 |
|
Timofey Boyko
|
e2f8f40086
|
Web:Files:SharingPanel: add truncate for sharing panel header
|
2022-04-21 18:15:34 +03:00 |
|
Timofey Boyko
|
796e3448bc
|
Web:Files:SharingPanel: add access rights translate
|
2022-04-21 18:10:19 +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 |
|
Timofey Boyko
|
bf8ac30f6f
|
Web:Files:add new key 'AccessRights' for EN and RU locales
|
2022-04-21 18:07:58 +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 |
|
|
742d728013
|
Merge pull request #627 from ONLYOFFICE/feature/oforms-gallery
Feature/oforms gallery
|
2022-04-21 10:22:38 -04:00 |
|
|
f8088cfbd2
|
Web: Files: fixed gallery translations, refactoring
|
2022-04-21 17:18:01 +03:00 |
|
|
a9a528ab84
|
Web: Files: createFormFromTemplate replaced with createFile
|
2022-04-21 16:57:44 +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 |
|
Timofey Boyko
|
fd331f9a17
|
Web:Common:Article: add id to article container
|
2022-04-21 16:51:01 +03:00 |
|