Till Brehm
2015-05-07 be531cf1d37d2293a572eef25d0190e23fc8a3b4
refs
author Till Brehm <tbrehm@ispconfig.org>
Thursday, May 7, 2015 04:12 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Thursday, May 7, 2015 04:12 -0400
commitbe531cf1d37d2293a572eef25d0190e23fc8a3b4
tree 27b6eed0b0adc476ac2288fe4a8b73be7dc6b73b tree | zip | gz
parent e1f709dcb98590b2158736f965ec5d08f5d3a4d4 view | diff
43e5b6608a6302e33824f27e9768079d883b38ac view | diff
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
1 files deleted
11 files modified
2 files added
222 ■■■■■ changed files
install/install.php 26 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 5 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform.inc.php 10 ●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 20 ●●●●● diff | view | raw | blame | history
interface/web/js/uni-form/uni-form.jquery.js 107 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/ftp_user_advanced.htm 12 ●●●● diff | view | raw | blame | history
interface/web/sites/templates/ftp_user_advanced_client.htm 2 ●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/bootstrap-datetimepicker.min.js 1 ●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.js 18 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.min.js 2 ●●● diff | view | raw | blame | history
interface/web/themes/default/assets/stylesheets/bootstrap-datetimepicker.min.css 9 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_vm_edit.php 1 ●●●● diff | view | raw | blame | history
interface/web/vm/templates/openvz_vm_edit.htm 7 ●●●● diff | view | raw | blame | history