Commit Graph

167 Commits

Author SHA1 Message Date
8a8143950d replace CreateScope() => CreateScopeAsync() 2023-01-24 20:33:27 +03:00
ee19865cf0 fix 60180 2023-01-13 16:27:21 +03:00
1ae54147ce Files: added warning message, added demotion on invitation 2022-12-26 12:19:37 +03:00
4a0bb69db9 Merge branch 'develop' into feature/subject-filter 2022-11-25 13:21:40 +03:00
7d9d8fcba3 Files: tag dao. Async 2022-11-15 19:10:39 +03:00
a3832db2f6 Files: added filtering by member for administrator 2022-11-10 15:15:50 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
ac05302b21 Merge branch 'develop' into feature/rights-rework 2022-10-21 13:14:00 +03:00
9c99f3a53f Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-19 19:41:39 +03:00
22a24de659 Merge branch 'develop' into feature/rights-rework 2022-10-19 15:31:14 +03:00
be8b455718 Files: UsersInRoom feature 2022-10-18 17:12:35 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +03:00
20e37c254d Files: added parameter for filtering by provider 2022-10-03 17:56:54 +03:00
8f7216d506 Files: added room filtering by provider type 2022-10-03 11:45:02 +03:00
2f64a1531f Files: fix 2022-09-19 11:55:03 +03:00
d05071110d Merge branch 'develop' into feature/room-security 2022-09-19 11:54:55 +03:00
9faa6a947a Files: refactor 2022-09-19 11:50:31 +03:00
6f1243b382 Files: changed filter logic, refactor 2022-09-16 15:30:43 +03:00
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
ccdce719bc Files: refactor, updated api doc 2022-09-14 15:33:02 +03:00
40702707bd refactoring 2022-09-14 14:21:25 +03:00
923a45ed8c Files: refactor 2022-09-14 13:00:08 +03:00
b04f50fc72 Files: added invintation by link 2022-09-14 12:59:02 +03:00
2f0c494cda Files: added multiplie invintation link 2022-09-09 18:07:04 +03:00
47600daa03 Files: added api for resend room invintation 2022-09-08 13:11:14 +03:00
07d909358a Files: removed unnecessary 2022-09-07 18:24:27 +03:00
fb4e996196 Merge branch 'develop' into feature/room-security 2022-09-06 13:36:03 +03:00
31297798aa refactor 2022-09-06 13:32:37 +03:00
1d75a5adc3 refactor 2022-09-06 13:26:08 +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