Commit Graph

516 Commits

Author SHA1 Message Date
SuhorukovAnton
5fbe80d32a Thumbnails: first version 2020-06-16 14:55:46 +03:00
fc0826b60d Backup: service, progress 2020-06-16 14:34:44 +03:00
38c40eec05 Merge branch 'master' into feature/backup 2020-06-15 18:40:26 +03:00
09e7a81e9b UserManager: fix 2020-06-15 18:39:52 +03:00
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00
68575e5048 Backup: ajaxpro removed 2020-06-15 11:19:40 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
31fc052531 Merge branch 'master' into feature/backup 2020-06-09 10:54:35 +03:00
344916b395 TenantManager: fix 2020-06-09 10:54:05 +03:00
eb7a026025 Backup: added autofac 2020-06-08 14:57:45 +03:00
SuhorukovAnton
af2295f98a Backup: fix 2020-06-08 13:40:26 +03:00
725955e851 ProgressQueue: fix 2020-06-08 12:44:01 +03:00
5fb753b528 Backup: fix start 2020-06-08 11:17:54 +03:00
1a5a7dfab5 Merge branch 'master' into feature/feed 2020-06-05 11:46:12 +03:00
f59be0f44b Merge branch 'master' into feature/backup 2020-06-04 17:12:34 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
4ea72a0e65 Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-04 14:39:40 +03:00
1c25d16fc2 Products: added absolute path support 2020-06-04 14:01:25 +03:00
87af491e89 Feed: FilesModule 2020-06-04 13:54:13 +03:00
SuhorukovAnton
26f2107590 Backup: refactoring 2020-06-04 13:47:22 +03:00
84a3c67e1e Merge branch 'master' into feature/feed 2020-06-04 11:53:00 +03:00
81e0917847 Files: simplified getHeaders method 2020-06-03 18:04:14 +03:00
d6274ea3e0 Added Feed.Aggregator 2020-06-03 17:53:58 +03:00
d3ebdb2766 Feed: rename 2020-06-03 13:07:46 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
dbfb84786e Files: simplified getHeaders method 2020-06-01 15:16:24 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
4544469dca TenantManager: add TenantHolder 2020-06-01 13:55:26 +03:00
SuhorukovAnton
1796c682a4 Backup: add backup.json and BackupSettings.cs, fix BackupWorker 2020-06-01 13:33:39 +03:00
a81b21bcde Backup: DocumentsBackupStorage 2020-06-01 11:52:01 +03:00
0ff1f8249d Backup: refactoring 2020-05-29 17:50:39 +03:00
a4146fcce7 Backup: refactoring 2020-05-29 17:48:27 +03:00
SuhorukovAnton
65739dac46 Backup: fix Startup 2020-05-28 16:37:36 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +03:00
SuhorukovAnton
e4881214a4 Backup: fix SQL 2020-05-26 11:52:47 +03:00
b6817d18b5 UrlShortenerService: fix 2020-05-22 14:51:03 +03:00
3fadf8db6c fix log, added UrlShortenerService config 2020-05-21 11:03:35 +03:00
02dd1e9e31 Merge branch 'master' into feature/urlshortener
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Common/DependencyInjection/AutofacExtension.cs
2020-05-20 18:18:31 +03:00
SuhorukovAnton
6acb0d4208 creating 2020-05-20 18:14:44 +03:00
85cec8fff2 ApiSystem: fix autofac 2020-05-20 16:06:35 +03:00
d08a564946 ApiSystem: service, config, di 2020-05-19 20:41:37 +03:00
627dd8a97d ApiSystem: fix 2020-05-19 16:22:47 +03:00
b29b11ad0f Merge branch 'master' into feature/apisystem
# Conflicts:
#	ASC.Web.sln
2020-05-19 14:45:24 +03:00
bb6f32e36a Api: fix 2020-05-18 15:08:03 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
78442cd9eb Files: Service fix 2020-05-15 14:02:05 +03:00
c47bcebff3 Core: removed Custom Resolver 2020-05-14 18:51:22 +03:00
91d287a2d5 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
2020-05-14 17:14:59 +03:00
8aaf528f2a Elastic: CreateIfNotExist 2020-05-14 17:03:24 +03:00
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
74e851e01b ElasticSearch: fixed MatchAll 2020-05-08 18:10:53 +03:00
cd70aebb0c Elastic: removed unused classes 2020-05-08 17:04:05 +03:00
4160f42d27 Files: fixed upload 2020-05-07 14:33:12 +03:00
7bf739fe09 Optimization 2020-05-07 14:02:29 +03:00
3a747ef8e4 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Model/EmployeeWraper.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Models/GroupWrapperFull.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
7cc06c2322 ElasticSearch: state 2020-05-06 14:32:26 +03:00
02b33bc07b Merge branch 'master' into feature/files-index
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-05-06 11:54:26 +03:00
1526d8e502 Common: removed StreamCopyTo 2020-05-06 11:41:27 +03:00
f8812bdc05 ElasticSearch: reindex 2020-05-05 20:40:24 +03:00
af7fb87e73 Elastic: settings 2020-05-03 18:50:40 +03:00
7ffd2c702f Files: search 2020-04-29 19:01:38 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
bcfbac05c6 ElastiSearch: removed Wrapper, WrapperWithDoc 2020-04-29 11:04:19 +03:00
adab38548a Files: Index Service 2020-04-28 18:11:10 +03:00
b5671cc460 Files: Service 2020-04-27 19:59:52 +03:00
57f4c3788e ElasticSearch: refactoring. Wrapper replaced with ISearchItem 2020-04-27 14:27:58 +03:00
623a6609cc JWT: fix 2020-04-24 13:28:06 +03:00
4db07a6010 ElasticSearch: updated to 7.6.1 2020-04-23 20:24:56 +03:00
4f025d9931 Files: fixed download 2020-04-23 14:50:34 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
7fd2cd206b Api: Update 2020-04-20 15:54:13 +03:00
c5ff09ac09 Added DI for Voip 2020-04-17 17:07:44 +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
22e379b37b Files: MoveOrCopy operation 2020-03-24 15:30:16 +03:00
e986f73293 Files: fixed ComposeFileOperation 2020-03-20 11:11:38 +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
212fb746c9 Files: thirdparty fix 2020-03-16 11:25:39 +03:00
5671ee6133 Files: fixed long operation 2020-03-06 17:48:58 +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
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
c780a881df Files: fixed removing file method 2020-03-04 10:42:43 +03:00
46ae46dcd1 Files: fixed start services 2020-02-27 11:44:55 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00
67e7f536d1 ASC.ApiSystem: fixed auth header parsing 2020-02-25 15:06:16 +03:00
d44e359f24 ASC.ApiSystem: fixed using 2020-02-25 14:48:14 +03:00
39128a7ba0 ASC.ApiSystem: replace AuthSignatureAttribute with AuthHandler 2020-02-25 14:43:01 +03:00
28d932afff ASC.ApiSystem: added appsettings.services.json 2020-02-25 12:05:27 +03:00
449c0db1fa ASC.ApiSystem: replace HttpResponseMessage to IActionResult 2020-02-25 11:45:16 +03:00
44ec45ebb6 Merge branch 'master' into feature/elastic
# Conflicts:
#	common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/AuthManager.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Data/DbSettingsManager.cs
#	common/ASC.Core.Common/Tenants/TenantUtil.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
a90b1fb424 People: added GetExpression 2020-02-25 11:02:13 +03:00
9db8b26985 Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
30d952b946 fix 2020-02-21 15:38:04 +03:00