Commit Graph

1383 Commits

Author SHA1 Message Date
1f3d63be3d optimized socket notification on tag changes 2023-09-04 13:20:32 +03:00
41b0062c23 Merge branch 'develop' into feature/region-audit 2023-08-21 12:51:52 +03:00
f4c7567f47 added LastModified update when setting avatar 2023-08-21 11:45:01 +03:00
e531654c54 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
#	common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
#	common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
#	config/nginx/onlyoffice.conf
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/common/api/files/index.js
#	packages/components/.storybook/preview.js
#	packages/components/package.json
#	packages/editor/src/server/lib/helpers/index.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-08-11 12:47:44 +03:00
650ddfdb12 refactoring 2023-08-11 11:03:43 +03:00
32fc662a85 backend: updated some dll 2023-08-10 19:16:25 +03:00
c2e14efedc audit geolocation 2023-08-10 17:28:35 +03:00
9b74f49359 refactoring 2023-08-10 16:19:48 +03:00
e427f70709 backend: updated some dll 2023-08-08 19:43:14 +03:00
c889ebed66 added api docs 1.1.1
# Conflicts:
#	common/ASC.Core.Common/EF/Context/UrlShortenerFakeDbContext.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
2023-08-04 13:59:06 +03:00
6c1edce8c6 added api docs 1.1.1 2023-08-03 16:50:57 +03:00
06777b395a
Merge pull request #1600 from ONLYOFFICE/feature/api-descriptions
Feature/api descriptions
2023-08-02 08:09:52 -07:00
b2235b90cb Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeFullDto.cs
#	common/ASC.Core.Common/Core/UserInfo.cs
#	common/ASC.Core.Common/EF/FireBaseUser.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.IPSecurity/Models/IPRestriction.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Helpers/DocumentService.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Server/Api/EditorController.cs
#	products/ASC.Files/Server/Api/FilesController.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
#	products/ASC.Files/Server/Api/UploadController.cs
#	products/ASC.Files/Server/Api/VirtualRoomsController.cs
#	products/ASC.People/Server/Api/ContactsController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs
#	web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs
#	web/ASC.Web.Api/Api/Settings/LdapController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/NotificationController.cs
#	web/ASC.Web.Api/Api/Settings/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/SsoController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/VersionController.cs
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs
2023-08-01 17:07:05 +03:00
d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions
# Conflicts:
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/CapabilitiesController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/SmtpSettingsController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
2023-08-01 11:39:57 +03:00
81b8e1a2f8 ASC.Core.Common: SecurityContext: checking loginEventId for 0 2023-08-01 10:36:11 +03:00
028b63213c Merge branch 'develop' into features/migrate-urlShortener
# Conflicts:
#	common/Tools/ASC.Migration.Creator/Program.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.Designer.cs
#	migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.cs
#	migrations/mysql/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.Designer.cs
#	migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.Designer.cs
#	migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.cs
#	migrations/postgre/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs
#	migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2023-07-26 14:30:00 +03:00
7b2ac0bd28 fixed payment/account 2023-07-24 13:32:34 +03:00
a8921b44e0 fix 2023-07-24 11:59:20 +03:00
b4b80db882 fixed license upload 2023-07-22 19:36:09 +03:00
b4502b6fba fix license 2023-07-21 18:41:16 +03:00
545bacfaf0 Merge branch 'develop' into fix-conflicts-merge
# Conflicts:
#	packages/client/src/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Core/Configuration/FilesSettings.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Security/FileShareOptions.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-07-21 16:51:49 +03:00
9b14175dd5 License: fix 2023-07-20 13:32:01 +03:00
57aa77c56f fix build 2023-07-19 14:34:00 +03:00
ab472b0148 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	build/install/docker/Dockerfile.dev
#	build/install/docker/build.dev.yml
#	build/install/docker/docspace.dev.yml
#	build/install/win/DocSpace.aip
#	common/ASC.ActiveDirectory/Base/DbHelper.cs
#	common/ASC.Api.Core/Model/EmployeeDto.cs
#	common/ASC.Core.Common/Billing/ITariffService.cs
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Messaging/MessagesContext.cs
#	common/ASC.Core.Common/Tenants/TenantCookieSettings.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/IQuotaController.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
#	common/Tools/ASC.Migration.Runner/ASC.Migration.Runner.csproj
#	common/Tools/ASC.Migration.Runner/GlobalUsings.cs
#	common/Tools/ASC.Migration.Runner/MigrationRunner.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
#	common/Tools/ASC.Migrations.Core/Models/ConfigurationInfo.cs
#	common/Tools/ASC.Migrations.Core/Utils/DbContextActivator.cs
#	common/services/ASC.ClearEvents/Services/ClearEventsService.cs
#	common/services/ASC.ElasticSearch/Core/SearchSettings.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	config/nginx/onlyoffice.conf
#	migrations/mysql/ASC.Migrations.MySql.csproj
#	migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.Designer.cs
#	migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.cs
#	migrations/mysql/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs
#	migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.Designer.cs
#	migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.cs
#	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/CustomDbContext/20221019144350_CustomDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/CustomDbContext/20221019144350_CustomDbContextMigrate.cs
#	migrations/mysql/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.cs
#	migrations/mysql/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs
#	migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.Designer.cs
#	migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.cs
#	migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.cs
#	migrations/mysql/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.Designer.cs
#	migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.cs
#	migrations/mysql/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs
#	migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.Designer.cs
#	migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.cs
#	migrations/mysql/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs
#	migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.Designer.cs
#	migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.cs
#	migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.cs
#	migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs
#	migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs
#	migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.Designer.cs
#	migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.cs
#	migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.cs
#	migrations/mysql/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.cs
#	migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.cs
#	migrations/mysql/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs
#	migrations/mysql/SaaS/UserDbContext/UserDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.cs
#	migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.cs
#	migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs
#	migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs
#	migrations/postgre/ASC.Migrations.PostgreSql.csproj
#	migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.Designer.cs
#	migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.cs
#	migrations/postgre/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs
#	migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.Designer.cs
#	migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.cs
#	migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.cs
#	migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.cs
#	migrations/postgre/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs
#	migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.Designer.cs
#	migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.cs
#	migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.cs
#	migrations/postgre/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.Designer.cs
#	migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.cs
#	migrations/postgre/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs
#	migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.Designer.cs
#	migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.cs
#	migrations/postgre/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs
#	migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.Designer.cs
#	migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.cs
#	migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.cs
#	migrations/postgre/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.cs
#	migrations/postgre/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.cs
#	migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs
#	migrations/postgre/SaaS/UserDbContext/UserDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.cs
#	migrations/postgre/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.cs
#	migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	packages/client/src/Shell.jsx
#	packages/client/src/components/Article/Body/Items.js
#	packages/client/src/components/Article/Body/index.js
#	packages/client/src/components/EmptyContainer/RoomNoAccessContainer.js
#	packages/client/src/components/EmptyContainer/RootFolderContainer.js
#	packages/client/src/components/panels/InvitePanel/index.js
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/components/panels/InvitePanel/sub-components/Item.js
#	packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js
#	packages/client/src/components/panels/SelectFileDialog/AsideView.js
#	packages/client/src/components/panels/SelectFileDialog/index.js
#	packages/client/src/components/panels/SelectFolderDialog/index.js
#	packages/client/src/components/panels/SelectionPanel/ExceptionFoldersConstants.js
#	packages/client/src/components/panels/SelectionPanel/SelectionPanelBody.js
#	packages/client/src/components/panels/SelectionPanel/StyledSelectionPanel.js
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/pages/AccountsHome/index.js
#	packages/client/src/pages/Confirm/index.js
#	packages/client/src/pages/Confirm/sub-components/removePortal.js
#	packages/client/src/pages/Errors/520/index.js
#	packages/client/src/pages/Files.jsx
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableContainer.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/Section/SettingsBody/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/sub-components/common-tooltips.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/FieldMapping.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/IdpSettings.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/ProviderMetadata.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
#	packages/client/src/pages/PortalSettings/categories/payments/index.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/sessionLifetime.js
#	packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/interface-theme/index.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
#	packages/client/src/pages/VersionHistory/Section/Body/StyledVersionHistory.js
#	packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js
#	packages/client/src/pages/Wizard/index.js
#	packages/client/src/store/AccountsContextOptionsStore.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/FilesStore.js
#	packages/common/components/Article/index.js
#	packages/common/components/Article/sub-components/article-alerts.js
#	packages/common/components/Article/sub-components/article-header.js
#	packages/common/components/FilterInput/sub-components/FilterBlock.js
#	packages/common/components/Loaders/index.js
#	packages/common/components/MediaViewer/sub-components/ImageViewer/ImageViewer.props.ts
#	packages/common/components/MediaViewer/sub-components/ImageViewer/index.tsx
#	packages/common/components/PrivateRoute/index.js
#	packages/common/store/SettingsStore.js
#	packages/common/store/UserStore.js
#	packages/common/utils/index.ts
#	packages/components/file-input/index.js
#	packages/components/selector/StyledSelector.js
#	packages/components/selector/index.tsx
#	packages/components/selector/sub-components/Body/index.tsx
#	packages/components/slider/styled-slider.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Service/Cleanup/Worker.cs
#	products/ASC.People/Server/Api/UserController.cs
#	public/scripts/api.js
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PaymentsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/LicenseController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/TfaappController.cs
#	web/ASC.Web.Api/Api/SmtpSettingsController.cs
#	web/ASC.Web.Api/Core/SmtpOperation.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	yarn.lock
2023-07-18 19:26:32 +03:00
615df7a72c Radicale: check radicale available 2023-07-15 12:03:59 +03:00
3f27bb6ce5 Merge branch 'develop' into feature/public-room-backend 2023-07-12 14:37:37 +03:00
040377198f People: filter by employeeTypes 2023-07-12 13:10:47 +03:00
91fc1f0c04 ASC.Core.Common: DbUserService: fixed ObjectDisposedException 2023-07-07 12:56:09 +03:00
506544ea7c Merge branch 'release/v1.1.0' into feature/tenantcookie 2023-07-04 13:12:09 +04:00
220a21fe4f fixed quota 2023-07-03 20:07:00 +03:00
cfe7c589f6 fixed quota 2023-07-03 19:39:35 +03:00
3889e95c63 TenantCookieSettings: check enabled 2023-07-03 12:53:51 +03:00
0ff6e98473 TenantCookieSettings: lifetime is now 1440 by default. added "default" property 2023-06-30 19:07:18 +03:00
1d3534ab46 fixed query 2023-06-30 14:57:19 +03:00
2b1295455c fix 2023-06-30 14:35:08 +03:00
20300337f3 fix query 2023-06-30 12:41:20 +03:00
23889afe39 fix 2023-06-28 18:07:50 +03:00
bce52a2549 fixed query 2023-06-28 13:52:14 +03:00
bfb9a096e6 Merge branch 'develop' into feature/optimization-queries
# Conflicts:
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Billing/TariffService.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.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/ASC.Webhooks.Core/DbWorker.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
2023-06-27 18:29:23 +03:00
706394ee7f fix 63006 2023-06-22 18:19:15 +03:00
1bcdcd4f46 migrations for standalone 2023-06-21 21:11:18 +03:00
09ffbbba7e create migration context 2023-06-21 15:40:55 +03:00
28055fc876 Merge branch 'release/v1.1.0' into feature/files-filter-optimization 2023-06-21 10:54:57 +03:00
fc311ef24f fix 62906, 62999 2023-06-20 17:12:10 +03:00
221c28b532 Merge branch 'release/v1.1.0' into feature/files-filter-optimization 2023-06-19 14:39:05 +03:00
a1235de616 nlog: DebugRemoteIpAddress => TraceRemoteIpAddress 2023-06-15 18:49:45 +03:00
10a63e5908 telegram: removed deprecated dll 2023-06-15 16:57:16 +03:00
6e07ad70f4 refactoring 2023-06-14 11:47:11 +03:00
0198f88c64 EF: added substring db function, refactoring 2023-06-14 11:45:40 +03:00
a3bcd0a099 fixed 62906 2023-06-13 00:39:02 +03:00