Commit Graph

38 Commits

Author SHA1 Message Date
fd5a9a74f0 Merge branch 'master' into feature/files 2020-08-20 17:51:14 +03:00
4501d3229a Nuget: replaced thirdparty 2020-08-20 17:50:08 +03:00
15ba6828c5 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-08-20 12:43:12 +03:00
maksim
c7a3fa85f2 Thirdparty: remove reference 2020-08-14 16:16:48 +03:00
maksim
4a29a69761 feature custom nuget server 2020-08-14 13:48:34 +03:00
maksim
6782b16413 fix: replacing projectreference with packagereference 2020-08-12 13:34:19 +03:00
0231e60cc7 Merge branch 'master' into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
#	web/ASC.Web.Components/src/index.js
2020-07-28 17:34:46 +03:00
585d98f8f4 Files: core. replace 2020-07-28 15:45:14 +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
064160a1ea Files: onedrive 2020-07-10 18:37:02 +03:00
45678da8e5 Merge branch 'master' into feature/files 2020-07-10 14:58:37 +03:00
56df9a98ef Files: resources 2020-07-10 14:57:42 +03:00
87f85fdefe Merge branch 'master' into feature/files 2020-06-29 09:53:07 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
cfdc6d495e Merge branch 'master' into feature/files 2020-06-26 09:46:04 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
Ilya Oleshko
99e641bb2f Merge branch 'master' into feature/files 2020-06-03 18:53:04 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
1842076658 Merge branch 'master' into feature/files 2020-05-18 10:51:37 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
2c21d99ca2 Files: fix 2020-05-14 19:53:26 +03:00
674ae9b412 Files: Download operation 2020-03-25 17:04:02 +03:00
add68d36d4 Files: sharpbox 2020-03-13 16:40:58 +03:00
2241198a81 Files: Thirdparty. Onedrive, sharepoint 2020-03-13 10:37:42 +03:00
c7dab9943f Files: GoogleDrive 2020-03-12 14:29:36 +03:00
10931faf92 Files: box 2020-03-11 18:39:48 +03:00
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +03:00
c1c8bab59d Files: api 2020-02-26 13:01:12 +03:00
a192178156 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-26 11:06:55 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00
4ca24f0077 Files: Init Files.Client 2020-02-25 09:58:09 +03:00
56d5d3f111 Files: Resources, EF 2020-02-18 11:39:28 +03:00
03af1cfac0 Files: DI 2020-02-10 16:46:01 +03:00
646f061647 Files: DocumentServiceTracker 2020-02-05 11:30:04 +03:00
0a8aa83813 Files: FileStorageServiceController 2020-01-31 18:32:27 +03:00
b087949c10 Files: init commit 2020-01-27 14:15:18 +03:00