summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Add security section to admin menuLukas Reschke2013-01-115-0/+56
* [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
| * | | | | | | change storage space 'none' to 'Unlimited' and capitalize DefaultJan-Christoph Borchardt2012-12-141-3/+3
| * | | | | | | change technical expression 'Quota' to simpler 'Storage'Jan-Christoph Borchardt2012-12-141-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-282-0/+23
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-272-0/+17
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-262-0/+26
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-251-0/+12
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-242-0/+45
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-234-2/+15
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-227-0/+82
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2154-1/+115
* | | | | | | Merge pull request #970 from owncloud/fixing-950-masterJan-Christoph Borchardt2012-12-201-394/+402
|\ \ \ \ \ \ \
| * | | | | | | adding missing translations for various strings + fixing tool tip on deleteThomas Müller2012-12-201-394/+402
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2057-537/+59
|/ / / / / / /
* | | | | | | [l18n] fixing typos in source textThomas Müller2012-12-191-100/+121