Commit Graph

48 Commits

Author SHA1 Message Date
d6ff0d6a44 Merge branch 'master' into feature/files 2020-08-12 18:26:28 +03:00
6782269c7f Files: lock file 2020-08-12 18:13:52 +03:00
34c2252b25 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Server/Controllers/FilesController.cs
2020-08-02 22:31:52 +03:00
6253b151e1 fix ChangeHistory, UpdateFile, added UpdateComment 2020-08-02 21:48:58 +03:00
88e932a0a7 Merge branch 'master' into feature/files 2020-07-13 16:46:42 +03:00
a822f9b349 Files: fix 2020-07-13 15:57:39 +03:00
71c267939d Files: fix names and Serializers 2020-07-09 12:02:44 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
SuhorukovAnton
88cad55450 api-defaultvalue: delete DataMembers 2020-07-07 12:59:12 +03:00
cfdc6d495e Merge branch 'master' into feature/files 2020-06-26 09:46:04 +03:00
83b05c5b64 Files: added news 2020-06-25 20:17:24 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
a05d0a94c8 Files: fix 2020-06-13 18:31:45 +03:00
0a48d2b179 Merge branch 'master' into feature/files 2020-05-28 09:20:58 +03:00
80dcee7ed4 Files: fix long operations 2020-05-27 18:23:50 +03:00
b5e31b63c9 Files: fix RemoveSecurityInfo 2020-05-15 18:12:04 +03:00
05d194ba6e Merge branch 'master' into feature/files 2020-05-06 18:22:02 +03:00
c077f0d1d4 Files: added SecurityInfoModel 2020-05-06 18:10:27 +03:00
e1ed073ab6 Merge branch 'master' into feature/files 2020-04-16 12:00:01 +03:00
d873e73304 Files: fix upload 2020-04-16 11:50:52 +03:00
Ilya Oleshko
f0916c4782 Merge branch 'master' into feature/files 2020-04-02 17:48:36 +03:00
Ilya Oleshko
f96db8dd51 Files: added property DisableFormat for string format 2020-04-02 15:05:53 +03:00
Ilya Oleshko
a9ff193903 Files: fixed property name 2020-04-02 14:21:05 +03:00
674ae9b412 Files: Download operation 2020-03-25 17:04:02 +03:00
b62bdc6938 Files: MarkAsRead operation 2020-03-25 11:08:31 +03:00
22e379b37b Files: MoveOrCopy operation 2020-03-24 15:30:16 +03:00
4eab409bef Files: delete operation 2020-03-20 17:35:51 +03:00
7862ed159d Files: fix merge 2020-03-19 16:18:35 +03:00
978cf0e34e Merge branch 'master' into feature/files-refactoring
# Conflicts:
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs
2020-03-19 16:07:16 +03:00
50c745dbd0 Files: ComposeFileOperation 2020-03-19 15:56:34 +03:00
Daniil Senkiv
d5f75d3f77 Merge branch 'master' into feature/files 2020-03-19 09:16:47 +03:00
25de308530 Files: added withSubFolders 2020-03-18 18:03:33 +03:00
4a543560a7 Files: api 2020-03-18 16:19:37 +03:00
212fb746c9 Files: thirdparty fix 2020-03-16 11:25:39 +03:00
Daniil Senkiv
79f1f859b1 Files: fix returning items count 2020-03-13 15:38:09 +03:00
Daniil Senkiv
adc630d4c9 Files: fix returning items count 2020-03-13 15:29:39 +03:00
Ilya Oleshko
0eb43c4f0e Files.Server: Added FileModel for creating file 2020-03-11 16:24:24 +03:00
Ilya Oleshko
5f628a7847 Files.Server: Added FileModel and FolderModel 2020-03-11 13:56:02 +03:00
314c2f9198 Files: added ProviderFileDao, ProviderFolderDao 2020-03-10 18:54:08 +03:00
03bb507d86 Files: added ProviderSecurityDao 2020-03-10 16:31:53 +03:00
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +03:00
ae9a5003f3 Files: refactoring 2020-03-05 10:24:50 +03:00
ece437cbc0 Files: refactoring 2020-03-04 17:40:05 +03:00
38eefb5a20 Files: refactoring 2020-03-03 14:37:40 +03:00
aa9577e5c0 Files: template methods 2020-03-02 15:31:53 +03:00
8e06c42740 Files: added new interface 2020-02-28 14:32:11 +03:00
3ac06f934d Files: fix 2020-02-27 11:51:05 +03:00
190341c716 Files: renamed filescontroller 2020-02-27 11:22:42 +03:00