|
d094546147
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2020-07-17 17:48:50 +03:00 |
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
8d0d5fd908
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# web/ASC.Web.Components/package.json
|
2020-07-16 14:41:32 +03:00 |
|
SuhorukovAnton
|
5bf0bd22b6
|
ASC.Files.Core: first version
|
2020-07-14 13:03:53 +03:00 |
|
|
88e932a0a7
|
Merge branch 'master' into feature/files
|
2020-07-13 16:46:42 +03:00 |
|
SuhorukovAnton
|
28e70e91f6
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 18:37:36 +03:00 |
|
SuhorukovAnton
|
a43c14dcb3
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-07 12:38:35 +03:00 |
|
|
9a2c382dfc
|
Merge branch 'master' into feature/files
|
2020-07-03 17:47:29 +03:00 |
|
|
b9b938cdf8
|
Files: fix convert
|
2020-07-03 17:47:01 +03:00 |
|
|
7cba451f89
|
Merge branch 'master' into feature/files
|
2020-07-03 14:49:26 +03:00 |
|
|
98b007fe35
|
Files: fix CheckConversion
|
2020-07-03 14:48:56 +03:00 |
|
SuhorukovAnton
|
6647217371
|
api-defaultvalue: fix
|
2020-07-02 23:51:18 +03:00 |
|
SuhorukovAnton
|
0ec331db76
|
api-defaultvalue: fix
|
2020-06-30 16:56:38 +03:00 |
|
SuhorukovAnton
|
06cc93223f
|
api-defaultvalue-fix
|
2020-06-29 14:16:23 +03:00 |
|
SuhorukovAnton
|
6869d7c8d1
|
api-defaultvalue: fix
|
2020-06-29 13:37:53 +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
|
99e641bb2f
|
Merge branch 'master' into feature/files
|
2020-06-03 18:53:04 +03:00 |
|
|
dbfb84786e
|
Files: simplified getHeaders method
|
2020-06-01 15:16:24 +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 |
|
|
a61103e0f8
|
Merge branch 'master' into feature/files
|
2020-05-20 12:59:32 +03:00 |
|
|
a064da49f4
|
Files: fix OpenEdit
|
2020-05-20 12:58:40 +03:00 |
|
|
1842076658
|
Merge branch 'master' into feature/files
|
2020-05-18 10:51:37 +03:00 |
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
b5e31b63c9
|
Files: fix RemoveSecurityInfo
|
2020-05-15 18:12:04 +03:00 |
|
Ilya Oleshko
|
4abc9b67e4
|
Merge branch 'master' into feature/files
|
2020-04-24 10:18:07 +03:00 |
|
|
bc4a479fc6
|
Files: DocuSignHandler
|
2020-04-20 15:32: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 |
|
|
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 |
|
Ilya Oleshko
|
3584919e82
|
Server: Files: Fixed DeleteFolder
|
2020-04-03 14:22:14 +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 |
|
|
50c745dbd0
|
Files: ComposeFileOperation
|
2020-03-19 15:56:34 +03:00 |
|
|
4a543560a7
|
Files: api
|
2020-03-18 16:19:37 +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 |
|
|
c3dd78047a
|
Files: refactoring
|
2020-03-04 13:30:29 +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 |
|
|
c1c8bab59d
|
Files: api
|
2020-02-26 13:01:12 +03:00 |
|