Commit Graph

5161 Commits

Author SHA1 Message Date
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
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
25de308530 Files: added withSubFolders 2020-03-18 18:03:33 +03:00
566eaa1a80 Files: fixed saveFolder 2020-03-18 17:41:35 +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
d694819eda web: common: bump version 2020-03-16 10:49:47 +03:00
0ed02f88a0 web: components: bump version 2020-03-16 10:49:34 +03:00
eb21f8a957 Update yarn.lock files 2020-03-16 10:37:55 +03:00
c6d13463ab Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-03-16 10:25:18 +03:00
ae253a000e
Merge pull request #32 from ONLYOFFICE/dependabot/npm_and_yarn/web/ASC.Web.Client/acorn-5.7.4
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Client
2020-03-16 10:23:22 +03:00
45bb168dfc
Merge branch 'master' into dependabot/npm_and_yarn/web/ASC.Web.Client/acorn-5.7.4 2020-03-16 10:23:15 +03:00
dependabot[bot]
2f8f43a03a
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-16 07:22:50 +00:00
171a03c058
Merge pull request #33 from ONLYOFFICE/dependabot/npm_and_yarn/products/ASC.People/Client/acorn-5.7.4
Bump acorn from 5.7.3 to 5.7.4 in /products/ASC.People/Client
2020-03-16 10:22:45 +03:00
c103f24cc6
Merge branch 'master' into dependabot/npm_and_yarn/products/ASC.People/Client/acorn-5.7.4 2020-03-16 10:22:16 +03:00
94e8640bd4
Merge pull request #34 from ONLYOFFICE/dependabot/npm_and_yarn/web/ASC.Web.Components/acorn-5.7.4
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Components
2020-03-16 10:21:54 +03:00
dependabot[bot]
e4e7cce565
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Components
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-14 00:55:11 +00:00
dependabot[bot]
3e25e5c6de
Bump acorn from 5.7.3 to 5.7.4 in /products/ASC.People/Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-14 00:54:24 +00:00
b3fbe38090 Files: fixed search 2020-03-13 17:36:18 +03:00
add68d36d4 Files: sharpbox 2020-03-13 16:40:58 +03:00
Daniil Senkiv
79f1f859b1 Files: fix returning items count 2020-03-13 15:38:09 +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
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
5671ee6133 Files: fixed long operation 2020-03-06 17:48:58 +03:00
f0111a72a0 Files: fixed get @share 2020-03-06 17:15:39 +03:00
6ccfbec3b0 Files: fixed remove folder 2020-03-06 16:48:04 +03:00
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +03:00
10ec08c08e Partial autofac registration 2020-03-05 17:32:09 +03:00
8bbe383e78 Added url shortener service install scripts 2020-03-05 14:56:07 +03:00
ef806e6c2b Added url shortener service launcher 2020-03-05 14:55:12 +03:00
48cb7728ce Added url shortener service 2020-03-05 14:45:34 +03:00