|
|
d1061bb3ae
|
renaming resource keys
|
2024-05-23 18:14:33 +03:00 |
|
|
|
d90ad9d951
|
Merge pull request #425 from ONLYOFFICE/feature/resources-correction
Feature/resource correction
|
2024-05-23 18:13:30 +04:00 |
|
|
|
c440260f71
|
resource correction
|
2024-05-22 22:54:57 +03:00 |
|
|
|
881b7bad4b
|
Translations: fix UselessTranslationKeysTest issues
|
2024-05-15 19:37:37 +04:00 |
|
|
|
b52e7af32c
|
Fix Bug 67813
No translation of Share panel in editor
|
2024-05-03 12:32:58 +03:00 |
|
|
|
fede13cd74
|
Translations: Moved "Errors:InvalidLink" to Common
|
2024-04-26 17:41:30 +04:00 |
|
|
|
af7ea9116e
|
Translations: Moved 'Reconnect' key to Common
|
2024-04-19 14:54:40 +04:00 |
|
|
|
6888b5c2c6
|
updated translations
|
2024-04-17 14:45:17 +03:00 |
|
|
|
7b823b65f4
|
Merge branch 'feature/new-translations_v.2.5' into release/v2.5.0
|
2024-04-15 18:38:35 +04:00 |
|
|
|
a9cba735c1
|
updated translations
|
2024-04-15 15:33:01 +03:00 |
|
|
|
f0d84c0e81
|
removed useless translations
|
2024-04-13 13:53:21 +05:00 |
|
|
|
ee70f1cbc3
|
Translations: Removed wrong value (it's value of key JavascriptSdk:CSPInfoBarDescription)
|
2024-04-12 20:09:13 +04:00 |
|
|
|
9afb296b5d
|
updated hy
|
2024-04-12 16:59:47 +03:00 |
|
|
|
59c3cd4b2f
|
updated translations
|
2024-04-12 13:47:30 +03:00 |
|
|
|
7b44084797
|
Translations: Fix EnDublicatesByContentTest issue (Moved "Editor" key to Common and replaced "RoleEditor")
|
2024-04-11 13:34:53 +04:00 |
|
|
|
b5a38f3434
|
Translations: Fix UselessTranslationKeysTest issues
|
2024-04-11 12:46:19 +04:00 |
|
|
|
7577a82361
|
Translations: fix EmptyValueKeysTest issue (key "Invited" moved to Common)
|
2024-04-11 09:47:07 +04:00 |
|
|
|
305ce4be0b
|
Translations: Rename keys LinkSettings -> LinkSetDescription (fix test issue)
|
2024-04-11 09:14:09 +04:00 |
|
|
|
e298fc0d1d
|
Merge branch 'release/v2.5.0' into feature/new-translations_v.2.5
# Conflicts:
# packages/client/public/locales/ar-SA/InviteDialog.json
# packages/client/public/locales/ar-SA/Settings.json
# packages/client/public/locales/az/InviteDialog.json
# packages/client/public/locales/az/Settings.json
# packages/client/public/locales/bg/InviteDialog.json
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/cs/InviteDialog.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/de/InviteDialog.json
# packages/client/public/locales/de/Settings.json
# packages/client/public/locales/el-GR/InviteDialog.json
# packages/client/public/locales/el-GR/Settings.json
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/en/WebPlugins.json
# packages/client/public/locales/es/InviteDialog.json
# packages/client/public/locales/es/Settings.json
# packages/client/public/locales/fi/InviteDialog.json
# packages/client/public/locales/fi/Settings.json
# packages/client/public/locales/fr/InviteDialog.json
# packages/client/public/locales/fr/Settings.json
# packages/client/public/locales/hy-AM/InviteDialog.json
# packages/client/public/locales/hy-AM/Settings.json
# packages/client/public/locales/it/InviteDialog.json
# packages/client/public/locales/it/Settings.json
# packages/client/public/locales/ja-JP/InviteDialog.json
# packages/client/public/locales/ja-JP/Settings.json
# packages/client/public/locales/ko-KR/InviteDialog.json
# packages/client/public/locales/ko-KR/Settings.json
# packages/client/public/locales/lv/InviteDialog.json
# packages/client/public/locales/lv/Settings.json
# packages/client/public/locales/nl/InviteDialog.json
# packages/client/public/locales/nl/Settings.json
# packages/client/public/locales/pl/InviteDialog.json
# packages/client/public/locales/pl/Settings.json
# packages/client/public/locales/pt-BR/InviteDialog.json
# packages/client/public/locales/pt-BR/Settings.json
# packages/client/public/locales/pt/InviteDialog.json
# packages/client/public/locales/pt/Settings.json
# packages/client/public/locales/ro/InviteDialog.json
# packages/client/public/locales/ro/Settings.json
# packages/client/public/locales/ru/InviteDialog.json
# packages/client/public/locales/ru/Settings.json
# packages/client/public/locales/ru/Translations.json
# packages/client/public/locales/sk/InviteDialog.json
# packages/client/public/locales/sk/Settings.json
# packages/client/public/locales/sl/InviteDialog.json
# packages/client/public/locales/sl/Settings.json
# packages/client/public/locales/tr/InviteDialog.json
# packages/client/public/locales/tr/Settings.json
# packages/client/public/locales/uk-UA/InviteDialog.json
# packages/client/public/locales/uk-UA/Settings.json
# packages/client/public/locales/vi/InviteDialog.json
# packages/client/public/locales/vi/Settings.json
# packages/client/public/locales/zh-CN/InviteDialog.json
# packages/client/public/locales/zh-CN/Settings.json
# public/locales/ar-SA/Common.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
# public/locales/ja-JP/Common.json
# public/locales/ko-KR/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/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/sk/Common.json
# public/locales/tr/Common.json
# public/locales/uk-UA/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
|
2024-04-10 18:28:12 +04:00 |
|
|
|
07d20cd9da
|
added translations
|
2024-04-10 15:30:25 +03:00 |
|
|
|
7bb8ee3295
|
added it
|
2024-04-09 18:04:38 +03:00 |
|
|
|
013fd4a8be
|
Web: move translations to Common
|
2024-04-09 10:35:07 +03:00 |
|
|
|
b8ddf6bd9d
|
added translations
|
2024-04-02 18:24:47 +03:00 |
|
|
|
daf914604e
|
Translation: Moved "InviteDialog:Invited" and "Settings:Disabled" keys to Common
|
2024-03-26 13:51:15 +04:00 |
|
|
|
a98d1060ed
|
added hy, pt-BR
|
2024-03-22 17:04:42 +03:00 |
|
|
|
62211d8f18
|
Client:Public:Locales: delete useless web plugins translation keys
|
2024-03-21 10:41:41 +03:00 |
|
|
|
5693eecabf
|
Translations: removed useless keys
|
2024-03-18 14:15:11 +04:00 |
|
|
|
8ca7c66682
|
Remove useless tKey
|
2024-03-07 20:27:12 +04:00 |
|
|
|
7293ae5dbd
|
Fix some translation issues
|
2024-03-07 20:07:06 +04:00 |
|
|
|
18fd7db7a5
|
Fix UselessTranslationKeysTest issues
|
2024-03-07 18:10:01 +04:00 |
|
|
|
39ae48c524
|
Fix FullEnDublicatesTest issues
|
2024-03-06 01:59:38 +04:00 |
|
|
|
828e159767
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-01 11:52:08 +04:00 |
|
|
|
55d54d63b2
|
updated it, hy
|
2024-02-29 15:22:55 +03:00 |
|
|
|
852c960163
|
Move some translation keys to Common
|
2024-02-27 15:24:17 +04:00 |
|
|
|
e9d13a6452
|
Applied babelEdit auto-fixes
|
2024-02-22 13:22:16 +04:00 |
|
|
|
5f744636a5
|
Translations: move Files:CreateAndCopy to Common
|
2024-02-22 13:17:26 +04:00 |
|
|
|
d47aa36c85
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-14 13:57:36 +03:00 |
|
|
|
3dc49cf352
|
Auto-refactoring of translations
|
2024-02-14 13:16:02 +04:00 |
|
|
|
20887d0f4b
|
Move some error translation keys to common
|
2024-02-14 02:27:50 +04:00 |
|
|
|
9761a340f5
|
Move many translation keys to Common
|
2024-02-13 04:42:10 +04:00 |
|
|
|
86f6d1d596
|
edited Form template -> PDF Form
|
2024-02-09 15:32:55 +03: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 |
|
|
|
ee2f010de3
|
edited oform -> PDF form
|
2024-02-01 16:06:21 +03:00 |
|
|
|
19e9079671
|
Web: Files: Public-room: fixed translations
|
2024-01-29 15:48:52 +03:00 |
|
|
|
b57ae5a872
|
Translations: Set BETA on EN for any languages
|
2024-01-18 14:29:01 +04:00 |
|
|
|
213afa8974
|
added translations
|
2023-12-14 15:13:07 +03:00 |
|
|
|
d98e0f3f2b
|
Fix EnDublicatesByContentTest issues
|
2023-11-28 19:09:56 +04:00 |
|
|
|
e9e96102cf
|
Merge branch 'feature/updating_translations' of https://github.com/ONLYOFFICE/DocSpace-client into feature/updating_translations
# Conflicts:
# packages/client/public/locales/ja-JP/DeleteProfileEverDialog.json
# packages/client/public/locales/ko-KR/DeleteProfileEverDialog.json
# packages/client/public/locales/lv/DeleteProfileEverDialog.json
# packages/client/public/locales/nl/DeleteProfileEverDialog.json
# packages/client/public/locales/pl/DeleteProfileEverDialog.json
# packages/client/public/locales/pt-BR/DeleteProfileEverDialog.json
# packages/client/public/locales/pt/DeleteProfileEverDialog.json
# packages/client/public/locales/ro/DeleteProfileEverDialog.json
# packages/client/public/locales/ru/DeleteProfileEverDialog.json
# packages/client/public/locales/sk/DeleteProfileEverDialog.json
# packages/client/public/locales/sl/DeleteProfileEverDialog.json
# packages/client/public/locales/tr/DeleteProfileEverDialog.json
# packages/client/public/locales/uk-UA/DeleteProfileEverDialog.json
# packages/client/public/locales/vi/DeleteProfileEverDialog.json
# packages/client/public/locales/zh-CN/DeleteProfileEverDialog.json
|
2023-11-28 17:49:56 +03:00 |
|
|
|
4c3057c645
|
Add translations of multiple languages (ar, ja, ko, lo, lv, nl, pl, pt, ro, ru, sk, sl, tr, uk, vi, zh)
|
2023-11-28 16:53:55 +03:00 |
|
|
|
3425c04044
|
Merge branch 'release/v2.0.0' into feature/updating_translations
# Conflicts:
# packages/client/public/locales/az/DeleteProfileEverDialog.json
# packages/client/public/locales/bg/DeleteProfileEverDialog.json
# packages/client/public/locales/cs/DeleteProfileEverDialog.json
# packages/client/public/locales/de/DeleteProfileEverDialog.json
# packages/client/public/locales/el-GR/DeleteProfileEverDialog.json
# packages/client/public/locales/es/DeleteProfileEverDialog.json
# packages/client/public/locales/fi/DeleteProfileEverDialog.json
# packages/client/public/locales/fr/DeleteProfileEverDialog.json
# packages/client/public/locales/hy-AM/DeleteProfileEverDialog.json
# packages/client/public/locales/it/DeleteProfileEverDialog.json
|
2023-11-23 15:52:14 +04:00 |
|
|
|
b5cd411ada
|
Added translations.
|
2023-11-22 16:30:47 +03:00 |
|
|
|
b496a04db9
|
Fix WrongTranslationTagsTest issues
|
2023-11-20 17:11:29 +04: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 |
|
|
|
71a496d472
|
Update translations: az, bg, cs, de, el, es, fi, fr, hy, it
|
2023-11-17 16:15:11 +03:00 |
|
|
|
7d87515d0c
|
Fix UselessTranslationKeysTest (removed useless FolderId key)
|
2023-11-16 13:53:11 +04:00 |
|
|
|
b7dad01e22
|
Fix UselessTranslationKeysTest (removed useless FolderContents key)
|
2023-11-16 13:37:15 +04:00 |
|
|
|
f4863d06fe
|
Fix UselessTranslationKeysTest (removed useless EmptyFolderHeader key)
|
2023-11-16 13:32:25 +04:00 |
|
|
|
eb488e6caf
|
Fix UselessTranslationKeysTest (removed useless Destroy key)
|
2023-11-16 13:28:04 +04:00 |
|
|
|
effc12a846
|
Fix UselessTranslationKeysTest (removed useless ConnectEmpty key)
|
2023-11-16 13:23:12 +04:00 |
|
|
|
9a920c0d45
|
Fix UselessTranslationKeysTest (removed useless UploadPluginsHere key)
|
2023-11-16 13:19:09 +04:00 |
|
|
|
766019c7c9
|
Fix UselessTranslationKeysTest (removed useless Webhook key)
|
2023-11-16 13:13:19 +04:00 |
|
|
|
553c66ad33
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:05:52 +04:00 |
|
|
|
64ac2715a6
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:02:19 +04:00 |
|
|
|
4430b177fe
|
Fix UselessTranslationKeysTest (removed useless AutoBackupHelp and AutoBackupHelpNote keys)
|
2023-11-16 12:55:40 +04:00 |
|
|
|
a371331c60
|
Fix UselessTranslationKeysTest (removed useless AdminsMessageDescription and AdminsMessageHelper keys)
|
2023-11-16 12:52:23 +04:00 |
|
|
|
ec8d56951b
|
Web: Client: fix when text overflows in version history badge
|
2023-11-15 18:34:56 +01:00 |
|
|
|
e9a292004a
|
Fix EnDublicatesByContentTest (moved "Price" and "Free" keys to Common translations)
|
2023-11-15 14:47:32 +04:00 |
|
|
|
e161432f3a
|
Fix EmptyValueKeysTest (removed useless EmptyScreenDescription, GalleryEmptyScreenDescription, GalleryEmptyScreenHeader)
|
2023-11-15 14:38:49 +04:00 |
|
|
|
3a2c002d72
|
Fix FullEnDublicatesTest (moved "Plugins" key to Common translations)
|
2023-11-15 14:32:58 +04:00 |
|
|
|
c8ee4d0560
|
Web: Files: Public-room: fixed translations
|
2023-11-10 13:41:37 +03:00 |
|
Elyor Djalilov
|
54ecdf8b95
|
useless translate was deleted
|
2023-10-30 15:17:50 +05:00 |
|
|
|
abbeba5d32
|
Web: Files: removed unused translations
|
2023-10-19 14:29:24 +03:00 |
|
|
|
fc93d059b9
|
Web: Files: added new translations for the public-room
|
2023-10-18 14:49:15 +03:00 |
|
|
|
6ac05b3a56
|
Web: Files: Fixed archive view
|
2023-10-16 15:51:56 +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 |
|
Viktor Fomin
|
6cb3ef610d
|
Client: delete useless
|
2023-10-06 15:03:29 +03:00 |
|
|
|
3cdbdd6521
|
Web: Files: added new translations
|
2023-10-05 15:41:50 +03:00 |
|
|
|
13d090c178
|
Web: Added ru translations + autofixes
|
2023-09-29 17:59:55 +04:00 |
|
|
|
88b283a28a
|
Web: Changed translations of NotFoundUsersDescription, SearchEmptyDescription keys
|
2023-09-26 12:21:40 +04: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 |
|
|
|
3c9dfca8c8
|
Web: Removed useless translations
|
2023-09-22 17:16:52 +04:00 |
|
|
|
a4a89ed1c4
|
web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing
|
2023-09-22 16:25:41 +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
|
b3023358f2
|
Client: delete useless
|
2023-09-20 17:35:56 +03:00 |
|
Viktor Fomin
|
19e1b51887
|
Merge branch 'develop' into feature/split-invite
|
2023-09-19 14:04:18 +03:00 |
|
|
|
fb6d0b06a9
|
edited 'Move to Trash' description
|
2023-09-19 12:29:04 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
gazizova-vlada
|
4d1fc192d0
|
Web:Client:Change translation Account list to List accounts.
|
2023-09-18 18:43:18 +03:00 |
|
|
|
2f1f2ef4fa
|
Web: Client: fix long text in theme edit button
|
2023-09-18 13:28:32 +02:00 |
|
Viktor Fomin
|
71e5179f64
|
Merge branch 'develop' into feature/split-invite
|
2023-09-15 18:12:30 +03:00 |
|
Viktor Fomin
|
671ed5dadf
|
Client: delete useless translations
|
2023-09-13 15:51:15 +03:00 |
|
|
|
ad93ede662
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2023-09-13 15:44:16 +03:00 |
|
Akmal Isomadinov
|
bbd40500c9
|
Merge branch 'develop' into feature/cron
|
2023-09-13 16:11:13 +05:00 |
|
|
|
b3470375cb
|
Web: Fix translations to other languages
|
2023-09-12 17:57:27 +04:00 |
|
|
|
675590854c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-12 15:18:27 +03:00 |
|
|
|
8283538b52
|
Merge pull request #1578 from ONLYOFFICE/feature/new-files-dialog
feature/new-files-dialog
|
2023-09-12 14:09:20 +04:00 |
|
gazizova-vlada
|
d0ce4eb38e
|
Web:Client:Change MarkAsRead to Viewed.
|
2023-09-12 13:00:15 +03:00 |
|
|
|
21fd5aa9d5
|
Merge branch 'develop' into feature/cron
|
2023-09-11 12:34:41 +04:00 |
|
|
|
315dc26b6e
|
Fix EnDublicatesByContentTest issue (replaced key)
|
2023-09-08 19:00:12 +04:00 |
|
