f2da6fc55c
Merge pull request #693 from ONLYOFFICE/feature/docspace
...
Feature/docspace
2022-06-22 11:55:36 +04:00
aad8a92b4c
RoomInvite replaced by LinkInvite
2022-06-21 20:33:05 +03:00
b30ec3c1bd
Files: added room api docs
2022-06-21 18:43:54 +03:00
57916d46ba
Files: removed unnecessary, refactor
2022-06-20 14:39:08 +03:00
44747e837a
Files: tag id replaced with tag name
2022-06-20 14:30:49 +03:00
e6602a22ab
Files: fix copyas
2022-06-20 13:21:40 +03:00
e68ac70005
Merge branch 'develop' into feature/docspace
2022-06-20 12:15:08 +03:00
e2cee2c2fc
Merge branch 'release/v1.2' into develop
...
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.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/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
8ea04bcc81
Merge branch 'develop' into feature/12.0
...
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
2022-06-17 19:19:00 +03:00
3684775829
Files: security fix
2022-06-17 12:27:07 +03:00
ff6a403c3c
Files: refactor
2022-06-17 11:22:55 +03:00
2b8b7c9898
Files: added permission check for link generation
2022-06-17 10:59:03 +03:00
1f65ea35a7
Files: removed unnecessary
2022-06-17 10:52:32 +03:00
34d55db6a6
Files: added invitation by link without email, added existing user to room by link
2022-06-16 18:39:50 +03:00
430542b2ea
moved from ddf515b8
2022-06-16 11:35:24 +03:00
c9fb0d3dac
moved from ddf515b8
2022-06-16 11:13:53 +03:00
c37af416da
Files: fix 404
2022-06-15 10:41:59 +03:00
77ecf6f988
Files: fix
2022-06-14 18:12:37 +03:00
7194fec848
Files: fix
2022-06-14 13:30:12 +03:00
35bebe49f9
moved from ddf515b8
2022-06-14 11:11:41 +03:00
1b6d96400c
Files: changed filtering rooms by types
2022-06-09 20:11:12 +03:00
e2ba706d71
Fix after merge
2022-06-08 16:38:34 +03:00
b693779ea1
Merge branch 'develop' into feature/docspace-pin
2022-06-08 16:38:16 +03:00
397cde0a3b
Files: added pin/unpin, fix tags
2022-06-07 19:07:55 +03:00
8c56de7a26
moved from ddf515b8
2022-06-05 18:44:37 +03:00
57df81aa76
Files: added logo audit, fix
2022-06-03 01:27:56 +03:00
848751220c
Files: added logos for rooms
2022-06-02 21:41:16 +03:00
b81d3ff507
Files: fix routing
2022-05-31 16:49:54 +03:00
73364c1fba
Files: refactor
2022-05-30 14:32:00 +03:00
2a7853bf5b
Files: added creating thirdparty rooms
2022-05-30 14:31:30 +03:00
e704983452
Filex: fix controller
2022-05-29 22:36:28 +03:00
e2e8f3fce9
Merge branch 'feature/docspace-tags' into feature/docspace-thirdparty
2022-05-26 16:39:19 +03:00
3123bbd187
Files: added tags filtering
2022-05-26 16:37:31 +03:00
518fe17d14
refactor
2022-05-26 14:43:56 +03:00
03eaaf4b19
Files: added thirdparty rooms connection
2022-05-26 13:13:25 +03:00
a66c03aa86
Merge branch 'develop' into feature/logger-refactoring
...
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
2022-05-24 23:13:57 +03:00
13ad4381f7
Api: removed CustomHttpMethodAttribute
...
added AllowNotPaymentAttribute
2022-05-23 18:48:23 +03:00
5fa9c839e6
Files: fix
2022-05-23 12:29:14 +03:00
c9357da3b0
Files: added deleting tags, fix
2022-05-23 12:25:33 +03:00
7b6abe81a2
Files: added custom tags
2022-05-20 19:26:13 +03:00
75da995099
Merge branch 'develop' into feature/logger-refactoring
2022-05-20 17:01:51 +03:00
36855d656f
remove application/x-www-form-urlencoded
2022-05-17 12:29:24 +03:00
2e33540486
Merge branch 'feature/docspace' into feature/docspace-links
2022-05-17 11:53:37 +03:00
6c45bb0632
Merge branch 'develop' into feature/docspace
2022-05-17 11:50:56 +03:00
025d13557d
added a secure link to invite to the portal
2022-05-13 19:25:28 +03:00
a0f67cfe27
add loggers
2022-05-12 11:14:00 +03:00
68f949f2e7
Files: added link generation
2022-05-05 15:31:04 +03:00
4a773679e1
fix-tests: rework files tests
...
-rework tests (use httpClient)
-fix migration
-add description
-union similar tests
-add random port for asc.Files
-add time to db name
-change TestCaseSource to TestCase
2022-04-28 18:55:41 +03:00
2efbdddf15
Files: fix
2022-04-28 16:00:05 +03:00
503672e6b2
Merge branch 'develop' into feature/docspace
2022-04-28 15:45:09 +03:00