Commit Graph

125 Commits

Author SHA1 Message Date
Ilya Oleshko
4abc9b67e4 Merge branch 'master' into feature/files 2020-04-24 10:18:07 +03:00
4f025d9931 Files: fixed download 2020-04-23 14:50:34 +03:00
bc4a479fc6 Files: DocuSignHandler 2020-04-20 15:32:24 +03:00
c40acf19fb Files: ThirdPartyAppHandler 2020-04-20 15:08:24 +03:00
b55ef3aa37 Merge branch 'master' into feature/files 2020-04-20 11:19:17 +03:00
eef99a3e96 Files: ChunkedUploaderHandler 2020-04-20 11:08:04 +03:00
Ilya Oleshko
8c349b0ee2 Merge branch 'master' into feature/files 2020-04-16 16:10:55 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
f18ef7d26a Merge branch 'master' into feature/files 2020-04-16 13:41:47 +03:00
0d6acd74fb Files: fix thirdparty 2020-04-16 13:33:58 +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
22652fbd13 Files: thirdparty fix 2020-04-16 10:14:24 +03:00
c788c6f223 Merge branch 'master' into feature/files 2020-04-16 09:45:03 +03:00
1dbdb1aedd Files: configuration 2020-04-15 18:39:59 +03:00
Ilya Oleshko
8a3254a70c Merge branch 'master' into feature/files 2020-04-14 14:32:36 +03:00
ae0b217172 Files: FileHandler 2020-04-13 14:46:26 +03:00
Ilya Oleshko
0b4c504c99 Server: Files: Fixed RecalculateFoldersCount after merge 2020-04-03 15:14:41 +03:00
Ilya Oleshko
3584919e82 Server: Files: Fixed DeleteFolder 2020-04-03 14:22:14 +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
Ilya Oleshko
f4f6ec9054 Files: fixed missing after merge 2020-04-02 14:19:38 +03:00
bac73b4762 Merge branch 'master' into feature/files-refactoring
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-03-25 17:07:48 +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
211591dc6b Merge branch 'master' into feature/files 2020-03-25 09:06:18 +03:00
7784c65bfb Files: fixed removing folder 2020-03-24 17:03:48 +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
4dfdca6bea Files: CrossDao 2020-03-20 16:05:34 +03:00
e986f73293 Files: fixed ComposeFileOperation 2020-03-20 11:11:38 +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
Ilya Oleshko
a3fca8d358 Merge branch 'master' into feature/files 2020-03-18 17:46:29 +03:00
566eaa1a80 Files: fixed saveFolder 2020-03-18 17:41:35 +03:00
Ilya Oleshko
92fe787fef Merge branch 'master' into feature/files 2020-03-18 17:10:57 +03:00
cb77ce4857 Files: fixed RecalculateFoldersCount 2020-03-18 16:51:36 +03:00
4a543560a7 Files: api 2020-03-18 16:19:37 +03:00
98eb263efd Files: thirdparty. Fix 2020-03-17 17:47:39 +03:00
fad1f8255c Files: thirdparty 2020-03-17 15:49:14 +03:00
ff36878397 Files: thirdparty refactoring 2020-03-17 10:48:33 +03:00
8f455e388f Thirdparty: refactoring 2020-03-16 18:34:51 +03:00
212fb746c9 Files: thirdparty fix 2020-03-16 11:25:39 +03:00
Daniil Senkiv
4d50abfb63 Merge branch 'master' into feature/files 2020-03-13 17:51:46 +03:00
b3fbe38090 Files: fixed search 2020-03-13 17:36:18 +03:00
add68d36d4 Files: sharpbox 2020-03-13 16:40:58 +03:00