|
3dc49cf352
|
Auto-refactoring of translations
|
2024-02-14 13:16:02 +04:00 |
|
|
5b28408a17
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/SelectedFolderStore.js
# packages/client/src/store/TableStore.js
# packages/client/src/store/index.js
# packages/shared/store/CurrentQuotaStore.ts
# packages/shared/utils/common.ts
# public/locales/en/Common.json
|
2024-02-14 12:15:32 +03:00 |
|
|
20887d0f4b
|
Move some error translation keys to common
|
2024-02-14 02:27:50 +04:00 |
|
|
904d828732
|
Web: Client: Add filters to People, Groups, InsideGroup (Accounts)
|
2024-02-13 21:48:47 +01:00 |
|
|
eaf83a10d4
|
Web: Client: Add inviting groups to room
|
2024-02-13 16:53:24 +01:00 |
|
Vladimir Khvan
|
719ffe2b60
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/src/routes/portalSettings.js
packages/client/src/store/DialogsStore.js
packages/client/src/store/index.js
packages/common/constants/index.js
packages/components/file-input/index.js
packages/components/paging/index.js
packages/components/progress-bar/index.js
packages/components/row/index.js
packages/components/table-container/TableGroupMenu.js
packages/components/themes/base.js
packages/shared/api/settings/index.ts
packages/shared/components/paging/Paging.styled.ts
packages/shared/components/table/sub-components/TableHeaderCell.tsx
packages/shared/utils/catalogIconHelper.ts
public/locales/en/Common.json
|
2024-02-13 16:16:29 +05:00 |
|
|
233f936876
|
Merge branch 'bugfix/selectors' of github.com:ONLYOFFICE/DocSpace-client into bugfix/selectors
|
2024-02-13 12:17:15 +03:00 |
|
|
9761a340f5
|
Move many translation keys to Common
|
2024-02-13 04:42:10 +04:00 |
|
|
d385474caa
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/GlobalEvents/CreateRoomEvent.js
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/MainBar/Bar.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/UsersStore.js
# packages/client/src/store/index.js
# packages/common/store/AuthStore.js
# packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
# packages/shared/api/files/index.ts
# packages/shared/api/files/types.ts
# packages/shared/store/CurrentQuotaStore.ts
# packages/shared/store/UserStore.ts
# public/locales/en/Common.json
|
2024-02-06 11:52:52 +03:00 |
|
Vladimir Khvan
|
33b32c21a5
|
Merge branch 'develop' into feature/js-sdk-presets
|
2024-02-06 13:27:38 +05:00 |
|
|
e885c0485d
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/client/src/pages/Home/Hooks/usePublic.js
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/uk-UA/Common.json
# public/locales/zh-CN/Common.json
|
2024-02-02 16:15:04 +04:00 |
|
|
077a9e1cd5
|
edited NameSorting keys
|
2024-02-01 16:18:48 +03:00 |
|
|
ee2f010de3
|
edited oform -> PDF form
|
2024-02-01 16:06:21 +03:00 |
|
Vladimir Khvan
|
cdcffc31c9
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/client/src/pages/Home/Section/Header/index.js
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
packages/shared/components/navigation/Navigation.tsx
packages/shared/components/navigation/Navigation.types.ts
packages/shared/components/navigation/sub-components/ControlBtn.tsx
|
2024-02-01 15:01:55 +05:00 |
|
Vladimir Khvan
|
40bf42d783
|
Web: Client: JavascriptSDK: filter description was added in file selector
|
2024-01-31 23:28:42 +05:00 |
|
|
9816f1743b
|
Removed useless translation key
|
2024-01-31 21:08:26 +04:00 |
|
Vladimir Khvan
|
a8efee895b
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
packages/client/src/pages/Sdk/index.js
packages/shared/selectors/Room/RoomSelector.types.ts
packages/shared/selectors/Room/index.tsx
|
2024-01-31 13:36:21 +05:00 |
|
|
9bc350628b
|
Web: Added dialog for changing portal quota.
|
2024-01-29 13:15:22 +03:00 |
|
|
683c628c28
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/SelectedFolderStore.js
# packages/common/components/Loaders/index.js
# packages/shared/api/files/index.ts
# public/locales/en/Common.json
|
2024-01-28 20:44:38 +03:00 |
|
|
a47dd8345a
|
Merge branch 'develop' into feature/new-tariff-bar
|
2024-01-26 14:59:38 +03:00 |
|
|
bbe974f548
|
Web: Added the ability to change quota.
|
2024-01-26 12:29:28 +03:00 |
|
Akmal Isomadinov
|
a12cbd3415
|
Shared:Components:Cron Refusal of transfers in favor of luxon
|
2024-01-25 19:42:22 +05:00 |
|
Akmal Isomadinov
|
a7f2c24393
|
Shared:Components:Cron Updated translation and deleted old translations
|
2024-01-24 18:36:12 +05:00 |
|
Vladimir Khvan
|
56e669555d
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
packages/common/components/Navigation/sub-components/control-btn.js
packages/shared/components/navigation/Navigation.tsx
packages/shared/selectors/Room/index.tsx
|
2024-01-23 16:38:55 +05:00 |
|
|
3d359b3d7f
|
Web: Fixed translation.
|
2024-01-22 15:27:41 +03:00 |
|
|
cba0ca5d84
|
Merge branch 'develop' into feature/new-tariff-bar
|
2024-01-19 19:46:34 +03:00 |
|
|
253a8701f4
|
Web: Added quota change dialog in management section.
|
2024-01-17 11:50:48 +03:00 |
|
|
cc9af6d709
|
Web: add translate
|
2024-01-15 15:15:14 +03:00 |
|
|
6f2caccb70
|
Web: add translate
|
2024-01-13 00:05:22 +03:00 |
|
|
596a832dbe
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/public/locales/ru/Settings.json
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/PeopleStore.js
# packages/common/api/files/index.js
# packages/components/table-container/TableHeader.js
|
2024-01-10 12:25:13 +03:00 |
|
Vladimir Khvan
|
df2a6d3033
|
Web: Client: JavascriptSDK: manager preset was complemented
|
2023-12-25 16:25:47 +05:00 |
|
|
52092c3aa2
|
added groups and shared folders options for onlyoffice workspace
|
2023-12-23 22:13:36 +05:00 |
|
|
1b700299ee
|
Merge branch 'develop' into feature/my-documents-share
|
2023-12-15 18:22:25 +03:00 |
|
|
9a1e639723
|
Merge branch 'hotfix/v2.0.1' into develop
|
2023-12-15 15:20:32 +04:00 |
|
Akmal Isomadinov
|
642d1a3b42
|
Web:Client:Wizard Added BetaBadge
|
2023-12-13 15:50:15 +05:00 |
|
Akmal Isomadinov
|
cdfc6f651a
|
Added BetaBadge
|
2023-12-11 17:01:38 +05:00 |
|
Vladimir Khvan
|
d538c9880f
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/common/utils/axiosClient.js
|
2023-12-11 14:46:43 +05:00 |
|
|
20d60bba9a
|
Merge branch 'develop' into feature/my-documents-share
|
2023-12-08 01:15:45 +03:00 |
|
|
c904de1438
|
added si
|
2023-12-05 18:29:36 +03:00 |
|
|
e40c555ab0
|
added translate for import step
|
2023-12-04 15:23:57 +05:00 |
|
|
bee419003a
|
fixed onlyoffice workspace import step
|
2023-12-03 14:38:58 +05:00 |
|
|
ecd5ac40e1
|
Web: add translates
|
2023-11-30 13:00:39 +03:00 |
|
|
94bffa1364
|
Web: Fixed work with changing quota in lists.
|
2023-11-29 16:53:57 +03:00 |
|
|
7f3ee86798
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/PeopleRowContainer.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomsRowData.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/store/FilesStore.js
# packages/common/store/CurrentQuotaStore.js
# packages/common/utils/index.ts
# packages/components/table-container/TableHeader.js
# public/locales/en/Common.json
|
2023-11-29 10:56:04 +03:00 |
|
|
54da881340
|
Web: fix translates
|
2023-11-29 03:17:07 +03:00 |
|
|
aa8c3adddf
|
Web: add translates
|
2023-11-28 14:37:07 +03:00 |
|
|
1e87bc0eac
|
Public: translation fixed
|
2023-11-27 20:07:28 +05:00 |
|
Vladimir Khvan
|
caa7c632c4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/public/locales/en/Settings.json
packages/client/public/locales/ru/Settings.json
packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
packages/client/src/pages/PortalSettings/utils/settingsTree.js
packages/client/src/routes/portalSettings.js
packages/client/src/store/DialogsStore.js
packages/client/src/store/index.js
packages/components/table-container/TableHeaderCell.js
public/locales/en/Common.json
|
2023-11-22 19:45:10 +05:00 |
|
|
e347aacf11
|
Merge branch 'develop' into feature/management
# Conflicts:
# package.json
# yarn.lock
|
2023-11-21 12:40:25 +04:00 |
|
|
83a670d256
|
Fix UselessTranslationKeysTest (removed old translations)
|
2023-11-20 13:16:33 +04:00 |
|
|
599056a82d
|
Merge branch 'release/v2.0.0' into feature/plugin-sdk
|
2023-11-17 13:33:34 +04:00 |
|
|
07aef4ca41
|
Client:PluginSDK: init
|
2023-11-17 10:01:27 +03:00 |
|
|
40e941d4db
|
Merge branch 'release/v2.0.0' into feature/form-gallery-error-view
|
2023-11-16 23:03:36 +04:00 |
|
|
ba520a7ad1
|
Merge branch 'release/v2.0.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.0.0
|
2023-11-16 12:33:06 +03:00 |
|
|
25bd37eded
|
fix Bug 65122 - Added a warning dialog about saving a backup in a public room.
|
2023-11-16 12:32:40 +03:00 |
|
|
68733bd54c
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:30:07 +04:00 |
|
|
29bbf2c8b1
|
Fix UselessTranslationKeysTest (removed useless AddFilter key)
|
2023-11-16 13:22:03 +04:00 |
|
namushka
|
14bdc19485
|
Merge branch 'release/v2.0.0' into feature/form-gallery-error-view
|
2023-11-15 13:53:53 +03:00 |
|
|
e9a292004a
|
Fix EnDublicatesByContentTest (moved "Price" and "Free" keys to Common translations)
|
2023-11-15 14:47:32 +04:00 |
|
|
3a2c002d72
|
Fix FullEnDublicatesTest (moved "Plugins" key to Common translations)
|
2023-11-15 14:32:58 +04:00 |
|
|
87d08a89f8
|
Auto-sorting Common translations
|
2023-11-15 14:09:29 +04:00 |
|
namushka
|
877b32d527
|
added error screen for form gallery
|
2023-11-13 18:29:33 +03:00 |
|
|
3170833b98
|
Merge branch 'develop' into feature/management
# Conflicts:
# frontend.macos.code-workspace
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
# yarn.lock
|
2023-11-09 19:13:20 +05:00 |
|
Akmal Isomadinov
|
4bad9df7eb
|
Web:FilesSelector Added restore action
|
2023-11-03 15:30:26 +05:00 |
|
Vladimir Khvan
|
8abea90a92
|
fix Bug 63907 | first name and last name validation was added
|
2023-10-27 18:12:01 +05:00 |
|
DmitrySychugov
|
fd250c57da
|
Merge branch 'develop' into feature/management
# Conflicts:
# packages/client/src/components/MainBar/index.js
# packages/client/src/components/NavMenu/index.js
# packages/common/components/Article/index.js
# packages/common/components/Article/sub-components/article-header.js
# packages/common/components/Article/sub-components/article-hide-menu-button.js
# packages/components/context-menu/index.js
# yarn.lock
|
2023-10-25 14:40:50 +05:00 |
|
Vladimir Khvan
|
ea7b067e7f
|
Merge branch 'develop' into 'feature/data-migration' | conflict components/paging/styled-paging.js
|
2023-10-16 20:09:10 +05:00 |
|
Akmal Isomadinov
|
ac13bb8303
|
Client: moved into common translation
|
2023-10-11 16:49:13 +05:00 |
|
|
ebe62b7978
|
Web: Added translations.
|
2023-10-04 18:28:29 +03:00 |
|
|
c43d8c891a
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# common/ASC.ActiveDirectory/Base/Data/LdapObjectExtension.cs
# common/ASC.ActiveDirectory/LdapUserManager.cs
# common/ASC.Api.Core/Model/EmployeeFullDto.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/IUserService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Core.Common/EF/Context/UserDbContext.cs
# common/ASC.Core.Common/Tenants/TenantUserQuotaSettings.cs
# common/ASC.Core.Common/Users/UserQuotaSettings.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IDataStore.cs
# common/ASC.Data.Storage/IQuotaController.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# packages/client/public/locales/en/Settings.json
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/GlobalEvents/index.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/PeopleStore.js
# packages/common/api/people/index.js
# packages/common/constants/index.js
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbFolder.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/Entries/OrderBy.cs
# products/ASC.Files/Core/Core/Entries/Tag.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/UsersQuotaSyncOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.People/Server/Api/UserController.cs
# public/locales/en/Common.json
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/ApiModels/RequestsDto/QuotaSettingsRequestsDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/QuotaDto.cs
# web/ASC.Web.Api/Core/QuotaHelper.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2023-10-04 16:56:49 +03:00 |
|
|
477976da29
|
Revert "Merge branch 'develop' into feature/oauth2-client"
This reverts commit 9d93525a91 .
|
2023-10-04 16:10:13 +03:00 |
|
|
148def0bb5
|
Merge branch 'develop' into feature/data-migration
|
2023-10-04 15:23:34 +03:00 |
|
DmitrySychugov
|
2fc16bc9ec
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/management
# Conflicts:
# build/build.backend.docker.ps1
# build/build.backend.docker.sh
# build/build.static.bat
# build/clear.backend.docker.ps1
# build/clear.backend.docker.sh
# build/install/docker/Dockerfile
# build/install/docker/Dockerfile.runtime
# build/install/docker/config/nginx/templates/upstream.conf.template
# build/install/docker/docspace.overcome.yml
# build/install/docker/docspace.profiles.yml
# build/start/start.backend.docker.ps1
# build/start/start.backend.docker.sh
# common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
# common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
# common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
# common/ASC.Data.Backup.Core/Service/BackupService.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ApiSystem/Controllers/SettingsController.cs
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Models/SettingsModel.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup/Api/BackupController.cs
# common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
# common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
# common/services/ASC.Data.Backup/GlobalUsings.cs
# config/nginx/onlyoffice.conf
# migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# package.json
# packages/client/package.json
# packages/client/src/pages/Confirm/sub-components/auth.js
# packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/index.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
# yarn.lock
|
2023-10-04 16:27:12 +05:00 |
|
|
9d93525a91
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-04 13:24:59 +03:00 |
|
edjalilov
|
5c380834ab
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# ASC.Web.sln
# ASC.Web.slnf
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Data.Storage/DataOperators/DataOperatorFactory.cs
# common/ASC.Data.Storage/DataOperators/IDataOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/BaseReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/TarReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/ZipReadOperator.cs
# common/ASC.Migration/ASC.Migration.Core.csproj
# common/ASC.Migration/Core/AbstractMigration.cs
# common/ASC.Migration/Core/IMigration.cs
# common/ASC.Migration/Core/ImportableEntity.cs
# common/ASC.Migration/Core/MigrationIntegrationEvent.cs
# common/ASC.Migration/Core/MigrationIntegrationEventHandler.cs
# common/ASC.Migration/Core/MigrationLogger.cs
# common/ASC.Migration/Core/MigrationParseIntegrationEvent.cs
# common/ASC.Migration/Core/Models/Api/ImportableApiEntity.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiFiles.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiGroup.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiUser.cs
# common/ASC.Migration/Core/Models/Api/MigrationApiInfo.cs
# common/ASC.Migration/Core/Models/Api/MigrationCore.cs
# common/ASC.Migration/Core/Models/Api/MigratorMeta.cs
# common/ASC.Migration/Core/Models/MigratingFiles.cs
# common/ASC.Migration/Core/Models/MigratingUser.cs
# common/ASC.Migration/Core/Models/MigrationInfo.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceFiles.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceUser.cs
# common/ASC.Migration/Core/Providers/ASC/Models/WorkspaceMigrationInfo.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/GoogleWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingFiles.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingUser.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/Parse/NCUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/NextcloudWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigrationinfo.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/Parse/OCUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/OwnCloudMigration.cs
# common/ASC.Migration/GlobalUsings.cs
# common/ASC.Migration/Resources/MigrationResource.Designer.cs
# common/ASC.Migration/Resources/MigrationResource.resx
# config/nginx/onlyoffice.conf
# config/storage.json
# packages/client/src/components/dialogs/index.js
# packages/client/src/store/index.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Startup.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/ApiModels/RequestsDto/FinishDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/MigrationStatusDto.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
# web/ASC.Web.Studio/GlobalUsings.cs
# web/ASC.Web.Studio/IntegrationEvents/RemovePortalIntegrationEventHandler.cs
# web/ASC.Web.Studio/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2023-10-04 14:57:29 +05:00 |
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
Elyor Djalilov
|
3116c25d9f
|
Merge branch 'develop' into feature/data-migration
|
2023-09-28 18:17:38 +05:00 |
|
|
10f9c009ba
|
Web: Added translation.
|
2023-09-28 14:30:14 +03:00 |
|
|
5ba9cf0dc2
|
Web: Added sorting for the users module.
|
2023-09-27 16:51:11 +03:00 |
|
Viktor Fomin
|
8d606c78e7
|
Web: delete useless
|
2023-09-27 14:15:47 +03:00 |
|
|
4faaacf6e2
|
Web: Added toastr.
|
2023-09-27 10:56:31 +03:00 |
|
|
38c4281383
|
Web: Added filter to rooms module.
|
2023-09-25 21:29:11 +03:00 |
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
|
4048d8dc82
|
Web: removed useless translation key ResetButton
|
2023-09-22 17:21:24 +04:00 |
|
|
8371330d3c
|
Web: Applied new design
|
2023-09-22 16:39:08 +04:00 |
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
Elyor Djalilov
|
94685e3794
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# common/ASC.Data.Storage/DataOperators/WriteOperators/ZipWriteOperator.cs
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/store/DialogsStore.js
# packages/client/src/store/index.js
# products/ASC.People/Server/Startup.cs
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2023-09-21 15:30:39 +05:00 |
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
Viktor Fomin
|
c0d87940f0
|
Web: move ExpiredLink translate to Common
|
2023-09-20 17:35:38 +03:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
21b011cdfb
|
Web: Added translation.
|
2023-09-20 16:12:06 +03:00 |
|
|
bdabb35e55
|
Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-20 15:03:02 +03:00 |
|
|
940338fd9d
|
Web: Files: Leave-room: bugs fixed
|
2023-09-20 15:02:34 +03:00 |
|
|
b25b39da14
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-20 14:55:39 +03:00 |
|
|
3d20697ac0
|
Web: Translation: Fix UTC key duplication + sorting
|
2023-09-20 15:36:34 +04:00 |
|
gazizova-vlada
|
cc31a46cb9
|
Web:Fix common.
|
2023-09-20 12:53:29 +03:00 |
|
|
3a1bf92291
|
Merge branch 'develop' into feature/leave-room
|
2023-09-20 13:20:56 +04:00 |
|
|
e356f361f3
|
Merge pull request #1757 from ONLYOFFICE/feature/rtl-cron
Feature/rtl cron
|
2023-09-20 13:10:36 +04:00 |
|
Akmal Isomadinov
|
c1983fcfa6
|
Web:Cron Added translation
|
2023-09-20 13:34:26 +05:00 |
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
|
91ae0883e9
|
Web:Client:Plugins: fix plugin dialog
|
2023-09-19 08:58:48 +03:00 |
|
mushka-n
|
d98680b350
|
moved translations and updated selector
|
2023-09-18 17:10:16 +03:00 |
|
mushka-n
|
da7aec7445
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 13:06:39 +03:00 |
|
|
00c3d8a367
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-15 18:46:34 +03:00 |
|
Viktor Fomin
|
15e58aa3c7
|
Web: add translates
|
2023-09-15 18:32:09 +03:00 |
|
|
d25e3e3d42
|
Web:Client:Plugins: add context menu item for all plugin actions, add opportunity change UNKNOWN file type and file.svg icon
|
2023-09-15 13:55:41 +03:00 |
|
Viktor Fomin
|
2f6861f43f
|
Web: add translates
|
2023-09-14 14:42:46 +03:00 |
|
mushka-n
|
d96911a37c
|
merge develop + merge fix
|
2023-09-11 13:26:58 +03:00 |
|
|
1f77cf82a2
|
Merge branch 'develop' into feature/leave-room
|
2023-09-11 13:28:56 +04:00 |
|
|
14e080abb6
|
Web: Cron: Added ru language
|
2023-09-11 13:16:39 +04:00 |
|
Elyor Djalilov
|
3fc19b5563
|
added warning on upload unsupported file
|
2023-09-08 19:48:04 +05:00 |
|
mushka-n
|
e1d989c6d2
|
merge develop + merge fix
|
2023-09-08 03:27:39 +03:00 |
|
Akmal Isomadinov
|
2ba6366f29
|
Merge branch 'develop' into feature/cron
|
2023-09-07 16:43:58 +05:00 |
|
Akmal Isomadinov
|
096e3dd687
|
Web:Cron Fixed translations
|
2023-09-07 16:40:45 +05:00 |
|
gazizova-vlada
|
b224b1bb8f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-06 13:00:15 +03:00 |
|
Vladimir Khvan
|
07519d4109
|
Merge branch 'develop' into feature/data-migration
|
2023-09-06 12:33:23 +05:00 |
|
Viktor Fomin
|
3668d75450
|
Merge branch 'develop' into feature/management
|
2023-09-05 18:34:41 +03:00 |
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
d3198671ba
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
# packages/common/constants/index.js
|
2023-09-04 16:38:06 +03:00 |
|
|
613938b819
|
Web: Added Zoom login button, translates and icons
|
2023-09-04 16:06:55 +03:00 |
|
|
5730a393f0
|
Merge branch 'develop' into feature/management
|
2023-09-04 12:23:29 +04:00 |
|
Vladimir Khvan
|
d24faf9716
|
Merge branch 'develop' into feature/data-migration
|
2023-09-04 13:21:56 +05:00 |
|
|
efdd42f8f6
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-09-01 15:30:48 +02:00 |
|
|
3e6a417d19
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# yarn.lock
|
2023-09-01 15:33:39 +03:00 |
|
|
19a1c80a5f
|
edited ar language name
|
2023-08-30 15:39:37 +03:00 |
|
Vladimir Khvan
|
67d00bdbbc
|
translations were added
|
2023-08-30 15:19:49 +05:00 |
|
|
5e79ebe967
|
Added new language (ar-SA)
|
2023-08-30 12:03:34 +04:00 |
|
Subhonbek
|
087711acc8
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-08-29 12:41:12 +03:00 |
|
Viktor Fomin
|
1904e3bc43
|
Fix Bug 63467: auth via Microsoft is not available
|
2023-08-29 06:26:37 +03:00 |
|
|
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 |
|
|
be7034b296
|
added ar Common.json
|
2023-08-28 13:27:47 +03:00 |
|
Mushka Nikita
|
fe88c657de
|
merge develop + merge bugfix
|
2023-08-22 03:25:02 +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 |
|
|
f13e9eaca7
|
Merge branch 'develop' into feature/management
|
2023-08-09 12:28:25 +03: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 |
|
Elyor Djalilov
|
4d493fbc6b
|
Merge branch 'develop' into feature/data-migration
|
2023-08-07 17:15:04 +05:00 |
|
|
638807a0e0
|
Merge branch 'develop' into feature/deep-link
|
2023-08-04 19:01:14 +04:00 |
|
Elyor Djalilov
|
b3826eedff
|
Merge branch 'develop' into feature/data-migration
|
2023-08-04 11:46:43 +05:00 |
|
Viktor Fomin
|
27a4814c76
|
Web: add translate
|
2023-08-02 12:10:43 +03:00 |
|
Viktor Fomin
|
89b8673f99
|
Merge branch 'develop' into feature/management
|
2023-08-02 11:26:54 +03:00 |
|
|
12558b8520
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/components/panels/OperationsPanel/index.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# yarn.lock
|
2023-08-01 17:56:22 +03:00 |
|
|
ea40ba3738
|
Web: Added error on empty files list on OperationPanel
|
2023-08-01 13:31:58 +04:00 |
|
Elyor Djalilov
|
a6e5b7a3dc
|
added cancel upload dialog
|
2023-07-31 16:39:14 +05:00 |
|