Commit Graph

10242 Commits

Author SHA1 Message Date
26df50c457 remove unused projects 2022-09-08 17:05:35 +03:00
3e515032a9 remove waste asc.files.service 2022-09-08 13:42:33 +03:00
ad09c4a61e remove waste asc.files.core 2022-09-08 13:08:45 +03:00
ff7eeb0940 remove waste in asc.files 2022-09-08 10:57:49 +03:00
605aee5529 Merge branch 'develop' into feature/security-history-audit 2022-08-30 11:55:19 +05:00
mushka
18b56dbc3e Merge branch 'develop' into feature/create-room 2022-08-29 12:36:47 +03:00
16c7d80398 Files: fix root files 2022-08-29 11:57:48 +03:00
e3e47364e0 Merge branch 'develop' into feature/security-history-audit 2022-08-29 13:36:09 +05:00
a8972c7cba Files: fix rooms sorting 2022-08-29 10:47:54 +03:00
d11e228792 Merge branch 'develop' into bugfix/sharpbox 2022-08-29 10:27:50 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
4797576a0c Files: fix open in editor 2022-08-26 13:54:22 +03:00
b4a5fb253f Files: fix rename for SharpBox, SharePoint providers 2022-08-26 13:08:03 +03:00
1be967fe3f Files: added id conversion in base64 string 2022-08-26 13:07:27 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
mushka
64f899fbbf Merge branch 'develop' into feature/create-room 2022-08-25 15:36:52 +03:00
4dcd9be041 fix: removed IOptionsSnapshot 2022-08-25 13:29:08 +03:00
1b158e1e5e Merge branch 'develop' into feature/push 2022-08-25 11:22:07 +03:00
6ee5cdb0c3 Merge branch 'develop' into feature/room-filter 2022-08-25 10:23:24 +03:00
e2472b392e Files: fix doceditor link 2022-08-24 20:27:20 +03:00
ccea188dd4 Merge branch 'develop' into feature/create-room 2022-08-24 17:55:37 +03:00
00e580438f Files: fix rename room 2022-08-24 16:13:20 +03:00
3d706635f5 Files: fix rename room 2022-08-24 16:09:43 +03:00
6d3a6cb58e Merge branch 'develop' into feature/create-room 2022-08-23 18:06:58 +03:00
0e9099017a
Merge branch 'develop' into bugfix/room-logo 2022-08-23 18:05:14 +03:00
58b48df3ab Files: added folders only filter for rooms 2022-08-23 17:22:50 +03:00
b633dcb4e6 update DocStore 2022-08-23 17:19:21 +03:00
718d87c7d6 Files: forms. remove caching 2022-08-23 17:16:15 +03:00
34232bc735 Files: removed oformservice 2022-08-23 16:34:54 +03:00
e7fa60d13c Merge branch 'develop' into feature/push 2022-08-23 15:32:06 +03:00
53ee8e9e15 Files: fix security 2022-08-23 15:18:37 +03:00
4c923b5117 Files: fix access 2022-08-23 14:54:51 +03:00
4278dbbf13 Merge branch 'develop' into feature/create-room 2022-08-23 14:23:45 +03:00
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
5375ad19c5 Files: fix logo for SharePoint 2022-08-23 13:20:26 +03:00
95fa372f8a Files: fix update path for SharePoint 2022-08-23 13:15:24 +03:00
f649ee0292 Files: fix room logo 2022-08-23 13:07:30 +03:00
7c579fbd28 Files: fix thirdparty room deletion 2022-08-23 12:08:26 +03:00
a7ce34d4ce Files: fix for SharpBox 2022-08-23 11:37:18 +03:00
670fd4952a Files: fix security priority 2022-08-23 10:54:55 +03:00
0be56bdc15 Files: refactor 2022-08-22 18:57:10 +03:00
b36abf5c0c Files: fix renaming thirdparty room 2022-08-22 18:57:03 +03:00
61d8ed822a Files: fix path updating 2022-08-22 18:56:27 +03:00
dd2ec8082c Files: fix renaming thirdparty room 2022-08-22 18:55:03 +03:00
5ede1f3069 Merge branch 'develop' into feature/create-room 2022-08-22 16:14:48 +03:00
099e7058a7 Files: fix thirdparty id mapping 2022-08-22 11:06:16 +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
mushka
4379a34bcf Merge branch 'develop' into feature/create-room 2022-08-15 16:01:20 +03:00