ISPConfig3 devel
parent: 0deff1 | patch | commitdiff
Florian Schaal
2015-06-05 dadfb45a9a29e239ff722e6d8e91c75f76c314b8
refs
author Florian Schaal <florian@schaal-24.de>
Friday, June 5, 2015 10:47 -0400
committer Florian Schaal <florian@schaal-24.de>
Friday, June 5, 2015 10:47 -0400
commitdadfb45a9a29e239ff722e6d8e91c75f76c314b8
tree 021cb007bc4ee1434664b40852e72f136f97a352 tree | zip | gz
parent 0deff130c6d7404da71e9ab9d8ee738112bd4f74 view | diff
1fa1bcead3a1fc02c1ff81732ce0e561df64822b view | diff 
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
35 files modified
313 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 3 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 3 ●●●●● diff | view | raw | blame | history
install/tpl/authmysqlrc.master 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/auth.inc.php 50 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 14 ●●●●● diff | view | raw | blame | history
interface/lib/lang/de.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/language_add.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/language_complete.php 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/language_edit.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/language_import.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/remote_action_ispcupdate.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/remote_action_osupdate.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_config_edit.php 10 ●●●●● diff | view | raw | blame | history
interface/web/client/client_message.php 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_domain.tform.php 9 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ar_shell_user.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_shell_user.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_shell_user.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_redirect.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/form.tpl.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/tools/dns_import_tupa.php 7 ●●●●● diff | view | raw | blame | history
interface/web/tools/import_ispconfig.php 9 ●●●●● diff | view | raw | blame | history
interface/web/tools/resync.php 11 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_action.php 9 ●●●●● diff | view | raw | blame | history
server/conf/nginx_vhost.conf.master 7 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 6 ●●●●● diff | view | raw | blame | history
server/cron.sh 2 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/150-awstats.inc.php 5 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/150-webalizer.inc.php 8 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 31 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 25 ●●●●● diff | view | raw | blame | history
server/plugins-available/shelluser_base_plugin.inc.php 8 ●●●●● diff | view | raw | blame | history
server/scripts/run-getmail.sh 2 ●●●●● diff | view | raw | blame | history
server/server.sh 2 ●●●●● diff | view | raw | blame | history