|
|
31bf677340
|
Merge branch 'develop' into feature/oauth2-client
|
2023-09-22 17:31:22 +03:00 |
|
|
|
6d6116c5ce
|
merge from develop
|
2023-09-22 13:39:24 +03:00 |
|
|
|
3269834484
|
Files: added isDefault to FilesLinkUtility
|
2023-09-22 12:25:11 +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 |
|
|
|
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 |
|
mushka-n
|
cf735a6fbe
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-15 00:43:58 +03:00 |
|
|
|
9bc66531ed
|
added room name and id to validation response
|
2023-09-14 17:37:52 +03:00 |
|
|
|
9d22fc2ddd
|
added room id to link
|
2023-09-14 17:36:59 +03:00 |
|
|
|
5925149e46
|
added getting provider by entity id
|
2023-09-14 17:33:58 +03:00 |
|
|
|
2ea7dc058a
|
ASC.People: TaskProgressResponseDto: added status property
|
2023-09-14 14:34:06 +03:00 |
|
|
|
ad93ede662
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2023-09-13 15:44:16 +03:00 |
|
|
|
c7162a24ca
|
ASC.Files.Core: FileMarker: using ICacheNotify
|
2023-09-13 15:39:42 +03:00 |
|
|
|
122fd60af1
|
Merge branch 'develop' into feature/rooms-icons
|
2023-09-13 15:13:23 +04:00 |
|
|
|
ea2bd6a12d
|
Merge branch 'develop' into feature/optimization-ef
|
2023-09-13 12:28:33 +03:00 |
|
|
|
a9e93ef2f9
|
fixed merge conflicts
|
2023-09-13 09:28:08 +03:00 |
|
|
|
9ca2280e83
|
fixed merge conflicts
|
2023-09-13 09:22:59 +03:00 |
|
|
|
c3495ce668
|
Merge pull request #1737 from ONLYOFFICE/feature/short-links
Feature/short links
|
2023-09-13 09:21:59 +03:00 |
|
|
|
eee5f2d443
|
ef fix: update and traking
|
2023-09-12 18:23:45 +03:00 |
|
|
|
5be921b540
|
Merge branch 'develop' into feature/back-ar
|
2023-09-12 18:01:15 +04:00 |
|
|
|
675590854c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-12 15:18:27 +03:00 |
|
