ISPConfig3 devel
parent: 64604d | patch | commitdiff
Marius Cramer
2015-11-12 8ce5e3054e6bc70cc44e8d2d002ac035f02bd9ec
refs
author Marius Cramer <m.cramer@pixcept.de>
Thursday, November 12, 2015 05:58 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Thursday, November 12, 2015 05:58 -0500
commit8ce5e3054e6bc70cc44e8d2d002ac035f02bd9ec
tree a03b8bc337578e956f6a9555953cc200139c2644 tree | zip | gz
parent 64604dedaf7ff5c86db5e5e7d82de62ba3a1df2c view | diff
904d8aa7db736fbf89f94053c9ebd5c1376e7190 view | diff 
Merge branch 'master' into 'master'

custom text / link for login-page

See merge request !240
29 files modified
102 ■■■■■ changed files
install/tpl/system.ini.master 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/system_config.tform.php 16 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ar_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/bg_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/br_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/cz_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/el_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fi_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/fr_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hr_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/hu_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/id_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/it_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ja_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/nl_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pl_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/pt_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ro_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/ru_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/se_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/sk_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/tr_system_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/system_config_misc_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/login/index.php 6 ●●●●● diff | view | raw | blame | history
interface/web/login/templates/index.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main_login.tpl.htm 1 ●●●●● diff | view | raw | blame | history