Commit Graph

250 Commits

Author SHA1 Message Date
9bccfa3ade refactoring: add globalUsing: core.common 2022-01-26 13:43:08 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
85f1660b39 analizators/U2U1203 2022-01-19 13:46:21 +03:00
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
555ca30c99 analizators/s2259 2021-12-30 13:23:01 +03:00
632783b130 analizators/s4275 2021-12-29 18:12:39 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
b42fd9c03f Merge branch 'develop' into feature/reworked-user-service 2021-12-13 17:40:40 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
6ccda4d68d UserManager: revert cache 2021-11-23 15:25:34 +03:00
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
1c4d1efa83 fix 2021-09-28 20:30:02 +03:00
9207238d8d Merge branch 'develop' into release/1.0.0 2021-08-20 16:12:40 +03:00
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
163e73ef4a Personal: optimization 2021-08-12 14:00:05 +03:00
90bb8a139a UserManager: fix for personal 2021-08-06 17:30:51 +03:00
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
2be10b8bd9 Settings: added personal settings 2021-06-02 19:13:47 +03:00
e43445cb2d Config: Enabled personal mode in appsettings.json 2021-06-02 16:17:23 +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
06928a7896 People: fixed group cache 2021-05-18 18:50:48 +03:00
Vashchuk Nikita
94047ab0a1 Fix Calendar 2021-05-17 21:35:23 +03:00
a5c6ba5dcc Common, db: moved from 08a01422 2021-05-17 14:35:00 +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
1490332568 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
#	products/ASC.Files/Server/Startup.cs
2020-11-10 11:42:50 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
43beaf6f6b Refactoring: scope 2020-10-29 17:30:08 +03:00
3256a3dbc7 DI: fix 2020-10-28 23:02:03 +03:00
51f1f92307 Scope: refactoring. 2020-10-28 15:26:27 +03:00
f56f231c91 Refactoring: scope 2020-10-19 22:04:07 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
36034bf97a fix warnings 2020-10-12 16:52:31 +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
SuhorukovAnton
9b6ccc19f0 fix-messages: IDE0074 2020-09-29 14:51:34 +03:00
SuhorukovAnton
d866eccade fix-messages: IDE0044 2020-09-28 18:42:03 +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
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
SuhorukovAnton
89daf213c5 encryption: fix 2020-09-08 15:07:59 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
78593b8c1f UserManager: fix 2020-06-17 12:53:12 +03:00
dedd754875
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
2020-06-16 17:44:56 +03:00
09e7a81e9b UserManager: fix 2020-06-15 18:39:52 +03:00
344916b395 TenantManager: fix 2020-06-09 10:54:05 +03:00
87af491e89 Feed: FilesModule 2020-06-04 13:54:13 +03:00
4544469dca TenantManager: add TenantHolder 2020-06-01 13:55:26 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +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
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
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
adab38548a Files: Index Service 2020-04-28 18:11:10 +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
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
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
fbce5f3845 DI: HostedSolution 2020-02-20 11:05:10 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
ff84afb110 Merge branch 'master' into feature/elastic
# Conflicts:
#	web/ASC.Web.Core/SetupInfo.cs
2020-02-05 11:43:03 +03:00
51d8b9758c Files: BoxApp 2020-02-03 13:41:24 +03:00
4bad85defe moved from hotfix/10.5.2 2020-01-17 16:58:26 +03:00
3586867429 EF: DbUserService 2019-11-25 12:49:12 +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
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
8ca3a63e24 DI: refactoring 2019-10-22 19:08:37 +03:00
e82366a2cd DI: dbManager 2019-10-21 15:33:02 +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
bc4af1b2dc DI: TenantManager 2019-10-11 11:57:35 +03:00
f0e7e2e41b DI: notify 2019-10-11 11:31:21 +03:00
85fe70087e DI: CoreConfiguration 2019-10-10 16:18:12 +03:00
75285dfc69 DI: configuration 2019-10-10 13:59:22 +03:00
2ebe431c98 DI: configuration 2019-10-10 11:52:21 +03:00
515f7de555 DI: Configuration 2019-10-09 18:04:46 +03:00
387ce4e9ad DI: configuration 2019-09-27 14:51:09 +03:00
d8fb67f683 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/AuthenticationController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Utility/CommonLinkUtility.cs
2019-09-27 13:45:37 +03:00
1afcd2442c ConfirmAuthHandler: auth by uid 2019-09-27 12:18:48 +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
d5e391b89a Core: Fixed UserExists 2019-09-24 13:54:29 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
00849598f0 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/GroupController.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-23 19:27:36 +03:00
23c00b458b Auth: added additional roles 2019-09-23 18:36:22 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +03:00
8184492a4f DI: ConfigurationManager 2019-09-20 18:08:45 +03:00
f992e1a763 DI: IConfiguration 2019-09-20 17:21:41 +03:00
e7b7cabdd2 DI: TenantManager 2019-09-20 17:04:06 +03:00
7bb42748b7 DI TenantManager 2019-09-20 15:20:03 +03:00
409da28d4b DI: SubscriptionManager 2019-09-19 16:43:28 +03:00
a07cbe30f4 DI: CoreSettings 2019-09-18 18:19:30 +03:00
4489d01b82 DI: PaymentManager, AuthorizationManager 2019-09-18 17:18:44 +03:00
6ab71a7b65 DI: tenantManager 2019-09-18 16:33:01 +03:00
bcdbcf5ccc DI: TenantManager 2019-09-18 11:25:57 +03:00
f34dca4ebb DI: ApiDateTime 2019-09-17 18:38:06 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
a46a092890 DI: TenantManager 2019-09-17 11:07:46 +03:00
de16476542 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2019-09-16 15:35:44 +03:00
86c5e64b20 added AuthByClaim 2019-09-16 12:21:10 +03:00
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
deb8231f26 revert f85711b736 2019-09-12 14:34:58 +03:00
1530ec842e DI: WebImageSupplier,WebItemSettings, SettingsManager 2019-09-11 13:42:52 +03:00
a91ea0ee67 BaseSettings: DI 2019-09-10 17:29:37 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
a26d8d24ce Api: added CustomJsonOptionsWrapper. optimization 2019-09-03 12:31:15 +03:00
12747318c6 Optimization 2019-08-30 15:40:57 +03:00
0bd089938e IDE0059 2019-08-16 12:08:46 +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
3636df7a24 IDE0031 2019-08-15 16:28:29 +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
49b259abff refactoring 2019-08-09 15:28:19 +03:00
f0d2854071 People: fix search by filter 2019-08-08 17:42:29 +03:00
6f8a94dca4 Optimization 2019-08-08 16:35:22 +03:00
f85711b736 Optimization 2019-08-08 12:26:58 +03:00
e9c564fda9 People: method "get by filter" optimized 2019-08-05 16:45:33 +03:00
3036e1cb90 Added ASC.Studio.Notify service 2019-08-01 11:47:15 +03:00
4021ce350c added ASC.VoipService 2019-06-06 17:41:16 +03:00
6474d925ce Core: added development settings.
Fixed CoreConfiguration
2019-05-22 18:41:02 +03:00
df14def1f5 Core: added CustomClaimsPrincipal.
Api: fixed auth. Added EmployeeWrapper
2019-05-22 12:28:34 +03:00
5c0943f2dd Added custom ConfigurationManager instead of system 2019-05-17 18:27:52 +03:00
acb9457253 Partial revert from 60b30ce542
Getting configuration via IServiceProvider
2019-05-17 14:58:09 +03:00
60b30ce542 Replace Singletons with DI.
Added support for working with db.
Added first version of CookieAuthHandler.
Added PeopleController for test auth.
2019-05-17 11:32:23 +03:00
92ed33906c init commit 2019-05-15 17:56:09 +03:00