Commit Graph

139 Commits

Author SHA1 Message Date
abe0f8563f Files: refactor 2022-09-16 14:01:50 +03:00
22d5c0c427 Files: refactor 2022-09-16 13:52:54 +03:00
5296bb8394 Merge branch 'develop' into feature/files-filter 2022-09-16 13:34:49 +03:00
d91848cfff Files: added withoutMe for files filter 2022-09-16 13:32:00 +03:00
40702707bd refactoring 2022-09-14 14:21:25 +03:00
cf88dc8243 Files: changed to get room information 2022-09-05 14:27:24 +03:00
45339de198 Files: added gettting shares for rooms 2022-09-05 13:12:40 +03:00
3db342ffec Merge branch 'develop' into feature/private-virtual-rooms 2022-08-29 17:39:57 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
0c596956f6 Merge branch 'develop' into feautre/private-virtual-rooms 2022-08-25 15:30:11 +03:00
6ee5cdb0c3 Merge branch 'develop' into feature/room-filter 2022-08-25 10:23:24 +03:00
7f4838901a fix after merge 2022-08-24 17:30:06 +03:00
0daea49132 Merge branch 'develop' into feature/private-virtual-rooms 2022-08-24 17:12:13 +03:00
58b48df3ab Files: added folders only filter for rooms 2022-08-23 17:22:50 +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
2b6c4b127a Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
2022-08-17 13:58:00 +03:00
7d32616524 Files: fix 2022-08-11 19:02:52 +03:00
a73b9cf2e4 Files: async fix 2022-08-08 23:03:58 +03:00
9149d08937 Files: async 2022-08-04 13:47:18 +03:00
ce1917c77f Async: refactoring 2022-08-03 17:29:20 +03:00
6fd385e026 Merge branch 'develop' into feature/docspace-backup 2022-07-29 11:13:42 +03:00
5877abf2e1 thirdparty backup: single connect 2022-07-24 22:19:36 +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
7f7b636d9b fix get thirdparty/backup 2022-07-22 13:01:23 +03:00
67f5146d3e Merge branch 'develop' into feature/private-virtual-rooms 2022-07-22 11:10:23 +03:00
987788bab7 Files: added creating private thirdparty room 2022-07-21 12:38:23 +03:00
TimofeyBoyko
7a9114f562 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 14:29:04 +03:00
6ffa21a919 fix 2022-07-20 14:12:08 +03:00
0250a43ba6 thirdparty backup 2022-07-19 14:56:22 +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
TimofeyBoyko
bfc1422ba7 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-14 06:01:51 +03:00
c03e1a443a Files: added restrictions on sharing for private rooms 2022-07-13 16:33:44 +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
c8feb7899b Merge branch 'develop' into feature/virtual-rooms-page 2022-07-08 12:32:26 +03:00
c78370b5b1 Merge branch 'develop' into feature/private-virtual-rooms 2022-07-07 17:58:04 +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
0b21b748fc Merge branch 'develop' into feature/private-virtual-rooms 2022-07-07 11:28:57 +03:00
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
TimofeyBoyko
3e07ef1efc Merge branch 'develop' into feature/virtual-rooms-page 2022-07-01 10:09:47 +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
2c434e2d92 Files: fix security, added private room check 2022-06-23 18:14:57 +03:00
1692bd315c Files: added private 2022-06-23 18:12:54 +03:00