ISPConfig3 devel
parent: 11ccaa | patch | commitdiff
Dominik
2014-01-23 6250b7ea002fd99e40d0170d31e7e19e69f97ccd
refs
author Dominik <info@profi-webdesign.net>
Thursday, January 23, 2014 13:53 -0500
committer Dominik <info@profi-webdesign.net>
Thursday, January 23, 2014 13:53 -0500
commit6250b7ea002fd99e40d0170d31e7e19e69f97ccd
tree 15e346cb0ad14f3833f938d567fed9798f0e7944 tree | zip | gz
parent 11ccaaaebe9b3ec24634901170961219299cf773 view | diff
88d47d2ce65e549ffccda213f4e53609cc75d882 view | diff 
Merge remote-tracking branch 'ispc3master/master'

Conflicts:
	install/sql/incremental/upd_0063.sql
67 files modified
12 files added
1797 ■■■■■ changed files
install/lib/install.lib.php 17 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 9 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0049.sql 1 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0052.sql 4 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0055.sql 2 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0065.sql 7 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 33 ●●●●● diff | view | raw | blame | history
interface/lib/classes/client_templates.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/custom_datasource.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/ispcmail.inc.php 1 ●●●●● diff | view | raw | blame | history
interface/lib/classes/remote.d/admin.inc.php 109 ●●●●● diff | view | raw | blame | history
interface/lib/classes/remoting.inc.php 1 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 1 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tpl.inc.php 109 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_users.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/remote.conf.php 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_web_edit.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/users_edit.php 7 ●●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 134 ●●●●● diff | view | raw | blame | history
interface/web/client/client_message.php 2 ●●●●● diff | view | raw | blame | history
interface/web/client/client_template_edit.php 13 ●●●●● diff | view | raw | blame | history
interface/web/client/domain_edit.php 9 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client_template.tform.php 14 ●●●●● diff | view | raw | blame | history
interface/web/client/form/message_template.tform.php 108 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 14 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ar.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/bg.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/br.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/cz.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/el.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_message_template.lng 11 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_message_template_list.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client_template_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fi.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/fr.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hr.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/hu.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/id.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ja.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/nl.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pl.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/pt.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ro.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/ru.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/se.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/sk.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/tr.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/module.conf.php 25 ●●●●● diff | view | raw | blame | history
interface/web/client/list/message_template.list.php 77 ●●●●● diff | view | raw | blame | history
interface/web/client/message_template_del.php 58 ●●●●● diff | view | raw | blame | history
interface/web/client/message_template_edit.php 99 ●●●●● diff | view | raw | blame | history
interface/web/client/message_template_list.php 53 ●●●●● diff | view | raw | blame | history
interface/web/client/reseller_edit.php 104 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_address.htm 1 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_limits.htm 17 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_message_template_list.htm 57 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_template_edit_limits.htm 15 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/domain_list.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/message_template.htm 39 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/message_template_list.htm 52 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_address.htm 1 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_limits.htm 94 ●●●●● diff | view | raw | blame | history
interface/web/sites/database_edit.php 42 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_advanced.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 22 ●●●●● diff | view | raw | blame | history
server/conf/apache_apps.vhost.master 44 ●●●●● diff | view | raw | blame | history
server/conf/apache_ispconfig.conf.master 65 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 54 ●●●●● diff | view | raw | blame | history
server/lib/classes/system.inc.php 27 ●●●●● diff | view | raw | blame | history
server/lib/classes/tpl.inc.php 85 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 7 ●●●●● diff | view | raw | blame | history
server/plugins-available/apps_vhost_plugin.inc.php 39 ●●●●● diff | view | raw | blame | history
server/plugins-available/maildeliver_plugin.inc.php 3 ●●●●● diff | view | raw | blame | history