ISPConfig3 devel
parent: 4fa79c | patch | commitdiff
Marius Burkard
2016-02-21 856a3fda5a9c7a59bc89e3ac4800465e7b72c591
refs
author Marius Burkard <m.burkard@pixcept.de>
Sunday, February 21, 2016 12:26 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Sunday, February 21, 2016 12:26 -0500
commit856a3fda5a9c7a59bc89e3ac4800465e7b72c591
tree f9a76fcf7a481ffd3f6a00211cd97368834619fc tree | zip | gz
parent 4fa79cf8ca10398f45aa30581b56d43d1738b08a view | diff
2527d26198a0222a05145c58e96494af1d316bb9 view | diff 
Merge branch 'master' into 'stable-3.1'

Master

Closes #2586 

See merge request !285
81 files modified
243 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 4 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 14 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client_template.tform.php 14 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 14 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ar_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ar_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/bg_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/bg_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/br_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/br_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ca_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ca_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/cz_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/cz_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fi_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fi_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hr_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hr_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hu_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hu_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/id_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/id_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/it_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ja_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ja_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/nl_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/nl_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pl_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pl_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pt_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pt_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ro_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ro_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ru_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ru_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/se_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/se_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/sk_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/sk_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/tr_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/tr_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_limits.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_template_edit_limits.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_limits.htm 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_user_edit.php 16 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ar_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/bg_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/br_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ca_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/cz_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/el_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fi_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/fr_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hr_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/hu_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/id_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/it_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ja_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/nl_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pl_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/pt_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ro_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ru_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/se_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/sk_database_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/tr_database_user.lng 1 ●●●●● diff | view | raw | blame | history