Commit Graph

5078 Commits

Author SHA1 Message Date
a6d618ce96 crm: migrate Api to EF Core 2020-04-22 23:46:49 +03:00
ff1989942e Merge branch 'master' into feature/crm-migrate 2020-04-18 20:50:39 +03:00
dda75ec8a3 crm: migrate Api to EF Core 2020-04-18 20:49:09 +03:00
c5ff09ac09 Added DI for Voip 2020-04-17 17:07:44 +03:00
35762e45ee crm: migrate Api to EF Core 2020-04-16 22:41:37 +03:00
f5e90209b9 Files: fixed configs 2020-04-16 16:49:24 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
63ecb8fc87 Consumers: fix 2020-04-16 14:33:35 +03:00
0d6acd74fb Files: fix thirdparty 2020-04-16 13:33:58 +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
1dbdb1aedd Files: configuration 2020-04-15 18:39:59 +03:00
b78b8c00c7 Merge branch 'master' into feature/crm-migrate 2020-04-15 15:36:52 +03:00
a1e1cd17be FileHandler: fix 2020-04-15 13:46:24 +03:00
9928c9bc46 crm: migrate DAO to EF Core 2020-04-14 21:59:32 +03:00
f76724aa04 crm: migrate DAO to EF Core 2020-04-14 17:35:52 +03:00
12436fb832 Files: FileHandler 2020-04-14 16:32:31 +03:00
4fb3f62086 crm: migrate DAO to EF Core 2020-04-14 10:59:07 +03:00
ae0b217172 Files: FileHandler 2020-04-13 14:46:26 +03:00
f8f3f09cc4 crm: migrate DAO to EF Core 2020-04-10 00:22:26 +03:00
47a2c521f3 crm: migrate DAO to EF Core 2020-04-07 23:48:40 +03:00
bbb4997f20 Merge branch 'master' into feature/crm-migrate 2020-04-02 22:43:10 +03:00
6313464cdf crm: migrate DAO to EF Core 2020-04-02 22:42:03 +03:00
Ilya Oleshko
61762afb13
Merge pull request #35 from ONLYOFFICE/feature/files-refactoring
Feature/files refactoring
2020-04-02 15:29:33 +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
a0970248a3 Merge branch 'master' into feature/crm-migrate 2020-03-30 11:53:05 +03:00
acdebad251 crm: migrate DAO to EF Core 2020-03-30 11:52:01 +03:00
039f88378c crm: migrate DAO to EF Core 2020-03-26 21:57:06 +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
d078909a78 Merge branch 'master' into feature/crm-migrate 2020-03-16 12:00:45 +03:00