Commit Graph

920 Commits

Author SHA1 Message Date
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
712db4d4ee edited Api -> API 2023-08-25 12:57:31 +03:00
4b4b4f747f added translations 2023-08-25 11:52:45 +03:00
Mushka Nikita
fe88c657de merge develop + merge bugfix 2023-08-22 03:25:02 +03:00
Viktor Fomin
1d2479aec8 Merge branch 'develop' into feature/sso-mobile-layout 2023-08-21 22:08:23 +03:00
f4c9338c07 Fix bug 63646 - Added a message when reaching the limit of paid users by invitation link. 2023-08-21 13:30:49 +03:00
Viktor Fomin
162d829aea Client: add translations 2023-08-21 11:57:34 +03:00
c178c2d680 Merge branch 'develop' into feature/leave-room
# Conflicts:
#	packages/client/public/locales/en/Files.json
2023-08-18 14:35:38 +03:00
Akmal Isomadinov
69bccbabe4 Web: Fixed translation 2023-08-17 14:56:02 +05:00
Akmal Isomadinov
9065500cfc Web:Component:Cron Added translation 2023-08-16 18:11:13 +05:00
Viktor Fomin
77ef522ba9 Client: add translations 2023-08-16 14:41:52 +03:00
76c8fe6d52 Web: Files: Public-room: added tooltips to action buttons 2023-08-15 14:46:12 +03:00
9491ccd8b9 Web: Files: added new translations 2023-08-15 14:03:04 +03:00
6d1932b6d1 Web: Files: Public-room: added new translation 2023-08-14 10:26:02 +03:00
493c16f5af Merge branch 'develop' into feature/leave-room 2023-08-11 15:21:18 +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
e65cf29ec3 Web: Client: PortalSettings: Added Beta badge 2023-08-09 11:37:45 +03:00
gazizova-vlada
c4608a010d Web:Client:Add translation, fix fromUserIds to fromUserId. 2023-08-08 14:52:53 +03:00
bddbcd02c4 Merge branch 'hotfix/v1.1.2' into feature/csp
# Conflicts:
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-08-08 14:13:52 +03:00
969026eb00 Web: Fix MoveToPublicRoom key 2023-08-08 15:11:49 +04:00
gazizova-vlada
9d4db20180 Merge branch 'develop' into feature/reassign-data 2023-08-08 11:39:24 +03:00
gazizova-vlada
34553e8c7d Web:Client:Add translation. 2023-08-08 11:20:24 +03:00
1c5088c6eb Merge branch 'develop' into feature/leave-room 2023-08-07 18:02:49 +04:00
gazizova-vlada
c3b28ab524 Web:Client:Delete translations for users. 2023-08-07 15:07:10 +03:00
f8c74d12bd added translations 2023-08-03 18:27:59 +03:00
Mushka Nikita
30066705c5 Merge branch 'develop' into feature/document-service-location 2023-07-27 15:36:17 +03:00
a46a82180c Web: Renamed translation 2023-07-26 18:56:07 +04:00
a67f301608 Web: Files: fixed translations 2023-07-25 19:04:28 +03:00
7d727e0842 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/components/panels/UploadPanel/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/FilesStore.js
2023-07-25 13:01:21 +03:00
b90bfda75c Merge branch 'develop' into feature/leave-room
# Conflicts:
#	packages/client/src/store/FilesStore.js
2023-07-25 12:37:24 +03:00
Mushka Nikita
a7dab5df0b Merge branch 'develop' into feature/document-service-location 2023-07-25 12:11:39 +03:00
a2ddfb54f1 Web: Files: added LINKS_LIMIT_COUNT, fixed bugs 2023-07-19 16:43:21 +03:00
17be338ccf Web: Files: fixed empty links context-menu 2023-07-19 15:24:05 +03:00
e15b111e36 Web: Files: fixed LinkDeletedSuccessfully translation 2023-07-19 13:11:07 +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
76a9126d4e Web: Files: Public-room: added "Limit by time period" block 2023-07-18 15:21:19 +03:00
9c7a3157c3 Web: Files: Leave-room: fixed translations, fixed bugs 2023-07-18 12:53:03 +03:00
gazizova-vlada
898b98e0fc Web:Client:Add translations. 2023-07-17 21:18:42 +03:00
96b249eef4 Web: Files: added leave-room api 2023-07-17 18:17:05 +03:00
bcaa84d175 Web: Files: added restore public-room translation 2023-07-13 13:09:11 +03:00
dc59259fd0 Revert "added translations"
This reverts commit 47314b61c5, reversing
changes made to e22a56e032.

# Conflicts:
#	build/install/OneClickInstall/install-Docker.sh
#	build/install/win/DocSpace.aip
#	packages/client/public/locales/bg/Settings.json
#	packages/client/public/locales/cs/Settings.json
#	packages/client/public/locales/ja-JP/Settings.json
#	packages/client/public/locales/lv/Settings.json
#	packages/client/public/locales/uk-UA/Settings.json
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
2023-07-13 13:02:08 +03:00
1bccd63c81 Web: Client: PortalSettings: Added base CSP UI and api actions 2023-07-13 11:11:05 +03:00
gazizova-vlada
7609ae4258 Web:Client:Delete DeleteUsersDialog translates, delete "DeleteUserMessage". 2023-07-12 21:39:03 +03:00
gazizova-vlada
ba8aa844b1 Web:Client:Merged the delete dialog for one user and multiple users into one dialog. 2023-07-12 18:15:31 +03:00
d2fc13109c Merge branch 'develop' into feature/leave-room
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
2023-07-12 13:18:38 +03:00
gazizova-vlada
6e9e3e07f8 Web:Changed content, translations. 2023-07-11 23:05:25 +03:00
9eab04b96a added translations 2023-07-11 19:14:08 +03:00
gazizova-vlada
514f188fe9 Web:Client:Change translate for ChangeUserStatusDialog. 2023-07-11 18:32:48 +03:00
47314b61c5 added translations 2023-07-11 18:32:19 +03:00
812010a8af added translations 2023-07-11 18:22:23 +03:00
9973f89e8b Web: Client: PortalSettings: Added "Api information" page 2023-07-11 14:53:52 +03:00
10ddb99d11 Web: Client: PortalSettings: Added "Integration request" block 2023-07-10 23:58:58 +03:00
29dfa9b79f Update Settings.json 2023-07-10 21:07:37 +04:00
075235c4f5 Update Settings.json 2023-07-10 21:03:46 +04:00
f0d1521817 Web: Fix translations 2023-07-10 21:02:45 +04:00
Elyor Djalilov
35f778e103 Web: Client: PortalSettings: removed incorrect translates 2023-07-10 19:22:21 +05:00
Elyor Djalilov
51c3eb4ce3 Web: Client: PortalSettings: replaced tag strong to index in locales 2023-07-10 18:06:11 +05:00
Elyor Djalilov
a206e52d12 Web: Client: PortalSettings: fix different formatting 2023-07-10 14:54:54 +05:00
5fb08b11e8 Web: Files: Public-room: added expiration date 2023-07-10 10:48:17 +03:00
fe2978d87e Merge branch 'release/v1.1.0' into feature/tooltip-descriptions 2023-07-07 18:44:36 +04:00
57a9eee283 added translations 2023-07-07 16:36:50 +03:00
gazizova-vlada
b144bf3554 Web:Add DataReassignmentDialog in locales. 2023-07-07 15:05:28 +03:00
bf718fc5d7 Web: Client: Locales: Added new keys for JavascriptSdk 2023-07-07 12:37:02 +03:00
6961d14394 Web: Files: Public-room: added archive view 2023-07-07 12:29:14 +03:00
2e14572fc0 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/components/panels/OperationsPanel/index.js
#	packages/client/src/components/panels/SelectFolderDialog/index.js
#	packages/client/src/components/panels/SelectionPanel/FilesListWrapper.js
#	public/images/clock.react.svg
2023-07-07 10:35:33 +03:00
Mushka Nikita
1ef7981216 added translations to document service location page 2023-07-06 16:31:25 +03:00
Elyor Djalilov
fb3ad7eabe Web: Client: PortalSettings: fix tfa tooltip description 2023-07-05 22:52:43 +05:00
31cd81ff7b Merge branch 'release/v1.1.0' into feature/tooltip-descriptions 2023-07-05 19:12:36 +04:00
Elyor Djalilov
452fb75686 Web: Client: PortalSettings: changed tooltip descriptions 2023-07-05 14:55:17 +05:00
c078d756ce Web: Client: Locales: Added new keys for JavascriptSdk 2023-07-04 18:05:20 +03:00
ede27c1562 Web: Files: EditRoom: added room owner change 2023-06-30 13:17:31 +03:00
23db82e046 Web: Files: Added LeaveRoomDialog and ChangeRoomOwnerPanel 2023-06-29 17:00:41 +03:00
cc52b92fe5 web: Removed TM from translations 2023-06-16 15:33:34 +04:00
ecd4c266f0 Web: Translations: fix EnDublicatesByContentTest (key: DNSSettingsTooltip) 2023-06-16 15:03:27 +04:00
e8b785471d Web: Translations: fix EnDublicatesByContentTest (key: TopBottonsEnterpriseExpired ) 2023-06-16 14:23:12 +04:00
1a6a76734d Web: Translations: fix UselessTranslationKeysTest issues 2023-06-16 14:04:45 +04:00
1f5c233814 Web: Translations: fix FullEnDublicatesTest issues 2023-06-16 13:46:58 +04:00
Timofey Boyko
52c4d83b5f Web:Client: add new translation key for new move to dialog 2023-06-16 11:56:53 +03:00
b85c3dcceb Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-15 18:18:18 +03:00
286dfc3138 added translations 2023-06-15 18:17:31 +03:00
f1092f4987 Web: Files: added DocumentEdited translation 2023-06-15 13:36:50 +03:00
4f565547e5 edited Settings:WhiteLabel 2023-06-14 16:17:14 +03:00
Mushka Nikita
0943f64c6a Merge branch 'develop' into feature/submit-to-form-gallery 2023-06-13 13:43:30 +03:00
20bf5fa8d5 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/store/index.js
2023-06-09 11:59:10 +03:00
fef76e032f added translations 2023-06-08 18:24:46 +03:00
f846b79cd4 edited translations 2023-06-07 18:24:49 +03:00
8bb2945f09 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-06-07 17:41:25 +03:00
65d2343c65 added translations 2023-06-07 17:40:23 +03:00
cf1a641f98 Web: Added translations. 2023-06-07 16:20:10 +03:00
698314b1c7 Web: Moved common translation to a separate key. 2023-06-07 15:50:16 +03:00
7359f6a7ca Web: Added changes for standalone dns. 2023-06-07 11:36:54 +03:00
4a822684c0 Web: Files: fixed styles 2023-06-06 13:38:29 +03:00
Mushka Nikita
0420965a87 added translations 2023-06-06 03:33:35 +03:00
13eb9ea37a Web: Files: added new translations 2023-06-05 13:44:55 +03:00
Vladimir Khvan
7619fe03e8 Merge branch 'develop' into feature/webhooks-page 2023-05-31 16:05:47 +05:00
73544422ee Web: Files: added MoveToPublicRoom dialog 2023-05-31 13:05:26 +03:00
Vladimir Khvan
ae8020c896 existing translations were removed 2023-05-31 14:51:15 +05:00
3b74cf457a Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/common/api/files/index.js
#	packages/common/store/AuthStore.js
2023-05-30 12:43:31 +03:00
02f40f8e30 Web: Files: added new translations 2023-05-29 16:00:45 +03:00
19e8b2210a Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
e3457ecb33 Web: Files: fixed public-room tag 2023-05-24 11:17:21 +03:00
94388c0616 Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-23 17:00:12 +03:00
e5a0170c22 Web: Files: added RoomSharingDialog 2023-05-22 13:17:11 +03:00
1298d55bf4 Web: Added translation. 2023-05-19 17:06:29 +03:00
75c7c28bc0 Web: Added Bonus page. 2023-05-19 17:04:29 +03:00
571f272cfb Web: Files: fixed LinkDoesNotExist translation 2023-05-19 11:27:36 +03:00
1b466d5b38 Web: Files: added error pages for public-room 2023-05-18 12:05:16 +03:00
Vladimir Khvan
073b01d2cf translations were added 2023-05-18 12:59:48 +05:00
ea3416b76d Web: Fixed translation. 2023-05-17 19:01:15 +03:00
23a02f55e5 Web: Changed translations. 2023-05-17 18:11:22 +03:00
d102bf6dd8 Web: Moved translation to common. 2023-05-17 18:08:38 +03:00
4b36897568 Web: Deleted useless translations. 2023-05-17 17:14:33 +03:00
597c2871e5 Web: Fixed translations. 2023-05-17 17:06:36 +03:00
09e75be621 Web: Translations: Removed useless keys from CP and applied auto-fixes 2023-05-17 15:51:44 +04:00
Viktor Fomin
17ab61ad7d Client: add translations 2023-05-17 13:07:39 +03:00
4401a35a1f Merge branch 'feature/standalone' of https://github.com/ONLYOFFICE/DocSpace into feature/standalone 2023-05-16 13:12:24 +04:00
0d54ec005a Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-16 13:11:19 +04:00
39791dd22c Web: Added translations. 2023-05-16 12:00:40 +03:00
9a55faed05 Web: Added enterprise alert. 2023-05-16 10:44:44 +03:00
85205659ec Fix UselessModuleTranslationKeysTest issue (key: Copy) 2023-05-15 16:34:09 +04:00
3d40fdd1e5 Fix UselessModuleTranslationKeysTest issue (key: Rename) 2023-05-15 16:22:34 +04:00
7638c25dc0 Fix UselessModuleTranslationKeysTest issue (key: MoveTo) 2023-05-15 16:16:15 +04:00
662db5e64d Web: PortalSettings: Payments: Added trial container. 2023-05-12 16:04:19 +03:00
288c7ed2e1 Web: PortalSettings: Payments: Added benefits container. 2023-05-12 11:45:39 +03:00
6992252660 Web: PortalSettings: Payments: Added expired title. 2023-05-11 17:58:10 +03:00
1539eeba64 Web: PortalSettings: Payments: Added Enterprise page. 2023-05-11 15:21:44 +03:00
b9b513af59 Web: Files: added delete link dialog 2023-05-11 13:57:38 +03:00
ea45c5803b Web: Files: added external link api 2023-05-11 11:37:32 +03:00
a0293fee03 added translations 2023-05-10 18:42:42 +03:00
Viktor Fomin
0bca20f496 Client: add locales 2023-05-05 16:33:30 +03:00
a2d928aaa0 Web: PortalSettings: SMTPSettings: Added sending test email. 2023-05-05 12:29:15 +03:00
738ae4e38d added translations 2023-05-04 19:20:39 +03:00
12c790046b Web: Files: added new options to LinkRow 2023-05-04 15:10:06 +03:00
c18594a9a5 Added new translations. 2023-05-04 12:45:14 +03:00
04d42a59e5 Web: PortalSettings: SMTPSettings: Added organization name to translations. 2023-05-04 12:30:54 +03:00
2b430ac243 Web: PortalSettings: SMTPSettings: Added help component. 2023-05-04 10:10:56 +03:00
73c7b94dbb Web: PortalSettings: SMTPSettings: Adding buttons, added disable functionality during operations, removed the request for settings every time you enter the page. 2023-05-04 09:47:41 +03:00
Viktor Fomin
523db646c4 Fix Bug 62370: Add a window to confirm the action when you click on Save 2023-05-04 01:06:44 +03:00
54ac8209f1 Web: PortalSettings: added SMTP settings page. 2023-05-03 14:04:38 +03:00
98fbbc0f7c Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/ru/Files.json
2023-05-02 15:20:56 +03:00
7c91f8db6b Web: added new translations 2023-05-02 13:04:13 +03:00
51f7cdac9a Web: Files: fixed translations 2023-04-28 16:59:48 +03:00
c7086a4f05 Web: Files: added new translations 2023-04-27 17:08:48 +03:00
0f8d44800a Web: Files: added public-room translation, icons 2023-04-26 16:34:22 +03:00
09b5f612c9 added translations 2023-04-26 12:23:34 +03:00
Akmal Isomadinov
ea6fd28122 Web:Client Added translation for the title of the empty room screen 2023-04-25 16:02:30 +05:00
d46661eb85 edited translations 2023-04-24 13:46:53 +03:00
190fb7e5e7 Merge branch 'develop' into feature/action-buttons-hints
# Conflicts:
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
2023-04-20 15:39:46 +03:00
bccb3c86e3 Web: Files: added titles to info-panel icon, table-settings icon 2023-04-20 15:35:56 +03:00
19542a5b0f Web: Files: added new translations MarkAsVersion, MarkAsRevision 2023-04-20 13:40:32 +03:00