summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Add a closing )Lukas Reschke2013-01-141-1/+1
* | | | | CP failLukas Reschke2013-01-141-1/+1
* | | | | Check if user is admin - boolLukas Reschke2013-01-148-12/+9
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-131-0/+9
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1256-112/+73
* | | | | Merge pull request #1157 owncloud/move-OpenIDBart Visscher2013-01-112-20/+0
|\ \ \ \ \
| * | | | | Remove OpenID from the routerLukas Reschke2013-01-111-5/+1
| * | | | | Move to apps repoLukas Reschke2013-01-111-16/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #994 from owncloud/enhanced_multiSelectLukas Reschke2013-01-111-2/+3
|\ \ \ \ \
| * | | | | Users: Show selected groups first in list.Thomas Tanghus2012-12-211-0/+1
| * | | | | multiSelect: Modified users.js to only update other multiSelects.Thomas Tanghus2012-12-211-2/+2
* | | | | | Merge pull request #1150 from owncloud/EnableSSL-AdminMenuLukas Reschke2013-01-115-0/+56
|\ \ \ \ \ \
| * | | | | | Removed uneeded HTML tagLukas Reschke2013-01-111-1/+1
| * | | | | | Add security section to admin menuLukas Reschke2013-01-115-0/+56
| | |/ / / / | |/| | | |
* / | | | | Remove setContentTypeHeader()Lukas Reschke2013-01-112-2/+0
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-115-27/+63
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-102-23/+19
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-091-0/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-082-0/+19
| |/ / / |/| | |
* | | | Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-044-0/+141
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into ocs_apiTom Needham2012-12-3167-1221/+1226
| |\ \ \
| * \ \ \ Merge branch 'master' into ocs_apiTom Needham2012-12-163-3/+3
| |\ \ \ \
| * \ \ \ \ Merge master into ocs_api, fix conflicts.Tom Needham2012-12-1493-834/+589
| |\ \ \ \ \
| * \ \ \ \ \ Merge master into ocs_apiTom Needham2012-10-2867-359/+933
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into ocs_apiTom Needham2012-09-1734-59/+115
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Fix merge conflictsTom Needham2012-09-1392-508/+1861
| |\ \ \ \ \ \ \ \
| * | | | | | | | | API: Add callback_fail, add OC_OAuth::init and bespoke request token methodTom Needham2012-09-041-6/+21
| * | | | | | | | | Fix class nameTom Needham2012-08-301-2/+2
| * | | | | | | | | API: Fix merging of responses. Return 400 error when no OAuth operation sent.Tom Needham2012-08-031-2/+2
| * | | | | | | | | Move OAuth classes into lib/oauthTom Needham2012-08-031-1/+1
| * | | | | | | | | API: Use OC_API::checkLoggedIn() and OAuth scopes are app_$appnameTom Needham2012-08-031-1/+3
| * | | | | | | | | OAuth server implementation using oauth libraryMichael Gapczynski2012-08-021-4/+19
| * | | | | | | | | Check if required apps are installedTom Needham2012-07-304-9/+53
| * | | | | | | | | Authorisation requires you to be logged inTom Needham2012-07-301-0/+1
| * | | | | | | | | Include the css for the OAuth pageTom Needham2012-07-301-0/+1
| * | | | | | | | | Improve styling of permission request pageTom Needham2012-07-302-12/+15
| * | | | | | | | | Basic template for authorising exernal apps with OAuthTom Needham2012-07-302-0/+60
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-041-0/+4
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-033-0/+54
* | | | | | | | | | omit type attribute in script tag to use fallback (text/javascript)Jörn Friedrich Dreyer2013-01-021-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-021-0/+16
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-012-23/+43
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-3110-3/+99
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-3054-119/+69
* | | | | | | | Merge pull request #902 from owncloud/storage-wordingThomas Müller2012-12-283-18/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Change old variable name $default_quota to $defaultQuotaMichael Gapczynski2012-12-281-1/+1
| * | | | | | | | moving logic from template to the 'controller'Thomas Müller2012-12-212-13/+22
| * | | | | | | | remove unused codeThomas Müller2012-12-201-5/+0
| * | | | | | | | enable translations for quota sizes 'none' and 'default'Thomas Müller2012-12-202-7/+28
| * | | | | | | | dim Default Storage label color a bitJan-Christoph Borchardt2012-12-141-1/+1