pavelbannov 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
..
public	Merge branch 'develop' into feature/deep-link	2023-07-25 12:54:36 +03:00
scripts	Web: fix build	2023-02-06 19:15:04 +03:00
src	Merge branch 'hotfix/v1.1.2' into develop	2023-08-28 18:53:10 +03:00
tests
webpack	Web: Fixed the path to the CSS file	2023-08-04 15:25:28 +05:00
.babelrc	Web: Login: fixed styled-components warnings	2022-08-30 00:01:46 +03:00
.gitattributes
.gitignore	Web:Login: add autoGeneratedTranslations.ts to gitignore file	2023-02-03 19:08:46 +03:00
codecept.conf.js
Dockerfile
index.d.ts	Fix Bug 62511: Uninformative error when session time expires	2023-05-16 15:53:40 +03:00
jsconfig.json
package.json	Merge branch 'hotfix/v1.1.2' into develop	2023-08-01 17:56:22 +03:00
steps_file.js
steps.d.ts
tsconfig.json	Web: Fix react types warnings	2022-09-02 17:15:05 +03:00