ISPConfig3 devel
parent: ee405d | patch | commitdiff
Florian Schaal
2015-05-07 e59fe36d9eb59c79cb0eba03569358f9257c13be
refs
author Florian Schaal <florian@schaal-24.de>
Thursday, May 7, 2015 01:50 -0400
committer Florian Schaal <florian@schaal-24.de>
Thursday, May 7, 2015 01:50 -0400
commite59fe36d9eb59c79cb0eba03569358f9257c13be
tree 2a79538ff441c202f5005aa9ef97b8e6f06fc159 tree | zip | gz
parent ee405d849b027618eec69425ed845afdc076b562 view | diff
43e5b6608a6302e33824f27e9768079d883b38ac view | diff 
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
2 files added
9 files modified
1 files deleted
191 ■■■■■ changed files
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