diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2012-01-08 01:53:40 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2012-01-08 01:53:40 +0100 |
| commit | d1edc360d9bd7d97c35d25b54dadec61004cd869 (patch) | |
| tree | 7344744268280ccbdc194746a7b40dfc90a33260 /settings | |
| parent | 3844fb0e4ce093bb3c2e67d20f85f61b7723efdc (diff) | |
| parent | 8f8985c3e53862e2ca6446f296d4835a9577faac (diff) | |
| download | nextcloud-server-d1edc360d9bd7d97c35d25b54dadec61004cd869.tar.gz nextcloud-server-d1edc360d9bd7d97c35d25b54dadec61004cd869.zip | |
merge master into filesystem
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/apps.php | 32 | ||||
| -rw-r--r-- | settings/js/users.js | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/settings/apps.php b/settings/apps.php index 12a7bf77202..40b72639cd6 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -51,22 +51,22 @@ function app_sort($a, $b){ } usort($apps, 'app_sort'); -// dissabled for now -// $catagoryNames=OC_OCSClient::getCategories(); -// if(is_array($catagoryNames)){ -// $categories=array_keys($catagoryNames); -// $externalApps=OC_OCSClient::getApplications($categories); -// foreach($externalApps as $app){ -// $apps[]=array( -// 'name'=>$app['name'], -// 'id'=>$app['id'], -// 'active'=>false, -// 'description'=>$app['description'], -// 'author'=>$app['personid'], -// 'license'=>$app['license'], -// ); -// } -// } +// apps from external repo via OCS + $catagoryNames=OC_OCSClient::getCategories(); + if(is_array($catagoryNames)){ + $categories=array_keys($catagoryNames); + $externalApps=OC_OCSClient::getApplications($categories); + foreach($externalApps as $app){ + $apps[]=array( + 'name'=>$app['name'], + 'id'=>$app['id'], + 'active'=>false, + 'description'=>$app['description'], + 'author'=>$app['personid'], + 'license'=>$app['license'], + ); + } + } diff --git a/settings/js/users.js b/settings/js/users.js index 4fea52e4a1f..79b4e80870a 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -126,7 +126,7 @@ $(document).ready(function(){ $('#newuser').submit(function(event){ event.preventDefault(); var username=$('#newusername').val(); - if(username == '') { + if($.trim(username) == '') { alert('Please provide a username!'); return false; } |