|
1cb0345483
|
Web: Moved translations to Common file (bg).
|
2022-03-10 17:26:47 +03:00 |
|
|
ca45ca77d7
|
Web: Moved translations to Common file (cs).
|
2022-03-10 17:25:20 +03:00 |
|
|
685e7e0193
|
Web: Moved translations to Common file (de).
|
2022-03-10 17:18:26 +03:00 |
|
|
9a4715fad7
|
Web: Moved translations to Common file (el).
|
2022-03-10 17:10:09 +03:00 |
|
|
5d4a54e1ce
|
Web: Moved translations to Common file (en).
|
2022-03-10 16:57:56 +03:00 |
|
|
a403bdbf03
|
Web: Moved translations to Common file (es).
|
2022-03-10 16:56:15 +03:00 |
|
|
7b5f653ead
|
Web: Moved translations to Common file (fi).
|
2022-03-10 16:54:21 +03:00 |
|
|
a94be67b16
|
Web: Moved translations to Common file (fr).
|
2022-03-10 16:52:35 +03:00 |
|
|
84f1a05ba3
|
Web: Moved translations to Common file (it).
|
2022-03-10 16:50:04 +03:00 |
|
|
9467226e09
|
Web: Moved translations to Common file (ja).
|
2022-03-10 16:48:45 +03:00 |
|
|
05da08892d
|
Web: Moved translations to Common file (ko).
|
2022-03-10 16:47:13 +03:00 |
|
|
e15108a62c
|
Web: Moved translations to Common file (lo).
|
2022-03-10 16:45:08 +03:00 |
|
|
0efd8d1126
|
Web: Moved translations to Common file (lv).
|
2022-03-10 16:43:34 +03:00 |
|
|
d2e1f04d8a
|
Web: Moved translations to Common file (nl).
|
2022-03-10 16:41:37 +03:00 |
|
|
56b4eece3d
|
Web: Moved translations to Common file (pl).
|
2022-03-10 16:39:54 +03:00 |
|
|
4eae2cdb3c
|
Web: Moved translations to Common file (pt).
|
2022-03-10 16:38:25 +03:00 |
|
|
34e1f835fe
|
Web: Moved translations to Common file (pt-BR).
|
2022-03-10 16:36:25 +03:00 |
|
|
8ba131d52d
|
Web: Moved translations to Common file (ro).
|
2022-03-10 16:33:31 +03:00 |
|
|
0c9713c65b
|
Web: Moved translations to Common file (sk).
|
2022-03-10 16:31:02 +03:00 |
|
|
bff2518bf9
|
Web: Moved translations to Common file (sl).
|
2022-03-10 16:28:38 +03:00 |
|
|
500945a6da
|
Web: Moved translations to Common file (tr).
|
2022-03-10 16:26:11 +03:00 |
|
|
e663d59aeb
|
Web: Moved translations to Common file (vi).
|
2022-03-10 16:25:27 +03:00 |
|
|
297394f359
|
Web: Moved translations to Common file (uk).
|
2022-03-10 16:24:18 +03:00 |
|
|
8080e416df
|
Web: Moved translations to Common file (zh-CN).
|
2022-03-10 16:23:06 +03:00 |
|
|
7bca87c34d
|
Web: Moved translations to the Common (ru).
|
2022-03-10 16:21:24 +03:00 |
|
|
f07aa0a183
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
|
2022-02-25 16:05:43 +03:00 |
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
|
50137b8c12
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-10 11:25:12 +03:00 |
|
|
ef87651b3a
|
Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm"
|
2022-02-10 11:25:00 +03:00 |
|
|
caa4db9790
|
add new lines (Files-Home)
|
2022-02-10 11:10:35 +03:00 |
|
|
804c9c9547
|
Web: Locales: EN: Added translation for menu categories
|
2022-02-09 16:46:28 +03:00 |
|
|
33c0e49705
|
add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel
|
2022-02-07 16:44:59 +03:00 |
|
|
8250b774cd
|
add new lines (UploadPanel), add new file (Home) (de, es, fr, it, zh-CN, ro)
|
2022-02-07 16:23:43 +03:00 |
|
|
40d56075f1
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# common/services/ASC.Data.Backup/Startup.cs
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/public/locales/en/Settings.json
# products/ASC.Files/Client/public/locales/ru/Settings.json
# products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/webpack.config.js
|
2022-02-07 12:40:50 +03:00 |
|
|
f5653810eb
|
add lo (ConvertPasswordDialog)
|
2022-01-31 16:52:38 +03:00 |
|
|
cc6e7ec80a
|
add translations for ConvertPasswordDialog (de, fr, it, es, ja, zh-CN)
|
2022-01-27 11:33:20 +03:00 |
|
|
cfb5705f60
|
edit Convert (fr, es, it, ro)
|
2022-01-24 16:45:11 +03:00 |
|
|
0cc9ce3f19
|
Web: Files: Deleted useless translation.
|
2022-01-24 16:18:25 +03:00 |
|
|
83e7b1193b
|
Web: Files: Fixed translation.
|
2022-01-24 14:03:29 +03:00 |
|
|
226dd96d0c
|
Web: Files: Fixed translation.
|
2022-01-24 13:15:46 +03:00 |
|
|
e1d07c5699
|
Web: Files: Added English translation.
|
2022-01-21 13:45:52 +03:00 |
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +03:00 |
|
|
34441d6335
|
Web: Moved some translations from Files to COMMON for asc-web-components
|
2022-01-21 11:49:16 +03:00 |
|
|
5c34a2b770
|
Web: Files: Changed file encoding to UTF8 with BOM
|
2022-01-20 22:05:59 +03:00 |
|
|
1392659acf
|
Web: Tests: Fix UselessTranslationKeysTest issues: removed useless keys: "TitleCreated", "TitleModified", "TitleUploaded"
|
2022-01-20 18:38:25 +03:00 |
|
|
7824786afc
|
Web: Removed useless translation key "SelectFolder"
|
2022-01-20 18:25:12 +03:00 |
|
|
525439ff72
|
Web: Renamed translations key switchToThumbnails to SwitchToThumbnails
|
2022-01-20 18:21:01 +03:00 |
|
|
63243003ec
|
Web: Removed duplicate
|
2022-01-20 17:02:15 +03:00 |
|
|
9b593d5c79
|
Web: Fix translations issues by tests
|
2022-01-20 16:56:32 +03:00 |
|
|
99105f5d73
|
Merge branch 'develop' into component-tooltips
# Conflicts:
# packages/asc-web-components/icon-button/index.js
# products/ASC.Files/Client/public/locales/de/Article.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/en/Article.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/fr/Article.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/Article.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/pt-BR/Article.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Article.json
# products/ASC.Files/Client/public/locales/ro/Translations.json
# products/ASC.Files/Client/public/locales/ru/Article.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/sk/Article.json
# products/ASC.Files/Client/public/locales/sk/Translations.json
|
2022-01-20 15:45:24 +03:00 |
|