Commit Graph

98 Commits

Author SHA1 Message Date
ab0404e1dc Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages 2022-04-07 17:32:15 +03:00
b7d45c2e66 Merge branch 'feature/trusted-mail' of github.com:ONLYOFFICE/AppServer into feature/ip-security 2022-04-07 17:24:39 +03:00
eeac7377be Web: Client: delete useless 2022-04-07 16:19:08 +03:00
2962c0ca38 Merge branch 'feature/trusted-mail' of github.com:ONLYOFFICE/AppServer into feature/ip-security 2022-04-07 04:10:15 +03:00
c6b81c6e94 Merge branch 'feature/virtual-rooms-1.2' into feature/trusted-mail 2022-04-06 21:32:36 +03:00
1755d03b4e Web:Studio:Styling Settings. Added locales en PortalRenamingMobile. 2022-04-06 17:07:48 +03:00
92899d14df Web: Client: add settings translate 2022-04-06 17:04:49 +03:00
48240c6f77 Web:Studio:Added locales en PleaseNote, PleaseNoteDescription, PortalRenaming, PortalRenamingDescription, PortalRenamingDescriptionTooltip, PortalRenamingLabelText, PortalRenamingSettingsTooltip. Added tooltip PortalRenamingTooltip. 2022-04-06 12:37:15 +03:00
08d7647bbe Web: Client: add settings translates 2022-04-06 12:24:35 +03:00
1cb67aacdb Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-06 11:32:46 +03:00
5e890f81c9 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-05 23:05:08 +03:00
7deb741978 Web:Studio:Added SuccessfullySavePortalNameMessage locales en. 2022-04-05 23:02:45 +03:00
331ab31e02 Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
2022-04-05 11:18:28 +03:00
f677b0e484 Web: Client: delete space 2022-04-04 17:11:44 +03:00
d866dfecfb Web: Client: fix 2022-04-04 16:59:38 +03:00
bd7ebe0238 Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-04 12:35:36 +03:00
b4533f6089 Web: Client: fix settings translates 2022-04-04 11:22:07 +03:00
30f16c8ab0 Web: Client: add settings translates 2022-04-02 22:35:01 +03:00
a62959aba1 Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail 2022-04-02 22:02:26 +03:00
b4f7c427f9 Web: Client: add settings translates 2022-04-02 21:10:58 +03:00
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
c4c02698d3 Web:Studio:Changed the name "Time Zone" to "Time zone". 2022-03-16 11:32:41 +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
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
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
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
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
5ff07a8293 Web: Fix UselessTranslationKeysTest translation issues 2021-11-12 20:46:04 +03:00
d8cf12f9d7 translations 2021-11-12 19:00:01 +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
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