aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/setup.js
diff options
context:
space:
mode:
authorQingping Hou <dave2008713@gmail.com>2013-02-25 17:16:03 -0500
committerQingping Hou <dave2008713@gmail.com>2013-02-25 17:16:03 -0500
commit195b52cb63eda3d8e3af6195058a0e1403e4dede (patch)
tree4c79947d856f136051a84171eba913b1517a3bd1 /core/js/setup.js
parentc111a3aa248bee2bff22318c2a3d0da32ea0e451 (diff)
parentd713948d3f85a6e0a369bf1a9052ce563250e3da (diff)
downloadnextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.tar.gz
nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.zip
Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts: core/templates/layout.user.php
Diffstat (limited to 'core/js/setup.js')
-rw-r--r--core/js/setup.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/js/setup.js b/core/js/setup.js
index 2656cac2f45..76812b29979 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -5,6 +5,7 @@ $(document).ready(function() {
mysql:!!$('#hasMySQL').val(),
postgresql:!!$('#hasPostgreSQL').val(),
oracle:!!$('#hasOracle').val(),
+ mssql:!!$('#hasMSSQL').val()
};
$('#selectDbType').buttonset();
@@ -41,6 +42,12 @@ $(document).ready(function() {
$('#dbhost').show(250);
$('#dbhostlabel').show(250);
});
+
+ $('#mssql').click(function() {
+ $('#use_other_db').slideDown(250);
+ $('#dbhost').show(250);
+ $('#dbhostlabel').show(250);
+ });
$('input[checked]').trigger('click');