Commit Graph

2219 Commits

Author SHA1 Message Date
65936fb856 Web: People: fixed translations 2021-06-08 15:25:26 +03:00
6a06707d18 Web: People: fixed translations 2021-06-08 15:19:49 +03:00
27e6226e66 Web: People: get backupCodes from tfa store 2021-06-08 14:19:55 +03:00
71564c7348 Web: People: deleted duplicate key 2021-06-08 13:35:31 +03:00
ffbbcc6ac2 Web: People: change trans on t 2021-06-08 13:34:41 +03:00
af6d7cd160 Web: People: fixed 2021-06-08 13:26:04 +03:00
ffb5dace5d Web: People: fixed 2021-06-08 12:28:51 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth 2021-06-07 11:54:06 +03:00
43de25b62a Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth 2021-06-02 23:57:00 +03:00
bd299a718b Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-06-02 13:55:19 +03:00
62ac315c8d Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring 2021-06-02 13:55:11 +03:00
f9e53d038f Web: People: fixed onDeletePersonalDataClick 2021-06-02 13:46:25 +03:00
d187b2767a Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-06-02 12:04:36 +03:00
60a7e84f60 Web: ProfileAction : Added locale usage for DateInput 2021-06-02 12:04:26 +03:00
33ccfa550b Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
2021-06-02 11:53:29 +03:00
c4a89a9e50 Web: People: fixed translation of "Birthdate", duplicated translation of "Birthdate" moved to a common file 2021-06-02 11:49:35 +03:00
Artem Tarasov
5df2788783 Web: added new translation key "SuccessDeletePersonalData" for "delete-personal-data" in context options 2021-06-02 11:36:23 +03:00
Artem Tarasov
883130c002 Web: added new translation key "ChangePhoneInstructionSent" for ChangePhoneDialog 2021-06-02 11:23:02 +03:00
95dbfb8c5c Merge branch 'develop' into feature/translations 2021-06-01 20:02:48 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
de98856728 Web: Tests: Added new 'sk' translations; 2021-06-01 11:21:39 +03:00
8e532bc8b9 Web: Tests: Added new 'ro' translations; 2021-06-01 11:20:14 +03:00
3d62da4422 Web: Tests: Added new 'pt-BR' translations; 2021-06-01 11:19:13 +03:00
c5a5072aa7 Web: Tests: Added new 'lo' translations; 2021-06-01 11:17:19 +03:00
8eb62d8079 Web: Tests: Added new 'it' translations; 2021-06-01 11:15:24 +03:00
a0fc465678 Web: Tests: Added new 'fr' translations; 2021-06-01 11:13:50 +03:00
e3b5ac774a Web: Tests: Added new 'de' translations; 2021-06-01 10:56:47 +03:00
7beccd192b Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue) 2021-05-31 20:33:12 +03:00
e2b9561d7b Web: Rewritten all json translation files with sorting of properties alphabetically 2021-05-31 18:34:15 +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
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
7026b19db0 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-31 09:23:53 +03:00
a454c6a210 Web: People: commentary changes 2021-05-30 22:40:27 +03:00
b88ad2480d Web: People: fixed by layouts 2021-05-30 17:50:52 +03:00
86b2d7547d Web: People: commentary changes 2021-05-30 17:26:54 +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
d585c0a785 Web: Bumped version to 0.1.10 2021-05-29 21:26:13 +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
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
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
Artem Tarasov
95aa0153d6 Web: fixed ns 2021-05-27 11:00:13 +03:00