]> git.mxchange.org Git - pizzaservice-war.git/commit
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 20 Aug 2017 12:00:21 +0000 (14:00 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 20 Aug 2017 20:02:05 +0000 (22:02 +0200)
commitbe38ab443ac99856f7648867b185d565fa1ac223
treedbf1da75a07f2f6f997bbccc447449e73d7ee642
parent5ad38f9ba12e47d905cf53f4df09a49b1e96ad52
Please cherry-pick:
- re-added (huh? was somehow lost?) user data form with user name and password
- moved notice from user (old place) to contact ("new" place) as it was
  previously double and in user obsolete, let all contacts have at least one
  email address
- renamed i18n string accordingly (naming-convention)

Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl