IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,137 Commits 40 Branches 22 Tags 420 MiB
80645ee784
Commit Graph

442 Commits

Author SHA1 Message Date
Tatiana Lopaeva
80645ee784 Web: Added greeting container. 2024-02-21 12:40:19 +03:00
Tatiana Lopaeva
1f4520c9da Web: Added a block with recovery access. 2024-02-20 11:45:23 +03:00
Alexey Safronov
3dc49cf352 Auto-refactoring of translations 2024-02-14 13:16:02 +04:00
Alexey Safronov
20887d0f4b Move some error translation keys to common 2024-02-14 02:27:50 +04:00
Vladimir Khvan
33b32c21a5 Merge branch 'develop' into feature/js-sdk-presets 2024-02-06 13:27:38 +05:00
Alexey Safronov
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
Maria-Sukhova
077a9e1cd5 edited NameSorting keys 2024-02-01 16:18:48 +03:00
Maria-Sukhova
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
Alexey Safronov
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
Viktor Fomin
a47dd8345a Merge branch 'develop' into feature/new-tariff-bar 2024-01-26 14:59:38 +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
Viktor Fomin
cba0ca5d84 Merge branch 'develop' into feature/new-tariff-bar 2024-01-19 19:46:34 +03:00
Viktor Fomin
cc9af6d709 Web: add translate 2024-01-15 15:15:14 +03:00
Viktor Fomin
6f2caccb70 Web: add translate 2024-01-13 00:05:22 +03:00
Vladimir Khvan
df2a6d3033 Web: Client: JavascriptSDK: manager preset was complemented 2023-12-25 16:25:47 +05:00
Viktor Fomin
1b700299ee Merge branch 'develop' into feature/my-documents-share 2023-12-15 18:22:25 +03:00
Alexey Safronov
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
Viktor Fomin
20d60bba9a Merge branch 'develop' into feature/my-documents-share 2023-12-08 01:15:45 +03:00
Viktor Fomin
ecd5ac40e1 Web: add translates 2023-11-30 13:00:39 +03:00
Viktor Fomin
54da881340 Web: fix translates 2023-11-29 03:17:07 +03:00
Viktor Fomin
aa8c3adddf Web: add translates 2023-11-28 14:37:07 +03:00
DmitrySychugov
1e87bc0eac Public: translation fixed 2023-11-27 20:07:28 +05:00
Alexey Safronov
e347aacf11 Merge branch 'develop' into feature/management 
# Conflicts:
#	package.json
#	yarn.lock
 2023-11-21 12:40:25 +04:00
Alexey Safronov
83a670d256 Fix UselessTranslationKeysTest (removed old translations) 2023-11-20 13:16:33 +04:00
Alexey Safronov
599056a82d Merge branch 'release/v2.0.0' into feature/plugin-sdk 2023-11-17 13:33:34 +04:00
Timofey Boyko
07aef4ca41 Client:PluginSDK: init 2023-11-17 10:01:27 +03:00
Alexey Safronov
40e941d4db Merge branch 'release/v2.0.0' into feature/form-gallery-error-view 2023-11-16 23:03:36 +04:00
Tatiana Lopaeva
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
Tatiana Lopaeva
25bd37eded fix Bug 65122 - Added a warning dialog about saving a backup in a public room. 2023-11-16 12:32:40 +03:00
Alexey Safronov
68733bd54c Fix UselessTranslationKeysTest (removed useless keys) 2023-11-16 13:30:07 +04:00
Alexey Safronov
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
Alexey Safronov
e9a292004a Fix EnDublicatesByContentTest (moved "Price" and "Free" keys to Common translations) 2023-11-15 14:47:32 +04:00
Alexey Safronov
3a2c002d72 Fix FullEnDublicatesTest (moved "Plugins" key to Common translations) 2023-11-15 14:32:58 +04:00
Alexey Safronov
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
DmitrySychugov
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
Akmal Isomadinov
ac13bb8303 Client: moved into common translation 2023-10-11 16:49:13 +05: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
Timofey Boyko
f778106bc4 Merge branch 'develop' into feature/web-plugins 2023-09-29 10:36:07 +03:00