|
bc6b0d9e0d
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/Billing/ITariffService.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/EmailSenderSink.cs
# common/ASC.Core.Common/Notify/JabberSenderSink.cs
# common/ASC.Core.Common/Notify/PushSenderSink.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
# migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Files.jsx
# packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/security/index.js
# packages/client/src/pages/Profile/Section/Header/index.js
# packages/common/store/SettingsStore.js
# packages/components/drop-down/index.js
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SecurityController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/TagsController.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/FeedController.cs
# web/ASC.Web.Api/Api/PaymentsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Core/DnsSettings.cs
# web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
# yarn.lock
|
2023-08-28 18:53:10 +03:00 |
|
|
a5721ed885
|
fix Bug 63765
|
2023-08-24 17:05:05 +03:00 |
|
|
a3800de721
|
TenantDbContext -async part1
|
2023-03-20 19:16:00 +03:00 |
|
|
deb0c5beb7
|
remove .wait and .result
|
2022-10-27 13:49:42 +03:00 |
|
|
e524ca03d1
|
Notify: removed scope class
|
2022-04-01 17:17:24 +03:00 |
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
3d50d7977b
|
removed past license headers
|
2022-03-15 19:59:24 +03:00 |
|
|
809359c85b
|
Core: used file-scoped namespaces
|
2022-02-15 14:52:43 +03:00 |
|
|
481581e424
|
Core: private properties replaced by private fields, add braces
|
2022-02-15 00:02:57 +03:00 |
|
|
9bccfa3ade
|
refactoring: add globalUsing: core.common
|
2022-01-26 13:43:08 +03:00 |
|
|
f6d78d3cba
|
Code Cleanup
|
2019-08-15 15:04:42 +03:00 |
|
|
f85711b736
|
Optimization
|
2019-08-08 12:26:58 +03:00 |
|