|
|
1891633903
|
Merge branch 'develop' into feature/sso
|
2022-02-24 11:54:37 +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 |
|
Dmitry Kulak
|
eee727ccbf
|
Web: Studio: SSO: Basic page markup
|
2022-01-28 17:36:24 +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 |
|
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
|
49061c8e84
|
Web: Studio: Homepage: Changed title to new greeting message, swapped tiles and illustration
|
2021-12-10 10:26:13 +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 |
|
|
|
fb922f04d6
|
Web: Client: change About translations
|
2021-08-03 16:01:31 +03:00 |
|
|
|
a3c5eea477
|
Web: Client: deleted unused translations key
|
2021-06-09 17:16:37 +03:00 |
|
|
|
5ea562e996
|
Web: Client: fixed translations
|
2021-06-09 02:43:07 +03:00 |
|
|
|
b7ce4a35e7
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
|
2021-06-09 00:23:12 +03:00 |
|
|
|
d881c48b4b
|
Web: Client: fixed translations
|
2021-06-08 15:20:03 +03:00 |
|
|
|
ce35405190
|
Web: Client: deleted duplicate key
|
2021-06-03 20:25:35 +03:00 |
|
|
|
c6f85ef4ce
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-02 23:57:00 +03:00 |
|
|
|
43ff5210bf
|
Web: Client: access portal page refactoring
|
2021-06-02 20:30:54 +03:00 |
|
|
|
11640e211c
|
Web: Confirm : Added usage for translation key "ConfirmOwnerPortalSuccessMessage"
|
2021-06-02 11:33:26 +03:00 |
|
|
|
e2b9561d7b
|
Web: Rewritten all json translation files with sorting of properties alphabetically
|
2021-05-31 18:34:15 +03:00 |
|
|
|
6b56b539c5
|
Web: Update EN language
|
2021-05-31 17:10:34 +03:00 |
|
|
|
889c99243e
|
Web: Client: added translations
|
2021-05-31 13:05:19 +03:00 |
|
|
|
66f36bf0a6
|
Web: Client: added empty screen
|
2021-05-31 12:51:23 +03:00 |
|
|
|
f0f6400563
|
Web: Client: commentary changes
|
2021-05-30 22:40:44 +03:00 |
|
Artem Tarasov
|
102f26ed3c
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-27 11:58:53 +03:00 |
|
Artem Tarasov
|
46d80f7b34
|
Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json"
|
2021-05-27 11:57:20 +03:00 |
|
|
|
b57da432bf
|
Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common.
|
2021-05-27 11:50:11 +03:00 |
|
Artem Tarasov
|
a12ab6c970
|
Web: moved translationKeys "Error520Text", "ErrorInitWizardHeader" to "static/locales/{lng}/Common.json"
|
2021-05-26 18:30:57 +03:00 |
|
Artem Tarasov
|
d5ddeb4c42
|
Web: moved translation keys "AboutCompanyVersion", "Version" to "static/locales/{lng}/Common.json"
|
2021-05-26 17:58:05 +03:00 |
|
|
|
541b14c8fe
|
Web: moved translationKeys "DisableUserButton", "NotFoundLanguage"
|
2021-05-26 16:40:02 +03:00 |
|
|
|
bf63128496
|
Web: moved translationKeys "LastName", "Language", "Mail"
|
2021-05-26 16:28:58 +03:00 |
|
|
|
2c5b95e352
|
Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage"
|
2021-05-26 16:06:40 +03:00 |
|
|
|
252fef7ae3
|
Web: moved translationKeys "AboutCompanyTitle", "ClearButton", "CommunityProduct", "EmptyFieldError"
|
2021-05-26 14:36:58 +03:00 |
|
|
|
3c1e322406
|
Web: moved translationKeys "Profile", "RecoverErrorMessage"
|
2021-05-26 14:21:11 +03:00 |
|
|
|
49bf2618d2
|
Web: moved translationKeys "Enable", "ProviderLoginError", "ProviderNotConnected"
|
2021-05-26 13:35:11 +03:00 |
|
|
|
4228b0a5dc
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-25 17:26:12 +03:00 |
|
|
|
2452ec957d
|
Web: Moved translationKeys "Enable" to "/static/locales/{lng}/Common.json"
|
2021-05-25 17:16:09 +03:00 |
|
Artem Tarasov
|
671f98519a
|
Web: Moved translation Keys "ContinuteButton" to "/static/locales/{lng}/Common.json"
|
2021-05-25 12:49:56 +03:00 |
|
|
|
60679a5da7
|
Web: Moved translationKeys "Disabled", "Close"
|
2021-05-25 11:43:42 +03:00 |
|
|
|
e01af3fd20
|
Web: Moved translationKeys "AdminSettings" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:47:26 +03:00 |
|
|
|
a80890f7cc
|
Web: Moved translationKeys "Guest" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:40:26 +03:00 |
|
|
|
f94c19385f
|
Web: Moved translationKeys "Settings" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:31:41 +03:00 |
|
|
|
43e65a51d1
|
Web: Moved translationKeys "Next", "Previous", "PageOfTotalPage" and "CountPerPage" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:22:20 +03:00 |
|
|
|
b8dd8b3048
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-24 19:07:46 +03:00 |
|
|
|
1e954b15d7
|
Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:05:29 +03:00 |
|
|
|
4e32c53567
|
Web: Moved translationKeys "About" to Common.json
|
2021-05-24 18:36:31 +03:00 |
|
|
|
b8edf32f87
|
Web: Moved translationKeys "User", "Warning" to Common.json
|
2021-05-24 17:55:14 +03:00 |
|
|
|
c652209b49
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
|
2021-05-24 13:58:54 +03:00 |
|
Artem Tarasov
|
098e04891c
|
Web: deleted "WhiteLabel" translation key
|
2021-05-22 01:31:50 +03:00 |
|
Artem Tarasov
|
11166ed85a
|
Web: Client: fixed usage translation keys for Settings page
|
2021-05-21 18:37:16 +03:00 |
|
