|
37b82fd7a2
|
fix Bug 65174 - Docs. Desktop. The version number in the translation has been removed.
|
2023-11-20 17:44:13 +03:00 |
|
|
8bbe0deb53
|
Merge branch 'release/v2.0.0' into feature/updating_translations
# Conflicts:
# i18next/client.babel
# i18next/common.babel
# packages/client/public/locales/az/Files.json
# packages/client/public/locales/az/FormGallery.json
# packages/client/public/locales/az/InfoPanel.json
# packages/client/public/locales/az/JavascriptSdk.json
# packages/client/public/locales/az/Settings.json
# packages/client/public/locales/bg/Files.json
# packages/client/public/locales/bg/FormGallery.json
# packages/client/public/locales/bg/InfoPanel.json
# packages/client/public/locales/bg/JavascriptSdk.json
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/cs/Files.json
# packages/client/public/locales/cs/FormGallery.json
# packages/client/public/locales/cs/InfoPanel.json
# packages/client/public/locales/cs/JavascriptSdk.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/de/Files.json
# packages/client/public/locales/de/FormGallery.json
# packages/client/public/locales/de/InfoPanel.json
# packages/client/public/locales/de/JavascriptSdk.json
# packages/client/public/locales/de/Settings.json
# packages/client/public/locales/el-GR/Files.json
# packages/client/public/locales/el-GR/FormGallery.json
# packages/client/public/locales/el-GR/InfoPanel.json
# packages/client/public/locales/el-GR/JavascriptSdk.json
# packages/client/public/locales/el-GR/Settings.json
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/es/Files.json
# packages/client/public/locales/es/FormGallery.json
# packages/client/public/locales/es/InfoPanel.json
# packages/client/public/locales/es/JavascriptSdk.json
# packages/client/public/locales/es/Settings.json
# packages/client/public/locales/fi/Files.json
# packages/client/public/locales/fi/FormGallery.json
# packages/client/public/locales/fi/InfoPanel.json
# packages/client/public/locales/fi/JavascriptSdk.json
# packages/client/public/locales/fi/Settings.json
# packages/client/public/locales/fr/Files.json
# packages/client/public/locales/fr/FormGallery.json
# packages/client/public/locales/fr/InfoPanel.json
# packages/client/public/locales/fr/JavascriptSdk.json
# packages/client/public/locales/fr/Settings.json
# packages/client/public/locales/hy-AM/Files.json
# packages/client/public/locales/hy-AM/FormGallery.json
# packages/client/public/locales/hy-AM/InfoPanel.json
# packages/client/public/locales/hy-AM/JavascriptSdk.json
# packages/client/public/locales/hy-AM/Settings.json
# packages/client/public/locales/it/Files.json
# packages/client/public/locales/it/FormGallery.json
# packages/client/public/locales/it/InfoPanel.json
# packages/client/public/locales/it/JavascriptSdk.json
# packages/client/public/locales/it/Settings.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/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
|
2023-11-20 15:55:26 +04:00 |
|
|
83a670d256
|
Fix UselessTranslationKeysTest (removed old translations)
|
2023-11-20 13:16:33 +04:00 |
|
|
01b2f99be9
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-20 01:50:01 +03:00 |
|
|
a284aafe64
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-17 17:44:38 +03:00 |
|
Akmal Isomadinov
|
73332b8e34
|
Web:Scripts:Config Disabled PDF viewer
|
2023-11-17 19:40:41 +05:00 |
|
|
71a496d472
|
Update translations: az, bg, cs, de, el, es, fi, fr, hy, it
|
2023-11-17 16:15:11 +03:00 |
|
|
599056a82d
|
Merge branch 'release/v2.0.0' into feature/plugin-sdk
|
2023-11-17 13:33:34 +04:00 |
|
|
c41f2e7d14
|
Client:PluginSDK: add plugin list
|
2023-11-17 12:01:59 +03: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 |
|
|
45d74b5fe2
|
Added icons for file formats: sxc, et, ett, sxi, dps, dpt, sxw, stw, wps, wpt, mhtml
|
2023-11-16 16:35:22 +03:00 |
|
|
4659c69625
|
Web: Public: Update thirdparties logos to show them correctly in RTL mode
|
2023-11-16 12:19:39 +01: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 |
|
|
86484af409
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-15 15:44:20 +03: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 |
|
|
2ea7ee368a
|
Merge branch 'develop' into feature/management
# Conflicts:
# frontend.code-workspace
|
2023-11-10 13:59:36 +04:00 |
|
|
8f22be679b
|
Client:Plugins: change default plugin logo, fix path for assets at context menu and dd item
|
2023-11-10 11:39:17 +03:00 |
|
|
5be61afd7d
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-09 19:05:58 +03:00 |
|
|
608b3b1260
|
Web: Files: fixed public-room icon
|
2023-11-09 18:46:46 +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 |
|
|
de5f65b632
|
Public: added ru translation for management
|
2023-11-08 18:56:04 +05:00 |
|
|
5fa330c52a
|
Removed deprecated parameter from frame component
|
2023-11-08 15:00:30 +03:00 |
|
|
d138608224
|
Web: change image
|
2023-11-08 11:16:00 +03:00 |
|
Akmal Isomadinov
|
50cf68375b
|
Web:Navigation Fixed option icon
|
2023-11-07 14:11:18 +05:00 |
|
Akmal Isomadinov
|
4bad9df7eb
|
Web:FilesSelector Added restore action
|
2023-11-03 15:30:26 +05:00 |
|
|
248f0e80b2
|
Web: Added a mute icon in the room, added unmute when clicking on this icon.
|
2023-11-02 15:03:02 +03:00 |
|
mushka-n
|
da4c667afe
|
major code cleanup
|
2023-11-01 12:29:49 +03:00 |
|
|
f9dfc3954b
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-31 18:18:20 +04:00 |
|
|
4262b23031
|
Merge pull request #57 from ONLYOFFICE/bugfix/icons
Bugfix/icons
|
2023-10-30 19:53:47 +04:00 |
|
|
febef31883
|
Merge branch 'release/v2.0.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.0.0
|
2023-10-30 17:56:55 +03:00 |
|
|
f5c62cbf87
|
Fixed oAuth redirect for opening inside thrid-party container
|
2023-10-30 17:56:44 +03:00 |
|
|
c3cd684a0d
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-30 18:34:09 +04:00 |
|
|
15547dedbb
|
Fix Bug 64908 - Accounts: Profile. The flag of Saudi Arabia is incorrectly specified when selecting the language.
|
2023-10-30 18:27:23 +04:00 |
|
|
a84cb1ca92
|
Fixed url for public room in manager mode, apply requestToken parameter
|
2023-10-30 15:46:22 +03:00 |
|
mushka-n
|
fed4bf3235
|
new empty info panel view + translation and styling fixes
|
2023-10-30 15:30:38 +03:00 |
|
mushka-n
|
bc9cbb44c2
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-30 13:49:52 +03:00 |
|
|
5235b306e9
|
Fixed Bug 64897. Public room embedding not display if embedding via js-sdk
|
2023-10-30 11:59:46 +03:00 |
|
|
e0be82a102
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-30 12:05:09 +04:00 |
|
|
0043f7e5e4
|
Merge branch 'develop' into feature/management
|
2023-10-27 21:41:10 +03:00 |
|
Akmal Isomadinov
|
561f7e6793
|
Web:settings: Fixed the icons of the settings
|
2023-10-27 18:39:46 +05:00 |
|
Vladimir Khvan
|
8abea90a92
|
fix Bug 63907 | first name and last name validation was added
|
2023-10-27 18:12:01 +05:00 |
|
mushka-n
|
6ac7700678
|
merge release + merge fix
|
2023-10-27 15:10:43 +03:00 |
|
Akmal Isomadinov
|
2726113dc0
|
Web:Floating-Button Fixed icons and optimization
|
2023-10-26 18:51:31 +05:00 |
|
Akmal Isomadinov
|
5bd428ce16
|
Web:Modal: Fixed close icon
|
2023-10-26 17:33:16 +05:00 |
|
Akmal Isomadinov
|
8beadcea0d
|
Web:Badges Fixed convert icon
|
2023-10-26 16:58:40 +05:00 |
|
Akmal Isomadinov
|
472c15f629
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-26 16:04:44 +05:00 |
|
|
ef39f40c44
|
Fixed images for letters
|
2023-10-25 20:57:08 +03:00 |
|
Akmal Isomadinov
|
05ac738d55
|
Web:Article: Fixed the icon of the article menu button
|
2023-10-25 18:33:42 +05:00 |
|
Akmal Isomadinov
|
6743b6a2a5
|
Web:Client:Article: Fixed catalog icons
|
2023-10-25 18:01:39 +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
|
9ca10c1fcb
|
Web:Navigation: Fixed the add icon and fixed margin
|
2023-10-25 13:56:57 +05:00 |
|
mushka-n
|
5805f1b995
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-20 11:09:31 +03:00 |
|
|
563e14d049
|
Web: Files: added copy icon for tablet view
|
2023-10-19 14:28:55 +03:00 |
|
mushka-n
|
65e809cd97
|
merge release + merge resolve
|
2023-10-18 14:26:12 +03:00 |
|
|
dfd68e1958
|
Merge pull request #23 from ONLYOFFICE/bugfix/pdf-viewer
Web:PDFViewer Fixed the script URL
|
2023-10-17 19:23:48 +04:00 |
|
Akmal Isomadinov
|
11d013f523
|
Web:PDFViewer Fixed the script URL
|
2023-10-17 20:16:17 +05:00 |
|
Viktor Fomin
|
2251c6f310
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-16 20:14:33 +03:00 |
|
|
1f6e3aa3a3
|
Merge branch 'develop' into feature/room-primary-link
# Conflicts:
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/EditLinkPanel/index.js
|
2023-10-13 18:27:53 +03:00 |
|
|
bfda98546c
|
Merge pull request #9 from ONLYOFFICE/bugfix/ui
Bugfix/UI
|
2023-10-13 19:24:03 +04:00 |
|
|
c0ffc3b40e
|
Merge branch 'develop' into feature/redesign-letters
|
2023-10-12 16:17:00 +03:00 |
|
|
5eaa5b6108
|
Merge branch 'develop' into bugfix/ui
# Conflicts:
# packages/client/src/components/FilesSelector/FilesSelector.types.ts
# packages/client/src/components/FilesSelector/index.tsx
# packages/client/src/pages/Home/Section/Header/index.js
|
2023-10-11 19:50:58 +04:00 |
|
|
482cb80f9d
|
Fixed JS-SDK filter property
|
2023-10-11 17:07:41 +03:00 |
|
Akmal Isomadinov
|
ac13bb8303
|
Client: moved into common translation
|
2023-10-11 16:49:13 +05:00 |
|
|
0d4ec93dff
|
Web: Files: fixed link.react icon
|
2023-10-10 12:51:37 +03:00 |
|
|
4d11fd7140
|
Added new letters images
|
2023-10-06 12:20:00 +03:00 |
|
|
7fd66d88ff
|
Web: Files: added new icons
|
2023-10-05 15:41:19 +03:00 |
|
mushka-n
|
5ec8dec79e
|
merge new develop + merge changes
|
2023-10-05 11:23:00 +03:00 |
|
Viktor Fomin
|
9b7d2081e7
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-04 18:28:28 +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 |
|
|
bb43dc825c
|
Clear wrongPortalNameUrl (docker issues)
|
2023-10-04 14:50:54 +04:00 |
|
Viktor Fomin
|
f6f3369b8a
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-02 12:21:15 +03:00 |
|
Viktor Fomin
|
524d1d15f4
|
Web: add icon
|
2023-10-02 12:18:23 +03:00 |
|
|
1e8fac378c
|
Web:Client:Plugin: apply new layouts, add delete dialog
|
2023-09-29 15:32:27 +03:00 |
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
Viktor Fomin
|
7a3f743260
|
Web: change images
|
2023-09-28 22:53:34 +03:00 |
|
Viktor Fomin
|
bbdf7f8db7
|
Web: add icon
|
2023-09-28 18:50:29 +03:00 |
|
Viktor Fomin
|
8d606c78e7
|
Web: delete useless
|
2023-09-27 14:15:47 +03:00 |
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +03:00 |
|
mushka-n
|
10f8b0e00a
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-25 14:25:46 +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 |
|
mushka-n
|
a843a45b09
|
merge develop + merge fix
|
2023-09-23 23:52:51 +03:00 |
|
mushka-n
|
6cbb1cce34
|
implemented new localization structure + after-merge fixes
|
2023-09-22 18:38:37 +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 |
|
|
5dab788680
|
Web: Files: InfoPanel: added infinite-loader to members list
|
2023-09-22 15:10:48 +03:00 |
|
|
203fdc0695
|
public: api js polyfill
|
2023-09-21 14:41:11 +03:00 |
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03: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 |
|