ISPConfig3 devel
parent: 40317c | patch | commitdiff
Till Brehm
2014-12-11 6935aa30cb402e25335ba730ee5657f6020c7cc5
refs
author Till Brehm <tbrehm@ispconfig.org>
Thursday, December 11, 2014 04:42 -0500
committer Till Brehm <tbrehm@ispconfig.org>
Thursday, December 11, 2014 04:42 -0500
commit6935aa30cb402e25335ba730ee5657f6020c7cc5
tree 13d4b9e5fadf0b443de5c125c02d44a3e7472462 tree | zip | gz
parent 40317cfd73aaa530e3c4ad8488a40c3a9b611f17 view | diff
1fa8f425b71db332a03ceef2d1e165083d0ba241 view | diff 
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
5 files added
36 files modified
392 ■■■■■ changed files
install/sql/incremental/upd_0079.sql 2 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/plugin_directive_snippets.inc.php 72 ●●●●● diff | view | raw | blame | history
interface/lib/lang/en.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/directive_snippets.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/users.tform.php 13 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_directive_snippets.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_users.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_directive_snippets.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_users.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/directive_snippets_edit.htm 17 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_web_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/users_user_edit.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client.lng 25 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_limits.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 4 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/de.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/en.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/login/password_reset.php 75 ●●●●● diff | view | raw | blame | history
interface/web/sites/ajax_get_json.php 11 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_domain.tform.php 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_directive_snippets.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_domain.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_directive_snippets.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_domain.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_directive_snippets.htm 14 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_edit.htm 23 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 4 ●●●●● diff | view | raw | blame | history
server/conf/php-cgi-starter.master 4 ●●●●● diff | view | raw | blame | history
server/conf/php-fcgi-starter.master 3 ●●●●● diff | view | raw | blame | history
server/conf/php_fpm_pool.conf.master 4 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 3 ●●●●● diff | view | raw | blame | history
server/lib/classes/db_mysql.inc.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 6 ●●●●● diff | view | raw | blame | history
server/plugins-available/nginx_plugin.inc.php 11 ●●●●● diff | view | raw | blame | history