Commit Graph

306 Commits

Author SHA1 Message Date
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
6bfcf86461 update es 2022-05-16 18:48:11 +03:00
3818790d1c update ru, fr 2022-05-16 18:01:38 +03:00
4264a0da16 update fr 2022-05-16 17:04:04 +03:00
5915c6e23e update es 2022-05-16 12:51:04 +03:00
a962d58b31 Web: Translation: Fix WrongTranslationVariablesTest issues 2022-05-13 19:44:05 +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
3bf09b4353 add new es-files 2022-05-13 18:22:32 +03:00
294a449d78 add new ru-keys, edit en 2022-05-13 17:30:51 +03:00
b3e1014a71 Web: Translations: Fix ParseJsonTest issues 2022-05-13 14:29:56 +03:00
f76d024042 Web: Settings: Added placeholder 2022-05-13 11:51:56 +03:00
298587ca46 Web: Settings: Added 'AutoSavePeriodHelp' key en translation (NotFoundKeysTest issue fix) 2022-05-13 11:41:10 +03:00
7fd2245587 Web: Translation: Fix NotFoundKeysTest issue -> "White label" 2022-05-13 10:51:16 +03:00
b2474c409d Web: Translations: Moved "Common" key from "Studio" to "Common" and removed useless "Documents" key (test issue fix) 2022-05-11 19:03:33 +03:00
781b0eb3e4 Web: Translations: Moved "Info" key from "studio" to "Common": (test issue fix) 2022-05-11 17:11:52 +03:00
4ae8a10f7f Web: Translations: Moved "AccessRights" key from "studio" to "Common": (test issue fix) 2022-05-11 16:51:37 +03:00
3f4a828771 Web:Studio:Added placeholder "EnterName". 2022-04-29 12:52:06 +03:00
1f9fa82051 Web:Studio:Added validation for setting Portal Renaming. Added locales en "PortalNameEmpty", "PortalNameIncorrect", "PortalNameLength". 2022-04-21 18:07:26 +03:00
b20f4cfed1 Web: Backup: Added new translation. 2022-04-10 13:14:40 +03:00
eeac7377be Web: Client: delete useless 2022-04-07 16:19:08 +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
48240c6f77 Web:Studio:Added locales en PleaseNote, PleaseNoteDescription, PortalRenaming, PortalRenamingDescription, PortalRenamingDescriptionTooltip, PortalRenamingLabelText, PortalRenamingSettingsTooltip. Added tooltip PortalRenamingTooltip. 2022-04-06 12:37:15 +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
6fef466d23 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength 2022-04-04 22:12:05 +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
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
d44921093f Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength 2022-04-02 16:19:23 +03:00
8a8cc4d1f3 Web: Client: add settings translates 2022-04-01 14:59:55 +03:00
d5459374b9 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign 2022-03-31 19:05:05 +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
90a3513630 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign 2022-03-31 15:47:47 +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