gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Merge branch 'fix-4030' into 'stable-3.1'

Till Brehm

2016-07-21 4f8673d1eef39fde0e5d1a3ca6580f396f14ff63

refs
author	Till Brehm <tbrehm@ispconfig.org>
	Thursday, July 21, 2016 03:20 -0400
committer	Till Brehm <tbrehm@ispconfig.org>
	Thursday, July 21, 2016 03:20 -0400
commit	4f8673d1eef39fde0e5d1a3ca6580f396f14ff63
tree	016d0dc39b0b33bff7b38fbfa517f89fdc9b4def tree \| zip \| gz
parent	6c9798e50379cb35d75a941073070662a603c3ea view \| diff 8685ef0fd9e941a63c1882a6766fb90fb6cc9643 view \| diff

Merge branch 'fix-4030' into 'stable-3.1'

Prevent password managers to overwrite passwords (fixes #4030)

Prevent password managers to overwrite passwords in reseller / client and mailbox (fixed #4030)

See merge request !380

27 files modified

	interface/web/client/lib/lang/en_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/nl_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/nl_reseller.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_edit_address.htm	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/reseller_edit_address.htm	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fr_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hr_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hu_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/id_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/it_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ja_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/nl_mail_user.lng	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pl_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pt_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ro_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ru_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/se_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/sk_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/tr_mail_user.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_user_mailbox_edit.htm	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mailuser/lib/lang/en_mail_user_password.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mailuser/lib/lang/nl_mail_user_password.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mailuser/templates/mail_user_password_edit.htm	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/themes/default/assets/javascripts/ispconfig.js	10 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/themes/default/assets/javascripts/ispconfig.min.js	2 ●●●●● diff \| view \| raw \| blame \| history