Commit Graph

291 Commits

Author SHA1 Message Date
8612f14060 Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest 2022-05-25 18:01:38 +03:00
56152784de Web: Translations: Moved ReassignmentData from Reassign.json to Home.json (SingleKeyFilesTest issue fix) 2022-05-25 15:12:43 +03:00
70a6a44196 Web: Client: Disable PWA feature for mobile devices 2022-05-25 10:53:39 +03:00
7c3762ec9a edit translations 2022-05-24 18:29:25 +03:00
bed0e0d324 edit translations 2022-05-24 14:57:37 +03:00
42a6eccb84 edit translations (SpellCheck) 2022-05-23 18:07:29 +03:00
8c68b9fb40 edit translations (SpellCheck) 2022-05-22 13:36:45 +03:00
cb0879da10 update, edit translations 2022-05-20 13:48:47 +03:00
4541fa82d1 update translations (web, people) 2022-05-19 23:35:37 +03:00
b9e98fc3ad update translations (web) 2022-05-19 23:07:57 +03:00
011e24b306 update bg, pl, el 2022-05-19 18:06:13 +03:00
15f4fb324e update it, edit fr 2022-05-19 14:34:56 +03:00
874374d6ad update translations (People) 2022-05-18 17:35:19 +03:00
5f4d8b3b4c Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 12:58:24 +03:00
9180fbe42e update ko 2022-05-18 12:58:02 +03:00
90d4a68946 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/sl/Settings.json
2022-05-18 10:09:44 +03:00
9c824a0bfa Update translation - sl 2022-05-18 09:59:02 +03:00
f1130c51d9 update ro 2022-05-17 19:54:47 +03:00
232ca0355e edit es, fr 2022-05-17 16:48:47 +03:00
2ed7b96dd9 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 16:43:15 +03:00
cc9d934b13 update de, edit en (Confirm) 2022-05-17 16:42:54 +03:00
43da9f3949 Update translation - fi 2022-05-17 15:35:03 +03:00
be3362dbc3 update ja, edit fr, es, zh-CN (Settings) 2022-05-17 12:56:56 +03:00
606f0bca2a update es (Home), add zh 2022-05-16 21:05:58 +03:00
4264a0da16 update fr 2022-05-16 17:04:04 +03:00
5915c6e23e update es 2022-05-16 12:51:04 +03:00
d12c6f89e4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-13 19:33:23 +03:00
93a53092d6 Web: Translations: Fix UselessTranslationKeysTest issues 2022-05-13 19:33:16 +03:00
294a449d78 add new ru-keys, edit en 2022-05-13 17:30:51 +03:00
fc846860f9 Web: Translations: Moved "AddUsers" key from "Files,People" to "Common" (test issue fix) 2022-05-12 14:18:16 +03:00
58b7c5f678 Web: Translations: Moved "Location" key from "People" to "Common": (test issue fix) 2022-05-11 17:40:23 +03:00
b0450cf55b Web: Translations: Moved "Comments" key from "People" to "Common": (test issue fix) 2022-05-11 17:25:10 +03:00
f86afee2d5 Web: move t key from People to Common 2022-04-25 21:39:46 +03:00
Timofey Boyko
216ae27b25 Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme 2022-04-20 18:04:57 +03:00
Timofey Boyko
8306b01071 Web:People: add new keys 'DarkTheme', 'InterfaceTheme', 'LightTheme', 'SystemTheme' for EN and RU locales 2022-04-18 14:41:30 +03:00
b9a6c618bc Web: Moved Connect translation, added new translations 2022-04-15 16:39:57 +03:00
45d2a31d03 Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
#	public/locales/de/Common.json
2022-04-04 19:34:51 +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
3bbf82d918 add new lines 2022-03-09 19:07:24 +03:00
ee446c8e67 Web: moved translates to Common 2022-03-09 11:04:12 +03:00
Timofey Boyko
13f0b2dd5a Web:People: add new key 'OtherOperations' for ru and en locales 2022-03-05 19:43:35 +03:00
7ffaee6efc Web: moved translates to Common 2022-03-05 14:27:59 +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
Timofey
82e1af9828 Web:People: add new key for translations 2022-02-22 17:13:00 +08: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
7419eb87dc Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips) 2022-02-16 21:34:19 +03:00
Timofey
63568d0c4a Web:People: add new key 'AllGroups' for group selector for en and ru locales 2022-02-16 16:57:38 +08:00
Timofey
5cd639f63d Web:People: add new key 'AddHeadOfDepartment' for group action for en locale 2022-02-15 15:17:38 +08:00
Timofey
61a525eb8e Web:People: add new keys 'AddUsers' and 'AllUsers' for people selector for en and ru locales 2022-02-15 15:16:02 +08:00
Timofey
f42ce0eb52 Web:People: change people menu svg 2022-02-04 00:04:27 +08:00