|
34232bc735
|
Files: removed oformservice
|
2022-08-23 16:34:54 +03:00 |
|
|
53ee8e9e15
|
Files: fix security
|
2022-08-23 15:18:37 +03:00 |
|
|
d4eefc6145
|
Files: fixed optional params
|
2022-08-19 15:47:11 +03:00 |
|
|
8b6821d410
|
Files: fixed .format folders methods
|
2022-08-19 14:57:51 +03:00 |
|
|
7d32616524
|
Files: fix
|
2022-08-11 19:02:52 +03:00 |
|
|
05d5421ebc
|
fix
|
2022-08-09 17:11:40 +03:00 |
|
|
baaec9dcef
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-09 16:27:35 +03:00 |
|
|
a73b9cf2e4
|
Files: async fix
|
2022-08-08 23:03:58 +03:00 |
|
|
870c3cf3c4
|
warm up services
|
2022-08-08 19:25:22 +03:00 |
|
|
9149d08937
|
Files: async
|
2022-08-04 13:47:18 +03:00 |
|
|
ce1917c77f
|
Async: refactoring
|
2022-08-03 17:29:20 +03:00 |
|
|
7b40920552
|
Chinese (Traditional, Taiwan) empty file templates
|
2022-08-02 17:41:42 +03:00 |
|
|
3d531e653d
|
Files: update docstore submodule (b8a2cf5292 )
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
|
2022-08-02 17:41:04 +03:00 |
|
|
fe5c8b0b13
|
fixed tests and tools
|
2022-07-29 20:23:19 +03:00 |
|
|
dba122eb96
|
Common, files: added dbcontext pool
|
2022-07-28 21:00:49 +03:00 |
|
|
8acb550b08
|
files helpers moved to ASC.Files.Core
|
2022-07-25 14:03:31 +03:00 |
|
|
5762bf1b04
|
Files: openedit method extended
|
2022-07-22 17:54:14 +03:00 |
|
|
0a203dd532
|
Files: added new methods to api
|
2022-07-22 15:55:32 +03:00 |
|
Artem Tarasov
|
345dad709c
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 16:02:48 +03:00 |
|
|
77d311b636
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 11:41:42 +03:00 |
|
TimofeyBoyko
|
7a9114f562
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-20 14:29:04 +03:00 |
|
|
1d0db523a8
|
Merge branch 'develop' into feature/rooms-filter
|
2022-07-18 17:27:57 +03:00 |
|
|
cab55d68f3
|
Files: fix filter, refactor, removed unnecessary
|
2022-07-18 17:11:50 +03:00 |
|
Artem Tarasov
|
10f2cde731
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# .gitignore
|
2022-07-18 17:05:53 +03:00 |
|
TimofeyBoyko
|
bfc1422ba7
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-14 06:01:51 +03:00 |
|
|
e7831d9b94
|
Files: moved parameter from body to query
|
2022-07-13 11:47:15 +03:00 |
|
|
a2129001c9
|
Files: added withoutTags, withoutMe parameters, refactor
|
2022-07-12 19:25:34 +03:00 |
|
|
1face3ea40
|
Files: added searching rooms without tags only
|
2022-07-11 17:13:30 +03:00 |
|
TimofeyBoyko
|
95e03a49d2
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-11 14:55:50 +03:00 |
|
Artem Tarasov
|
55198d0e7f
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Editor/src/i18n.js
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-10 11:23:44 +03:00 |
|
TimofeyBoyko
|
c8feb7899b
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-08 12:32:26 +03:00 |
|
|
b8a2cf5292
|
Files: update docstore submodule
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
|
2022-07-07 18:11:42 +03:00 |
|
|
2bc07e0a1d
|
Files: added DeleteAfter for archiving/unarchiving rooms
|
2022-07-07 17:52:20 +03:00 |
|
|
f52162827e
|
Files: added DeleteAfter for rooms
|
2022-07-07 16:20:44 +03:00 |
|
|
aeac8613a8
|
Merge branch 'develop' into features/enum_generator
|
2022-07-05 17:22:43 +03:00 |
|
|
1218d31a42
|
enum generator
|
2022-07-05 16:58:11 +03:00 |
|
|
7e34e45371
|
ElasticSearch: disabled by default
|
2022-07-01 12:53:18 +03:00 |
|
TimofeyBoyko
|
3e07ef1efc
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-01 10:09:47 +03:00 |
|
|
74d238bde8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.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/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
|
2022-06-30 16:13:31 +03:00 |
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
667cea2ee9
|
Files: fix rooms parent folder
|
2022-06-29 15:47:52 +03:00 |
|
|
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 |
|
|
34cb63fd3f
|
fix
|
2022-06-20 17:23:32 +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 |
|