|
|
ba345c0f06
|
fix merge
|
2023-06-09 14:04:55 +03:00 |
|
|
|
986561d4e9
|
Merge branch 'develop' into feature/delete-portal
# Conflicts:
# 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/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbAzService.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# common/ASC.Feed/Data/FeedAggregateDataProvider.cs
# common/ASC.Feed/Data/FeedReadedDataProvider.cs
# common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
# common/services/ASC.ApiSystem/Controllers/PeopleController.cs
# migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/ConnectionsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/LicenseController.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2023-06-08 15:53:31 +03:00 |
|
|
|
fd45e59e51
|
transfer commit from cs (2e8788596a826d5bb2c015ae9f4314e8385188c6)
|
2023-05-15 20:49:23 +03:00 |
|
|
|
1aa1a3db94
|
dbip: refactoring
|
2023-05-06 20:22:36 +03:00 |
|
|
|
9c9df73b96
|
backend: dbip_location rename to dbip_lookup. refactoring.
|
2023-05-06 14:48:36 +03:00 |
|
|
|
1f92c079e5
|
ExcludeFromMigrations
|
2023-04-26 15:23:46 +03:00 |
|
|
|
ca9662e45b
|
fix
|
2023-04-25 13:19:48 +03:00 |
|
|
|
7ccd0ed5e6
|
ignore when migration repeated models
|
2023-04-25 12:27:07 +03:00 |
|
|
|
146fc43d8a
|
add "AddDbTenant" and foreignkeys
|
2023-04-25 00:27:54 +03:00 |
|
|
|
4a1e1a88e7
|
add dbTenant in models and rename "tenant" to "tenantid"
|
2023-04-25 00:17:29 +03:00 |
|
|
|
aafc6ae03e
|
fix Bug 62113
|
2023-04-17 23:10:10 +03:00 |
|
|
|
37b28738ae
|
Quota: fix
|
2023-04-05 19:05:46 +03:00 |
|
|
|
ba4059e8b0
|
fix quota
|
2023-03-24 15:07:08 +03:00 |
|
|
|
b96030c0b2
|
Quota: fix
|
2023-03-20 15:39:35 +03:00 |
|
|
|
5de3a26365
|
Quota: contentsearch
|
2023-03-16 12:24:56 +03:00 |
|
Vashchuk Nikita
|
5860c24c84
|
enable RoomsActivity subscription for all new users
|
2023-03-08 21:01:44 +05:00 |
|
|
|
5e76441b64
|
fix
|
2023-02-07 19:12:09 +03:00 |
|
|
|
f52f32a6af
|
Merge branch 'develop' into feature/asc.apicache
# Conflicts:
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/Tools/ASC.Migration.Creator/Program.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
|
2023-02-07 17:07:20 +03:00 |
|
|
|
442e57c092
|
fix
|
2023-02-01 14:24:30 +03:00 |
|
|
|
c51e7a189b
|
fix 60214
|
2023-01-20 20:12:45 +03:00 |
|
|
|
4ddf7d521c
|
update external dependency
|
2023-01-19 19:05:07 +03:00 |
|
|
|
8ad635ba25
|
merge from release/rc-v1.2.0. fixed problem and update dll
|
2023-01-19 15:47:09 +03:00 |
|
|
|
0090561fb6
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2023-01-10 14:47:27 +03:00 |
|
|
|
e6c1991c39
|
fix Bug 60187
|
2022-12-25 19:44:37 +03:00 |
|
|
|
aa447f3384
|
fix key
|
2022-12-23 13:27:49 +03:00 |
|
|
|
62cec7b7c5
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-22 14:17:24 +03:00 |
|
|
|
d0fe06052e
|
Db: optimization
|
2022-12-21 15:57:32 +03:00 |
|
|
|
d31e341ff9
|
add async and AddBaseDbContext with settings
|
2022-12-20 10:27:55 +03:00 |
|
|
|
d1c436ea11
|
add migration to Teamlabsite
|
2022-12-19 18:01:57 +03:00 |
|
|
|
db951d00e6
|
asc.apicache
|
2022-12-16 15:41:09 +03:00 |
|
|
|
b9f45035b9
|
Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
# common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
|
2022-11-29 13:07:12 +03:00 |
|
|
|
0d65c0dccf
|
revert
|
2022-11-23 18:54:59 +03:00 |
|
|
|
284c329f70
|
Core: autodetect mysql version
|
2022-11-23 18:45:33 +03:00 |
|
|
|
2b9446dc26
|
fix startup
|
2022-11-23 12:17:08 +03:00 |
|
|
|
d7c1787442
|
dbContext from regions
|
2022-11-13 00:44:57 +03:00 |
|
|
|
c3c19aba39
|
fix migration
|
2022-11-07 13:43:49 +03:00 |
|
|
|
0a955950e6
|
fix
|
2022-10-19 17:11:52 +03:00 |
|
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
|
a2afba0a28
|
Quota: fix
|
2022-10-18 18:13:35 +03:00 |
|
|
|
65a066b61e
|
fix merge
|
2022-10-17 16:21:09 +03:00 |
|
|
|
ed22136269
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-17 14:31:57 +03:00 |
|
|
|
dc2cfbc614
|
Merge branch 'develop' into feature/apisystem
# Conflicts:
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2022-10-11 13:53:31 +03:00 |
|
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
|
143cc76066
|
fix
|
2022-10-06 12:01:43 +03:00 |
|
|
|
89390657cf
|
fix
|
2022-10-06 11:43:16 +03:00 |
|
|
|
400fc49bb6
|
api system
-fix api system
-TenantName from resources
|
2022-10-05 14:23:53 +03:00 |
|
|
|
9f9a4c3815
|
Payments: id from billing
|
2022-10-04 15:58:59 +03:00 |
|
|
|
00bd41ad0a
|
Merge branch 'develop' into feature/user-quota
|
2022-09-23 17:15:49 +03:00 |
|
