ISPConfig3 devel
parent: 9c6782 | patch | commitdiff
Florian Schaal
2016-02-12 adfecbfba2c04131f03bb1c0fcb75356ded26f4f
refs
author Florian Schaal <florian@schaal-24.de>
Friday, February 12, 2016 10:45 -0500
committer Florian Schaal <florian@schaal-24.de>
Friday, February 12, 2016 10:45 -0500
commitadfecbfba2c04131f03bb1c0fcb75356ded26f4f
tree fd29dafb2a952b1135e1e2cbc424851b52ed785d tree | zip | gz
parent 9c6782b8ca5c72218790ac6c18fcb10c83124756 view | diff
d9fcae91955e8b6441279c9fb2e2de93c5ca432e view | diff 
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
1 files added
28 files modified
253 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 7 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●●●● diff | view | raw | blame | history
install/tpl/apache_ispconfig.conf.master 10 ●●●●● diff | view | raw | blame | history
interface/acme/.well-known/acme-challenge/empty.dir 1 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 12 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client_template.tform.php 12 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 12 ●●●●● 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_client_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_reseller.lng 2 ●●●●● 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_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_limits.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_template_edit_limits.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_limits.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_domain.tform.php 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_domain.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_domain.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/module.conf.php 5 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_edit.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.js 27 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.min.js 2 ●●●●● diff | view | raw | blame | history
server/conf/nginx_vhost.conf.master 14 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 9 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/900-letsencrypt.inc.php 4 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 29 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 37 ●●●●● diff | view | raw | blame | history