Commit Graph

410 Commits

Author SHA1 Message Date
5bf9bfae27 Files: optimization 2021-08-13 18:59:17 +03:00
e92c41d919 Merge branch 'develop' into release/1.0.0 2021-08-10 18:55:25 +03:00
643b7b66dc Optimization: removed autofac ILifetimeScope 2021-08-10 17:56:38 +03:00
c2bd00506c fix Bug 51447 2021-08-03 17:05:49 +03:00
db7954ee31 Merge branch 'develop' into feature/backup 2021-06-30 15:54:45 +03:00
4a4cab5352 Files: FileHelper decorator 2021-06-18 23:31:46 +03:00
ae17671043 Merge branch 'develop' into feature/backup
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/store/SettingsSetupStore.js
2021-06-18 18:08:38 +03:00
3d3a8a2d6a Merge branch 'develop' into feature/remove_binary_formatter 2021-06-18 10:49:07 +03:00
53ee0ef484 fixed warnings 2021-06-16 18:00:27 +03:00
a82efce2a1 add fileHelper 2021-06-10 17:53:06 +03:00
3ef16948fc Merge branch 'develop' into feature/backup
# Conflicts:
#	common/services/ASC.Data.Backup/Core/NotifyHelper.cs
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
2021-06-08 15:03:49 +03:00
50f0bef484 remove unnecessary using 2021-06-07 13:56:24 +03:00
fd485e06e4 remove_binary_formatter 2021-06-07 13:54:17 +03:00
43de25b62a Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
d134398167 Storage: fix resolve 2021-06-02 16:28:05 +03:00
SuhorukovAnton
7fd550dfe8 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-06-01 17:49:10 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
d3fb9f8384 fix 2021-05-31 14:08:13 +03:00
570ede7bba Merge branch 'develop' into feature/11.5.2
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
c8c5b49d1c Files: thumbnails. 2e37dcd0 2021-05-30 21:52:32 +03:00
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
c1b7ea5a9a Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00
SuhorukovAnton
a1c4e0f568 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-05-21 12:27:54 +03:00
b9c52c526e Fixed DistributedTask 2021-05-18 21:24:22 +03:00
SuhorukovAnton
ec56ae33a3 packages for rackspace and openstack 2021-05-18 12:01:34 +03:00
a5c6ba5dcc Common, db: moved from 08a01422 2021-05-17 14:35:00 +03:00
d01db1eed6 Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq
# Conflicts:
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
#	common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/services/ASC.Data.Backup/BackupAjaxHandler.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-13 11:57:40 +03:00
6867ded281 Merge branch 'develop' into feature/remove-wq
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2021-05-13 11:23:44 +03:00
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
f8be896241 Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2021-01-22 16:34:40 +03:00
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
0fae06b2bf fix storage 2020-12-22 15:51:04 +03:00
d39c2524c3 Files: refactoring 2020-12-04 13:52:07 +03:00
1675896294 Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
2020-12-04 11:59:10 +03:00
f71d59df53 TenantQuotaController: optimization 2020-11-24 13:56:24 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
eb6b54482e fix warnings 2020-11-17 13:47:17 +03:00
1623241d8a Code cleanup 2020-11-17 13:00:01 +03:00
75fce656f0 Merge branch 'develop' into feature/dotnet5 2020-11-17 11:31:14 +03:00
a66f99f574 net5.0 2020-11-15 18:55:57 +03:00
049e8f63e9 Refactoring: scope. 2020-10-29 11:13:51 +03:00
3256a3dbc7 DI: fix 2020-10-28 23:02:03 +03:00
51f1f92307 Scope: refactoring. 2020-10-28 15:26:27 +03:00
af99020de0 Scope: refactoring. Encryption 2020-10-26 17:23:23 +03:00
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
1d2f65ba12 Refactoring: scope 2020-10-20 23:10:17 +03:00
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
e6be6f5072 References updated 2020-10-16 10:27:44 +03:00
f69281a07d References updated 2020-10-15 21:30:16 +03:00
SuhorukovAnton
ab84f48a86 remove-wq: refactoring 2020-10-14 17:26:18 +03:00
SuhorukovAnton
2e4f612f93 remove-wq: fix encryption 2020-10-13 17:28:10 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
f6f65f5968 fix 2020-10-12 20:40:14 +03:00
5e14bbb8cc fix 2020-10-12 20:20:19 +03:00
43b9c33979 fix formating 2020-10-12 19:23:15 +03:00
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
3f5b8b77c4 DistributedTaskQueue: refactoring 2020-10-02 10:19:02 +03:00
SuhorukovAnton
cb2e656e21 fix-messages: IDE0066 2020-10-01 10:57:35 +03:00
SuhorukovAnton
edbc0f247c fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
90e61ba082 Added DistributedTaskProgress 2020-09-30 13:54:49 +03:00
e4d4db6563 Merge branch 'master' into feature/remove-wq
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressBase.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2020-09-29 19:46:40 +03:00
e4acc15773 removed WorkerQueue, ProgressQueue 2020-09-29 16:02:47 +03:00
SuhorukovAnton
1da0de1200 fix-messages: IDE0065 2020-09-29 13:28:03 +03:00
SuhorukovAnton
2d34d70a4e fix-messages: IDE0051 and IDE0052 2020-09-29 11:57:37 +03:00
SuhorukovAnton
29ec562a78 fix-messages: IDE0038 2020-09-28 18:21:29 +03:00
SuhorukovAnton
bc98087599 fix-messages: IDE0018 2020-09-28 17:25:40 +03:00
a085e8ef38 Merge branch 'master' into feature/release-11.0.0
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
2020-09-23 14:00:24 +03:00
6f5cc4a447 Api: fix 2020-09-23 13:55:39 +03:00
0000129b3b Merge branch 'master' into feature/release-11.0.0
# Conflicts:
#	common/ASC.Core.Common/Context/WorkContext.cs
#	common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/Crypt.cs
#	common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
#	common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
#	common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
#	common/ASC.Data.Storage/Encryption/ICrypt.cs
#	common/ASC.Data.Storage/Encryption/IEncryptionService.cs
#	common/ASC.Data.Storage/Encryption/IMetadata.cs
#	common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
#	common/ASC.Data.Storage/Encryption/Metadata.cs
#	common/ASC.Data.Storage/Encryption/StreamWrapper.cs
#	config/storage.json
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
2020-09-20 20:17:12 +03:00
144dde2699 Encryption: fix notify 2020-09-18 20:57:51 +03:00
SuhorukovAnton
7d3bb9e9a8 encryption: add api start 2020-09-17 16:56:12 +03:00
SuhorukovAnton
7fae3bf83a encryption: upload crypt 2020-09-16 17:03:33 +03:00
54cf80dafa Encrypt: fix 2020-09-16 16:32:46 +03:00
SuhorukovAnton
8e0ebceb36 encryption: copyright 2020-09-16 10:54:52 +03:00
dc6b0d2c6c ASC.Data.Storage moved from release/11 4414f77b 2020-09-15 18:16:37 +03:00
SuhorukovAnton
13edcd6a1a Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-15 11:26:43 +03:00
SuhorukovAnton
5916705391 enctyption: fixbug 2020-09-15 11:24:48 +03:00
SuhorukovAnton
eb18133e4b encryption: bugfix 2020-09-14 13:32:20 +03:00
7c9df6c3c4 Moved from v10.5.2-saas 2020-09-11 17:16:59 +03:00
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
f89af33b5b fix unhandled exception 2020-09-10 13:39:26 +03:00
cc9e0e1374 Merge branch 'master' into feature/scope
# Conflicts:
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
2020-09-09 18:18:34 +03:00
SuhorukovAnton
5aeaa0ee98 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-09 13:45:21 +03:00
SuhorukovAnton
88646b2d2f default-value-module: fix 2020-09-09 13:38:43 +03:00
SuhorukovAnton
3875f9f4b0 default-value-module: fix 2020-09-09 13:36:53 +03:00
SuhorukovAnton
2378c3746e default-value-module: fix 2020-09-09 13:25:50 +03:00
SuhorukovAnton
0f7901628b default-value-module: fix 2020-09-09 13:25:13 +03:00
SuhorukovAnton
ce27032fbb default-value-module: first version 2020-09-09 12:31:57 +03:00
SuhorukovAnton
89daf213c5 encryption: fix 2020-09-08 15:07:59 +03:00
SuhorukovAnton
3d79f7c484 encryption: fix 2020-09-08 11:26:05 +03:00
SuhorukovAnton
bd3c14c7ec encryption: fix 2020-09-07 18:04:26 +03:00
SuhorukovAnton
2d3f183567 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-07 17:00:48 +03:00
SuhorukovAnton
80198032a4 scope: refactoring 2020-09-07 15:01:15 +03:00
8e3e73c746 Scope: fix 2020-09-04 13:10:19 +03:00
SuhorukovAnton
d8576a4b0a encryption: fix 2020-09-03 14:48:36 +03:00
SuhorukovAnton
15b17a0478 Encryption: first version 2020-09-02 13:54:50 +03:00
SuhorukovAnton
90f1c4fa3d Merge branch 'master' into feature/scope 2020-08-31 11:29:44 +03:00
SuhorukovAnton
132a6b05ae scope: add deconstructs 2020-08-31 11:18:07 +03:00
maksim
c07be0324a ASC.Data.Storage.Migration: fix 2020-08-28 14:58:20 +03:00
maksim
aa78badaec ServiceClientListener: fix cache 2020-08-28 14:26:06 +03:00
maksim
e4b2c45ee6 MigrateServiceClient: adding a cache 2020-08-28 13:23:09 +03:00
maksim
138348f668 MigrateServiceClient: fix 2020-08-28 11:31:46 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
maksim
75eabe38a0 MigrateServiceClient: fix 2020-08-26 10:07:12 +03:00
maksim
1e97a26847 MigrationService: changing subscription 2020-08-25 10:48:18 +03:00
SuhorukovAnton
055e787d63 scope: fix 2020-08-24 21:41:06 +03:00
maksim
280604e41d ASC.Data.Storage.Migration: adding protocol buffers and event listening 2020-08-21 11:05:27 +03:00
maksim
326d352a7c Migration: registering dependencies in program 2020-08-20 16:53:39 +03:00
SuhorukovAnton
eef5c3e4f3 scope: merge fix 2020-08-16 13:11:15 +03:00
SuhorukovAnton
faec4269db Merge branch 'master' into feature/scope 2020-08-16 12:23:20 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
ffc756f32b Backup: DistributedTaskQueue 2020-08-06 21:07:27 +03:00
SuhorukovAnton
456866d4d9 scope: refactoring 2020-07-30 00:57:58 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
dfd8bbfdb8 Merge branch 'master' into feature/api-defaultvalue 2020-07-13 15:28:11 +03:00
cd3240a7f6 Removed LimitedConcurrencyLevelTaskScheduler 2020-07-13 14:11:36 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
b617257887 Notify: back rename 2020-06-28 14:08:12 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
SuhorukovAnton
af2295f98a Backup: fix 2020-06-08 13:40:26 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
4160f42d27 Files: fixed upload 2020-05-07 14:33:12 +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
adab38548a Files: Index Service 2020-04-28 18:11:10 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +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
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
2722dfd693 moved from hotfix/10.5.2 2020-01-21 15:44:05 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
e579b124d9 fixed scope 2019-11-15 13:11:40 +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
6aeef025ab Storage: Fixed loading config 2019-11-11 11:51:19 +03:00
6ac10fac2f ISettings replaced with ISettingsExt 2019-11-08 18:11:30 +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
7a9c490467 Settings: fixed automapper settings 2019-11-05 15:34:00 +03:00
0801877060 DI: ASC.Studio.Notify.
Settings: AutoMapper
2019-11-01 16:56:47 +03:00
9d08727f4c DI: refactoring. ASC.Web.Studio 2019-10-31 17:50:24 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +03:00
09881619b8 DI: DbManager 2019-10-18 16:29:24 +03:00
219036d4a4 DI: HttpContext 2019-10-18 11:48:27 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
7c05ba927b DI: KafkaCache 2019-10-11 18:03:03 +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
afb1f90e9a .net core up to 3.0.0 2019-09-24 14:20:58 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
3e0f946372 DI: PathUtils 2019-09-21 19:39:17 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +03:00
e7b7cabdd2 DI: TenantManager 2019-09-20 17:04:06 +03:00
41b4a909cd DI: TenantManager 2019-09-20 15:47:00 +03:00
db5dc66217 Kafka: fix 2019-09-19 15:48:37 +03:00
7ceb117690 DI: CoreConfiguration 2019-09-19 14:34:54 +03:00
a07cbe30f4 DI: CoreSettings 2019-09-18 18:19:30 +03:00
c171e2c903 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	common/ASC.IPSecurity/ASC.IPSecurity.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	common/ASC.VoipService/ASC.VoipService.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/ASC.Web.Core.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2019-09-18 13:32:39 +03:00
152c5d9697 .net core up to 3.0.0-rc1 2019-09-18 12:29:17 +03:00
bcdbcf5ccc DI: TenantManager 2019-09-18 11:25:57 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
a46a092890 DI: TenantManager 2019-09-17 11:07:46 +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
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
d16d5f1251 Kafka: create only one producer for instance
UserPhotoManager: optimization
2019-08-27 17:57:06 +03:00
0bd089938e IDE0059 2019-08-16 12:08:46 +03:00
73774a29fa IDE0067 2019-08-16 11:44:03 +03:00
28fc76ded9 IDE0066 2019-08-15 18:13:25 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
f747e0e4fc IDE0028, IDE0016, IDE0029, IDE0032 2019-08-15 16:56:54 +03:00
b426004f70 IDE0019, IDE0020 2019-08-15 16:41:38 +03:00
96dd3cd657 IDE0017 2019-08-15 16:35:18 +03:00
c7d163b37d IDE0016 2019-08-15 16:20:23 +03:00
ed7ed484e8 IDE0049 2019-08-15 16:16:39 +03:00
d9be7211f6 IDE0018 2019-08-15 16:05:50 +03:00
58fb60ba65 IDE0007 2019-08-15 16:03:57 +03:00
f8f2c94962 IDE0034 2019-08-15 16:00:20 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
d524663958 Packages updated 2019-08-12 15:52:09 +03:00
49b259abff refactoring 2019-08-09 15:28:19 +03:00
6f8a94dca4 Optimization 2019-08-08 16:35:22 +03:00
cb5f732e76 Replaced ICacheNotify with ICacheNotify<>
Removed RedisCache
2019-07-22 15:31:09 +03:00
6e500b0986 Upgrade .net core to 3.0.0-preview6
Added KafkaCache
2019-07-19 16:10:15 +03:00
1ad03ec6d8 Added auth to StorageHandler 2019-07-09 13:29:53 +03:00
4d440232f2 Storage: DI singleton 2019-06-10 15:54:10 +03:00
cdd8ce24c5 People: EmployeeWraper: DisplayName, AvatarSmall
WebComponents: gitignore
2019-06-07 14:34:09 +03:00
84fe95768a fix HttpContext.Current 2019-06-06 11:44:38 +03:00
9b3506ab0c ASC.Data.Storage: init commit. 2019-06-04 17:43:20 +03:00