|
|
570ff7e1b1
|
fix
|
2023-09-26 14:23:11 +03:00 |
|
|
|
8082cbeb96
|
Files: content param
|
2023-09-26 12:56:27 +03:00 |
|
|
|
b999ecb5dd
|
fixed warnings
|
2023-09-25 19:05:00 +03:00 |
|
|
|
aa8d1cba60
|
Merge branch 'develop' into feature/notify-ref
|
2023-09-25 16:38:32 +03:00 |
|
|
|
6af064e456
|
Files: FileOpenedForChange
|
2023-09-25 16:21:35 +03:00 |
|
|
|
8385954e0f
|
Merge pull request #1766 from ONLYOFFICE/feature/message-ref
MessageService: refactoring
|
2023-09-25 04:38:03 -07:00 |
|
|
|
7c62a28318
|
FilesMessageService: removed GetHttpHeaders
|
2023-09-25 14:14:57 +03:00 |
|
|
|
991babc0ee
|
Files: fixed ProlongEditing
|
2023-09-25 11:41:01 +03:00 |
|
|
|
be0dfa8441
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-25 11:07:12 +03:00 |
|
|
|
db1a8e530b
|
backend: GetDocServiceUrlAsync respose with fixed format
|
2023-09-25 11:06:50 +03:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
b670c532cc
|
MessageService: refactoring
|
2023-09-22 18:41:57 +03:00 |
|
|
|
3269834484
|
Files: added isDefault to FilesLinkUtility
|
2023-09-22 12:25:11 +03:00 |
|
|
|
9cf550e1f0
|
Notify: fix culture
|
2023-09-21 14:38:55 +03:00 |
|
|
|
f07b1710a7
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:56:22 +04:00 |
|
|
|
a6d3cf0fcd
|
fix build
|
2023-09-21 12:53:00 +03:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
|
f834539c1e
|
Files: removed doc's plugins
|
2023-09-20 18:56:04 +03:00 |
|
|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
|
|
f1da568484
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 18:16:31 +04:00 |
|
Viktor Fomin
|
33a7bce641
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 16:50:26 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
|
3a1bf92291
|
Merge branch 'develop' into feature/leave-room
|
2023-09-20 13:20:56 +04:00 |
|
|
|
6b90620977
|
Merge pull request #1740 from ONLYOFFICE/feature/optimization-ef
Feature/optimization ef
|
2023-09-20 01:39:49 -07:00 |
|
Viktor Fomin
|
73118da8f2
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 10:52:17 +03:00 |
|
|
|
f1e8c8390c
|
fix
|
2023-09-19 18:56:58 +03:00 |
|
|
|
133f1b768c
|
executedelete in DeleteFolderAsync
|
2023-09-19 18:20:45 +03:00 |
|
|
|
62422999fb
|
executedelete in DeleteFileAsync
|
2023-09-19 18:17:53 +03:00 |
|
|
|
ad35952807
|
Executedelete in DeleteFolderAsync and DeleteFileAsync
|
2023-09-19 18:08:06 +03:00 |
|
|
|
dd917b2324
|
executedelete in SetShareAsync
|
2023-09-19 17:31:27 +03:00 |
|
|
|
baabaaecc6
|
executedelete in RemoveProviderInfoAsync
|
2023-09-19 17:31:10 +03:00 |
|
|
|
d56629278f
|
executeDelete in DeleteVersionAsync
|
2023-09-19 16:52:10 +03:00 |
|
|
|
c20e935cec
|
Api: FormGalleryDto. Mapping
|
2023-09-19 16:38:44 +03:00 |
|
Viktor Fomin
|
19e1b51887
|
Merge branch 'develop' into feature/split-invite
|
2023-09-19 14:04:18 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
|
|
c56264e54e
|
Merge branch 'develop' into feature/optimization-ef
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2023-09-18 21:41:09 +03:00 |
|
|
|
afb7ec9264
|
Files: added property InRoom for docspace owner
|
2023-09-18 20:20:34 +03:00 |
|
|
|
21b335f656
|
fixed after merge
|
2023-09-18 13:32:55 +03:00 |
|
mushka-n
|
da7aec7445
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 13:06:39 +03:00 |
|
|
|
63a09852d6
|
fixed change owner
|
2023-09-18 12:56:24 +03:00 |
|
|
|
d89137eced
|
ASC.People: ReassignController: returning progress in a terminate method
|
2023-09-18 11:31:29 +03:00 |
|
Viktor Fomin
|
ec0cb7c58c
|
Merge branch 'develop' into feature/split-invite
|
2023-09-15 18:59:00 +03:00 |
|
|
|
00c3d8a367
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-15 18:46:34 +03:00 |
|
|
|
b9cb9507ec
|
fixed change owner
|
2023-09-15 18:07:19 +03:00 |
|
|
|
479d6f7952
|
Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
|
2023-09-15 16:54:31 +03:00 |
|
|
|
16e46e47fa
|
Files: owner becomes administrator after "change owner" operation
|
2023-09-15 16:41:53 +03:00 |
|
|
|
fbb7727f58
|
Merge pull request #1748 from ONLYOFFICE/bugfix/thirdparty-signup
fixed registration through a third party
|
2023-09-15 15:50:17 +03:00 |
|
|
|
bc4f464391
|
fixed registration through a third party
|
2023-09-15 15:19:27 +03:00 |
|
|
|
af7caad3ea
|
Bug 64105 - Files: Security. chunk uploader
|
2023-09-15 13:57:58 +03:00 |
|
