|
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 |
|
|
33c0e49705
|
add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel
|
2022-02-07 16:44:59 +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 |
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
86e965d779
|
Web: Fix translations
|
2021-12-22 18:12:04 +03:00 |
|
|
1d49c9dc51
|
Web: Client: Fixed spelling errors
|
2021-12-21 20:25:59 +03:00 |
|
|
156fbada6d
|
edit translations bg
|
2021-12-16 17:13:44 +03:00 |
|
|
93cbab055c
|
edit lo
|
2021-12-16 15:59:02 +03:00 |
|
|
b5eeac9a47
|
edit translations
|
2021-12-14 12:43:10 +03:00 |
|
gectokot
|
1ea64c8701
|
Web: Studio: Homepage: Now displayName is used in greeting message
|
2021-12-14 11:14:08 +03:00 |
|
gectokot
|
8ee3ef5bd5
|
Web: Studio: Homepage: Changed logic for greeting message
|
2021-12-13 16:12:52 +03:00 |
|
gectokot
|
0a53e3bd7d
|
Web: Studio: Homepage: Refactoring
|
2021-12-13 14:50:33 +03:00 |
|
gectokot
|
d32dc40034
|
Web: Studio: Fixes, refactoring
|
2021-12-10 17:22:03 +03:00 |
|
gectokot
|
49061c8e84
|
Web: Studio: Homepage: Changed title to new greeting message, swapped tiles and illustration
|
2021-12-10 10:26:13 +03:00 |
|
|
878df989d9
|
Web: Renamed folder zh_CN to zh-CN
|
2021-12-09 21:51:05 +03:00 |
|
|
e8af856c26
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-09 13:55:55 +03:00 |
|
|
41681d0c94
|
Server: Files: Configuration: Fixed logo type for filling form mode
|
2021-12-09 12:45:52 +03:00 |
|
|
20a17fca96
|
rename pt
|
2021-12-07 16:50:09 +03:00 |
|
|
f9c92a6bd7
|
edit pt_PT
|
2021-12-07 12:40:49 +03:00 |
|
|
7973639195
|
edit vi
|
2021-12-07 10:37:30 +03:00 |
|
|
ee935ec401
|
edit az
|
2021-12-06 18:21:35 +03:00 |
|
|
6ef7c23bac
|
add pt_PT
|
2021-12-06 18:20:48 +03:00 |
|
|
9126ea393d
|
add uk
|
2021-12-06 17:29:19 +03:00 |
|
|
40c5a0d6b2
|
add az
|
2021-12-06 17:11:54 +03:00 |
|
|
a059fc9b7c
|
edit translations
|
2021-12-06 13:05:31 +03:00 |
|
|
af2e95dfd7
|
edit cs
|
2021-12-06 11:28:11 +03:00 |
|
|
edff6e2f40
|
update pl
|
2021-12-01 18:32:54 +03:00 |
|
|
870f05fc83
|
add el
|
2021-12-01 17:42:50 +03:00 |
|
|
7823b9804c
|
update bg
|
2021-12-01 14:36:04 +03:00 |
|
|
d5d87a679f
|
update translations
|
2021-11-30 12:35:00 +03:00 |
|
|
43d04b28de
|
edit uk
|
2021-11-29 15:27:40 +03:00 |
|
|
5a5169b391
|
edit cz
|
2021-11-29 15:22:40 +03:00 |
|
|
bbe874054e
|
update translations
|
2021-11-29 12:37:32 +03:00 |
|
|
2c6e0d45bc
|
Web: Fix wrong braces of variables inside translation files
|
2021-11-13 19:07:48 +03:00 |
|
|
c7c7267a9a
|
Test: Added new WrongTranslationVariablesTest and fix it's issues
|
2021-11-13 19:03:10 +03:00 |
|
|
623313e4be
|
Web: Restored missing 'ru' translations
|
2021-11-12 21:14:44 +03:00 |
|
|
5ff07a8293
|
Web: Fix UselessTranslationKeysTest translation issues
|
2021-11-12 20:46:04 +03:00 |
|
|
d8cf12f9d7
|
translations
|
2021-11-12 19:00:01 +03:00 |
|
|
cd897aa8f1
|
Web: About: Fix DublicatesByContentTest translation issue
|
2021-11-08 15:33:27 +03:00 |
|
|
1c38f29440
|
Web: Added new logo files and setup is_retina cookie for better icons inside Editor on retina resolution
|
2021-10-13 15:19:31 +03:00 |
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +03:00 |
|
|
f06e3c076b
|
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries
|
2021-09-13 12:54:59 +03:00 |
|
|
c0cd0ea269
|
fix Bug 51444
|
2021-09-07 22:42:31 +03:00 |
|
|
514387652e
|
Web: Client: fixed about
|
2021-08-05 12:30:14 +03:00 |
|
|
fb922f04d6
|
Web: Client: change About translations
|
2021-08-03 16:01:31 +03:00 |
|
|
1c24e809fc
|
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 17:41:07 +03:00 |
|
|
537fe50394
|
Web: Client: About: fixed logo
|
2021-07-09 17:40:53 +03:00 |
|
|
0297620036
|
Fix SnackBar usage
|
2021-07-09 17:25:20 +03:00 |
|
|
b1662e7ac6
|
Web: Init maintenance displaying
|
2021-06-22 13:41:11 +03:00 |
|
Artem Tarasov
|
f181a491fb
|
Merge branch 'develop' into bugfix/fixed-styles
|
2021-06-11 14:56:52 +03:00 |
|