Commit Graph

12368 Commits

Author SHA1 Message Date
3e6cc50323 Api: error custom messages 2021-05-31 18:08:55 +03:00
f78742ac39 Web: Fix UselessModuleTranslationKeysTest issues 2021-05-31 17:35:25 +03:00
6b56b539c5 Web: Update EN language 2021-05-31 17:10:34 +03:00
afeec1942f Files: fixed news request 2021-05-31 15:46:02 +03:00
8d88dbae2c Jenkins: fix test 2021-05-31 14:25:14 +03:00
d3fb9f8384 fix 2021-05-31 14:08:13 +03:00
570ede7bba Merge branch 'develop' into feature/11.5.2
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
1a6d18fcdc Files: fixed start docs 2021-05-31 12:37:13 +03:00
0be4e07865 SsoAuth: 2e37dcd0 2021-05-31 11:35:42 +03:00
c8c5b49d1c Files: thumbnails. 2e37dcd0 2021-05-30 21:52:32 +03:00
74064fc76d Merge branch 'develop' into feature/translations 2021-05-29 21:59:02 +03:00
72527ccded Merge branch 'master' into develop
# Conflicts:
#	lerna.json
#	package.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-05-29 21:57:42 +03:00
06e40a9459
Merge pull request #267 from ONLYOFFICE/hotfix/v0.1.10
Hotfix/v0.1.10
2021-05-29 21:43:11 +03:00
d585c0a785 Web: Bumped version to 0.1.10 2021-05-29 21:26:13 +03:00
4b48bb1b90 Web: Added version and bump script 2021-05-29 21:20:44 +03:00
440638a18d Audit: fix request 2021-05-29 17:55:36 +03:00
Artem Tarasov
215c933d9e Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json" 2021-05-28 13:28:40 +03:00
12bcf816b5 Web: Client: added new translations keys 2021-05-28 12:09:10 +03:00
04fd99a01e Web: Test: Added new NotTranslatedCommonKeysTest 2021-05-28 11:49:05 +03:00
953602b98b Web: Test: Fix "Translations:" issues 2021-05-28 11:35:55 +03:00
d0bbcb8d5a Files: moved from 08a01422 2021-05-28 11:22:35 +03:00
d0d6b4e3e2 Web: Test: Added new UselessModuleTranslationKeysTest 2021-05-28 10:58:27 +03:00
527a650601 WebStudio: resources 2021-05-27 21:30:15 +03:00
bda786f844 WebStudio: moved from 08a01422 2021-05-27 20:13:24 +03:00
d07671c708 Web: Tests: Added more info on test NotTranslatedKeysTest() assertion 2021-05-27 16:37:38 +03:00
e18f902c00 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-27 15:51:51 +03:00
224cbc4b65 Web: Test: Added collection of ModuleFolders for future tests 2021-05-27 15:51:44 +03:00
e4f5da1f32 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-27 12:42:53 +03:00
f075863903 Web: Fixed FullDublicatesTest for "LblInviteAgain" translation key, key renamed for Article 2021-05-27 12:42:44 +03:00
90821d3fe1 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-27 12:15:53 +03:00
a9ddfc0a4a Web: Tests: Added more info on test NotAllLanguageTranslatedTest() assertion 2021-05-27 12:15:45 +03:00
f5909cc0e0 Web: Temporary removed minimal translations lng files 2021-05-27 12:14:36 +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
3536be88c2 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-27 11:51:39 +03:00
00957a65ad Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version" 2021-05-27 11:51:32 +03:00
b57da432bf Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common. 2021-05-27 11:50:11 +03:00
7d1af40f6a Web: Fix translation tests issues 2021-05-27 11:27:27 +03:00
30cf4f8cde Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-27 11:14:31 +03:00
25ac98e272 Merge branch 'develop' into feature/translations
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/DeleteDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
2021-05-27 11:13:41 +03:00
4321873f00 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-27 11:03:19 +03:00
178767a2b5 Web: Files: fixed translations 2021-05-27 11:03:12 +03:00
Artem Tarasov
95aa0153d6 Web: fixed ns 2021-05-27 11:00:13 +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
6ec9db8870 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-26 18:02:11 +03:00
Artem Tarasov
8d9655fa0b 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-26 17:59:52 +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
fe18e7e55c Web: moved translation key "LblSelect" 2021-05-26 17:53:36 +03:00
151ffc7b26 Web: moved translation key "Active" 2021-05-26 17:46:09 +03:00
e437c7a035 Web: moved translationKeys "Size", "View", "Review" 2021-05-26 17:37:03 +03:00