|
|
8a8cc4d1f3
|
Web: Client: add settings translates
|
2022-04-01 14:59:55 +03:00 |
|
|
|
9929a88f9e
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 19:03:50 +03:00 |
|
|
|
710df955dc
|
Web:Studio:Added upper case.
|
2022-03-31 18:24:03 +03:00 |
|
|
|
b26f0e3423
|
Web: Client: add settings translates
|
2022-03-31 13:12:18 +03:00 |
|
|
|
e87aa1a80f
|
Web: Client: delete useless
|
2022-03-31 12:33:46 +03:00 |
|
|
|
a7b00a4286
|
Web: Client: add settings translates
|
2022-03-31 01:10:06 +03:00 |
|
|
|
eff126236a
|
Web: Client: add settings translates
|
2022-03-30 20:56:56 +03:00 |
|
|
|
bd122ed006
|
Web: Client: add settings translates
|
2022-03-30 19:39:34 +03:00 |
|
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
|
|
c001de8f74
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-16 13:03:29 +03:00 |
|
|
|
c4c02698d3
|
Web:Studio:Changed the name "Time Zone" to "Time zone".
|
2022-03-16 11:32:41 +03:00 |
|
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
|
|
aa5fde9b18
|
Web:Studio:Changed translation of CustomizationDescription for locales ru. Added translation of CustomizationDescription for locales en.
|
2022-03-10 17:06:50 +03:00 |
|
|
|
48c35f981b
|
Web:Studio:Added locales en for CustomTitlesTooltip tooltip.
|
2022-03-10 16:18:46 +03:00 |
|
|
|
5655f57acd
|
Web:Studio:Changed CustomTitlesSettingsDescription and LanguageAndTimeZoneSettingsDescription for locales en, pt-BR, ru, de, fr, it. Added CustomTitlesWelcome for locales en, pt-BR, de, fr, it.
|
2022-03-09 12:16:04 +03:00 |
|
|
|
4965f9ffb6
|
Web:Studio:Added a CustomizationDescription in the Customization component. Added ru locales for CustomizationDescription.
|
2022-03-04 09:29:12 +03:00 |
|
|
|
f3afd79a3f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
# packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
# packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/components/PageLayout/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/context-menu/styled-context-menu.js
# packages/asc-web-components/drop-down/index.js
# packages/asc-web-components/link-with-dropdown/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/themes/dark.js
# products/ASC.Files/Client/public/images/files.menu.svg
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/QuickButtons.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.People/Client/public/images/people.menu.svg
# products/ASC.People/Client/src/components/GroupSelector/index.js
# products/ASC.People/Client/src/components/PeopleSelector/index.js
# products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
# products/ASC.People/Client/src/pages/Home/index.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
|
2022-03-01 13:50:26 +03:00 |
|
|
|
32868de412
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# public/locales/de/Common.json
|
2022-02-22 13:53:00 +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 |
|
|
|
9b1b47ae12
|
Web: Client: fix translate
|
2022-02-21 18:43:35 +03:00 |
|
|
|
efd4ade61f
|
Web: Client: add translate
|
2022-02-21 18:27:35 +03:00 |
|
|
|
11f9c2727b
|
Web:Studio:Added translation of CustomTitlesTooltip. Added keys CustomTitlesFrom, CustomTitlesHeader, CustomTitlesSettingsTooltip, CustomTitlesSettingsTooltip, CustomTitlesText, CustomTitlesWelcome for locales ru.
|
2022-02-14 00:00:06 +03:00 |
|
|
|
8f52c452e8
|
Web:Studio:Added a new key "LanguageTimeSettingsTooltipDescription" for locales fr, de, it, pr-BR.
|
2022-02-09 21:09:15 +03:00 |
|
|
|
3429b83f3f
|
Web:Studio:Added a new key "LanguageTimeSettingsTooltipDescription" to the LanguageTimeSettingsTooltip component and for locales en, ru.
|
2022-02-09 20:41:44 +03:00 |
|
|
|
099387672a
|
Web: Client: add welcome translate
|
2022-02-09 15:23:15 +03:00 |
|
|
|
2d64c5950f
|
Web:Studio:Added translations of "DescriptionTimeLanguage" and "LanguageTimeSettingsTooltip" for locales de.
|
2022-02-09 12:57:17 +03:00 |
|
|
|
f9799f8d29
|
Web:Studio:Added translations of "DescriptionTimeLanguage" and "LanguageTimeSettingsTooltip" for locales fr.
|
2022-02-09 11:50:41 +03:00 |
|
|
|
b866e5cccc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-08 18:17:41 +03:00 |
|
|
|
51176cae7d
|
Web:Studio:Added common-tooltips file and LanguageTimeSettingsTooltip component. Added translations of "DescriptionTimeLanguage" and "LanguageTimeSettingsTooltip" for locales en, ru.
|
2022-02-08 17:43:32 +03:00 |
|
Timofey
|
cbb18e87d2
|
Web:Client: change logo in dark theme for about page
|
2022-02-08 18:31:55 +08: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 |
|
