Commit Graph

328 Commits

Author SHA1 Message Date
SuhorukovAnton
103de233e9 Thumbnails: fix 2020-06-17 14:00:28 +03:00
ca9af1080c Backup: refactoring 2020-06-17 10:49:17 +03:00
b36dac0cb4 Backup: fix 2020-06-16 19:04:40 +03:00
b94e4fbeac Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-16 18:00:38 +03:00
b35a60cac0 Backup: added DeleteBackupRequest 2020-06-16 17:46:10 +03:00
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
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
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
004dcc2d4d Merge branch 'master' into feature/files 2020-06-04 16:48:03 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
d7386049dc Merge branch 'master' into feature/files 2020-06-04 16:27:06 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
172b8bebfc fix 2020-06-04 16:13:39 +03:00
ae0fb62add Merge branch 'master' into feature/files 2020-06-04 16:05:12 +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
87af491e89 Feed: FilesModule 2020-06-04 13:54:13 +03:00
SuhorukovAnton
26f2107590 Backup: refactoring 2020-06-04 13:47:22 +03:00
Ilya Oleshko
99e641bb2f Merge branch 'master' into feature/files 2020-06-03 18:53:04 +03:00
d6274ea3e0 Added Feed.Aggregator 2020-06-03 17:53:58 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +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
b0ae0b5270 Merge branch 'master' into feature/files 2020-05-22 15:26:05 +03:00
b6817d18b5 UrlShortenerService: fix 2020-05-22 14:51:03 +03:00
5d5c67ea3c Merge branch 'master' into feature/files 2020-05-21 11:51:09 +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
1aa1abb768 Merge branch 'master' into feature/files 2020-05-20 16:07:41 +03:00
85cec8fff2 ApiSystem: fix autofac 2020-05-20 16:06:35 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +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
ea03b6428f fix 2020-05-14 20:39:40 +03:00
8aaf528f2a Elastic: CreateIfNotExist 2020-05-14 17:03:24 +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
7cc06c2322 ElasticSearch: state 2020-05-06 14:32:26 +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
4db07a6010 ElasticSearch: updated to 7.6.1 2020-04-23 20:24:56 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +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
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
46cfe9f382 ASC.ApiSystem: AuthSignatureService: using IConfiguration 2020-02-21 12:45:59 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
edbb9088b1 ASC.ApiSystem: DI HostedSolution 2020-02-20 17:50:05 +03:00
f83dcbced0 Added ASC.ApiSystem.csproj 2020-02-19 16:19:10 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
56d5d3f111 Files: Resources, EF 2020-02-18 11:39:28 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
c082019270 Files: DI 2020-02-14 13:45:46 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00
fdf5b27903 Files: DI 2020-02-11 18:10:30 +03:00
0ced5c1fda ElasticSearch: first version 2020-01-24 16:07:51 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
ec3a984e4a EF: notify. fix 2019-12-18 16:10:20 +03:00
6cd6eedde0 EF: notify 2019-12-11 12:47:55 +03:00
a623670582 EF: notify 2019-12-10 16:42:29 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
fcc4e4605f Common nlog config 2019-11-15 11:47:56 +03:00
04464d52ad Add "AddEnvironmentVariables" setting 2019-11-14 12:21:15 +03:00
44d6e6e53d Dependencies updated 2019-11-12 13:28:30 +03:00
9d2862bf9e Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
26420fd2b8 DI: Notify 2019-11-05 13:20:00 +03:00
0801877060 DI: ASC.Studio.Notify.
Settings: AutoMapper
2019-11-01 16:56:47 +03:00
c54f575c26 DI: StudioNotifyService 2019-11-01 11:49:08 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
8ca3a63e24 DI: refactoring 2019-10-22 19:08:37 +03:00
726ca634e4 Revert "removed ConfigurationManager"
This reverts commit c03be150f4.

ProgressQueue init
2019-10-22 16:48:48 +03:00
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +03:00
0dcd2dbc91 Removed CommonServiceProvider 2019-10-21 17:56:35 +03:00
53d2aaa4e3 DI: DbManager 2019-10-21 16:50:20 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
7c05ba927b DI: KafkaCache 2019-10-11 18:03:03 +03:00
2ebe431c98 DI: configuration 2019-10-10 11:52:21 +03:00
74d8709f62 DI: configuration 2019-10-09 19:08:37 +03:00
710a3f62fa Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
2564a0c760 fixed start services 2019-09-25 15:55:35 +03:00
4aac6be6ab fixed start services 2019-09-25 15:49:21 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
152c5d9697 .net core up to 3.0.0-rc1 2019-09-18 12:29:17 +03:00
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
e0cb81adc4 Merge branch 'master' into refactoring/di
# Conflicts:
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-11 21:21:21 +03:00
1530ec842e DI: WebImageSupplier,WebItemSettings, SettingsManager 2019-09-11 13:42:52 +03:00
c34db98d6b suppress warning: NU1701 for release configuration 2019-09-10 18:20:17 +03:00
c50b5b0fc9 csproj: remove pdb file from release build configuration 2019-09-10 16:38:20 +03:00
7cd8e53d2c Merge branch 'master' into refactoring/di 2019-09-10 16:15:15 +03:00
0a5ef37043 Getting STORAGE_ROOT from env variable 2019-09-09 18:04:28 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
6cae722b9d kafka disabled by default 2019-08-23 15:49:23 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
ddfbab4c24 Resources: notify 2019-08-15 11:44:27 +03:00
00120d88c9 Notify: sender queue moved to ASC.Studio.Notify 2019-08-02 13:25:33 +03:00
3036e1cb90 Added ASC.Studio.Notify service 2019-08-01 11:47:15 +03:00
62dee4b3bf Added notify service 2019-07-29 12:15:48 +03:00