|
|
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 |
|
|
|
9292ba4eee
|
analizators/s2589
|
2022-01-24 12:28:00 +03:00 |
|
|
|
143f0a5dda
|
Analizators/s1854
|
2022-01-21 16:22:56 +03:00 |
|
|
|
fb65d3a09d
|
analizators/1481
|
2022-01-21 16:15:15 +03:00 |
|
|
|
2029c34f9c
|
analizators/s1121
|
2022-01-21 14:02:17 +03:00 |
|
|
|
bf3b0395a5
|
analizators/s1116
|
2022-01-21 11:04:08 +03:00 |
|
|
|
20b60958a8
|
analizators/U2U1022
|
2022-01-19 13:24:11 +03:00 |
|
|
|
fbb50e676e
|
analizators/U2U1202
|
2022-01-19 12:51:30 +03:00 |
|
|
|
6c5792583a
|
analizators/U2U1209
|
2022-01-18 17:43:46 +03:00 |
|
|
|
f1f7a82b39
|
analizators/U2U1208
|
2022-01-18 17:00:48 +03:00 |
|
|
|
84638feaf0
|
analizators/U2U1202
|
2022-01-18 16:54:24 +03:00 |
|
|
|
66cf28ba29
|
analizators/U2U1100
|
2022-01-12 18:42:03 +03:00 |
|
|
|
8f53895e3d
|
analizators/s2201
|
2021-12-30 14:03:05 +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 |
|
|
|
70bfe70563
|
Merge branch 'develop' into feature/optimization
|
2021-12-16 18:14:54 +03:00 |
|
|
|
fb3bfba1bd
|
Files: optimization
|
2021-12-16 15:49:35 +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 |
|
|
|
49c820b779
|
Merge branch 'develop' into feature/reworked-user-service
|
2021-11-02 13:07:07 +03:00 |
|
|
|
dd8f77f827
|
Merge branch 'develop' into feature/wizard/migration
|
2021-10-22 11:44:21 +03:00 |
|
|
|
2bd3a5764d
|
add method GetUserGroupRef, change return type
|
2021-09-28 20:26:16 +03:00 |
|
|
|
ea4fa97838
|
Merge branch 'develop' into feature/wizard/migration
# Conflicts:
# ASC.Tests.sln
# common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
# common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
# common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
|
2021-09-15 15:52:13 +03:00 |
|
|
|
ec66a65d38
|
User: fix request
|
2021-09-10 17:00:26 +03:00 |
|
|
|
2addb81adf
|
Quota: Price2 removed
|
2021-08-30 18:19:20 +03:00 |
|
|
|
91fd7615b3
|
Optimization
|
2021-08-20 10:52:52 +03:00 |
|
diana-vahomskaya
|
945739fe44
|
fix test ASC.Web.Api.Tests
|
2021-08-16 15:20:41 +03:00 |
|
|
|
90bb8a139a
|
UserManager: fix for personal
|
2021-08-06 17:30:51 +03:00 |
|
diana-vahomskaya
|
bcfddd88d7
|
fix context
|
2021-08-02 17:49:36 +03:00 |
|
|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +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 |
|
|
|
db7e2b8700
|
People: fixed query
|
2021-05-18 16:16:17 +03:00 |
|
|
|
a5c6ba5dcc
|
Common, db: moved from 08a01422
|
2021-05-17 14:35:00 +03:00 |
|
|
|
50d01a646d
|
Core: fixed creating group
|
2021-04-06 21:04:15 +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 |
|
|
|
76d7ed6c73
|
Merge branch 'master' into develop
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
|
2020-12-23 21:42:44 +03:00 |
|
|
|
d4b736103a
|
Users: fixed queries
|
2020-12-23 13:12:07 +03:00 |
|
|
|
b0dd9c1400
|
Files: optimization
|
2020-12-15 13:29:53 +03:00 |
|
|
|
c764812d3a
|
Common: refactoring
|
2020-12-04 16:48:54 +03:00 |
|
|
|
b487adb9fc
|
Refactoting & optimization
|
2020-11-24 13:15:11 +03:00 |
|
|
|
367c93fd91
|
Refactoring: scope
|
2020-10-22 20:57:18 +03:00 |
|
|
|
2143f376a3
|
Scope: refactoring
|
2020-10-21 16:39:06 +03:00 |
|
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
|
3a29e9970f
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Server/Startup.cs
|
2020-10-18 22:52:24 +03:00 |
|
|
|
af1bf4a56e
|
Refactoring: lazy
|
2020-10-18 22:00:38 +03:00 |
|
|
|
a4eb45f1ab
|
Scope: refactoring
|
2020-10-18 19:03:14 +03:00 |
|
|
|
d41b12cdc8
|
DbTenant: fix
|
2020-10-14 12:59:37 +03:00 |
|
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +03:00 |
|
|
|
c08abfc396
|
User: fix SetUserPasswordHash
|
2020-09-30 15:54:36 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
|
|
bfd450e602
|
DbUserService: fix
|
2020-09-30 14:20:54 +03:00 |
|
|
|
8094848d05
|
Settings: fix
|
2020-09-24 12:45:02 +03:00 |
|
|
|
dd80e300d0
|
Common, Core.Common moved from release/11 4414f77b
|
2020-09-15 16:11:05 +03:00 |
|
|
|
f00a964c32
|
Merge branch 'master' into feature/private
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-08-14 17:19:36 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
|
98b69d6492
|
Fix Incorrect datetime value: '0001-01-01 00:00:00' for column 'last_modified' at row 1
|
2020-08-10 20:17:00 +03:00 |
|
|
|
72ae1f5e9b
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Common/src/api/settings/index.js
|
2020-07-31 16:49:54 +03:00 |
|
|
|
f9dc19526c
|
Added sendjoininvite, sendadmmail
|
2020-07-24 17:01:20 +03:00 |
|
Artem Tarasov
|
713b66abd4
|
Merge branch 'master' into feature/Wizard
|
2020-07-23 11:05:57 +03:00 |
|
|
|
a7ef187616
|
Settings: fix
|
2020-07-22 14:05:27 +03:00 |
|
Artem Tarasov
|
1a8aacebdc
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Resource.Manager/Startup.cs
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-21 13:13:47 +03:00 |
|
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
|
7f095f03d1
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
|
2020-07-15 15:23:28 +03:00 |
|
|
|
4e5c187851
|
EF: DateTime? hack
|
2020-07-15 11:38:00 +03:00 |
|
|
|
a347f4e4f3
|
fix
|
2020-07-13 16:18:31 +03:00 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +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 |
|
|
|
91d287a2d5
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
|
2020-05-14 17:14:59 +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 |
|
|
|
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 |
|
|
|
7183be383f
|
Core: fixed removing group
|
2020-02-06 18:35:24 +03:00 |
|
|
|
201bd72624
|
EF: Added ignore case for search users by filter text
|
2020-02-05 16:59:04 +03:00 |
|
|
|
8c2b39406f
|
Merge branch 'master' into feature/merge
|
2020-02-03 14:29:41 +03:00 |
|
|
|
709343fc17
|
fixed removing from group
|
2020-02-03 14:27:13 +03:00 |
|
|
|
acde301b26
|
Merge branch 'master' into feature/merge
|
2020-01-31 10:59:00 +03:00 |
|
|
|
d2bf5ece2b
|
EF: fixed GetUserGroupRefs
|
2020-01-21 13:52:04 +03:00 |
|
|
|
011972be6f
|
fixed method set people admin
|
2020-01-21 12:03:25 +03:00 |
|
|
|
84062bc0c4
|
EF: fixed argumentNullException
|
2020-01-20 18:09:52 +03:00 |
|
|
|
4bad85defe
|
moved from hotfix/10.5.2
|
2020-01-17 16:58:26 +03:00 |
|
|
|
e4c1de4494
|
Core: Common: Fix "Sequence contains more than one matching element" on get TenantQuota
|
2019-12-26 10:13:09 +03:00 |
|
|
|
f0434a6546
|
People: fixed search by text
|
2019-12-25 18:28:19 +03:00 |
|
|
|
a8f8b63414
|
EF: removed old classes
|
2019-12-23 17:57:21 +03:00 |
|
|
|
04be312da4
|
EF: tenants. Use entity
|
2019-12-23 17:26:38 +03:00 |
|
NikolayRechkin
|
8122eaffdb
|
EF: added check for null
|
2019-12-19 17:06:18 +03:00 |
|
|
|
f696558445
|
EF: AddOrUpdate
|
2019-12-17 16:01:59 +03:00 |
|
|
|
b2002a08db
|
EF: MultiRegionHostedSolution
|
2019-12-17 11:27:38 +03:00 |
|
|
|
a47196dc05
|
EF: Voip
|
2019-12-11 17:30:28 +03:00 |
|
|
|
a4cfdb173c
|
EF: fix
|
2019-12-10 18:31:37 +03:00 |
|
|
|
8ad3b1ca1d
|
"DeleteOldEvents" temporary removed
|
2019-12-06 13:32:10 +03:00 |
|
|
|
74cb7e9582
|
EF: MessagingSystem
|
2019-12-05 11:51:28 +03:00 |
|
|
|
d081c18c76
|
EF: settings
|
2019-12-04 12:04:32 +03:00 |
|
