| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-22 | 65 | -162/+203 |
|\ |
|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-13 | 1 | -0/+9 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-12 | 56 | -112/+73 |
| * | Merge pull request #1157 owncloud/move-OpenID | Bart Visscher | 2013-01-11 | 2 | -20/+0 |
| |\ |
|
| | * | Remove OpenID from the router | Lukas Reschke | 2013-01-11 | 1 | -5/+1 |
| | * | Move to apps repo | Lukas Reschke | 2013-01-11 | 1 | -16/+0 |
| * | | Merge pull request #994 from owncloud/enhanced_multiSelect | Lukas Reschke | 2013-01-11 | 1 | -2/+3 |
| |\ \ |
|
| | * | | Users: Show selected groups first in list. | Thomas Tanghus | 2012-12-21 | 1 | -0/+1 |
| | * | | multiSelect: Modified users.js to only update other multiSelects. | Thomas Tanghus | 2012-12-21 | 1 | -2/+2 |
| * | | | Merge pull request #1150 from owncloud/EnableSSL-AdminMenu | Lukas Reschke | 2013-01-11 | 5 | -0/+56 |
| |\ \ \ |
|
| | * | | | Removed uneeded HTML tag | Lukas Reschke | 2013-01-11 | 1 | -1/+1 |
| | * | | | Add security section to admin menu | Lukas Reschke | 2013-01-11 | 5 | -0/+56 |
| | | |/
| | |/| |
|
| * / | | Remove setContentTypeHeader() | Lukas Reschke | 2013-01-11 | 2 | -2/+0 |
| |/ / |
|
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-11 | 5 | -27/+63 |
* | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-10 | 5 | -23/+42 |
|\| | |
|
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-10 | 2 | -23/+19 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-09 | 1 | -0/+4 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-08 | 2 | -0/+19 |
* | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-05 | 8 | -0/+199 |
|\| | |
|
| * | | Merge pull request #1053 from owncloud/ocs_api | Michael Gapczynski | 2013-01-04 | 4 | -0/+141 |
| |\ \ |
|
| | * \ | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-31 | 67 | -1221/+1226 |
| | |\ \ |
|
| | * \ \ | Merge branch 'master' into ocs_api | Tom Needham | 2012-12-16 | 3 | -3/+3 |
| | |\ \ \ |
|
| | * \ \ \ | Merge master into ocs_api, fix conflicts. | Tom Needham | 2012-12-14 | 93 | -834/+589 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge master into ocs_api | Tom Needham | 2012-10-28 | 67 | -359/+933 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'master' into ocs_api | Tom Needham | 2012-09-17 | 34 | -59/+115 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Fix merge conflicts | Tom Needham | 2012-09-13 | 92 | -508/+1861 |
| | |\ \ \ \ \ \ \ |
|
| | * | | | | | | | | API: Add callback_fail, add OC_OAuth::init and bespoke request token method | Tom Needham | 2012-09-04 | 1 | -6/+21 |
| | * | | | | | | | | Fix class name | Tom Needham | 2012-08-30 | 1 | -2/+2 |
| | * | | | | | | | | API: Fix merging of responses. Return 400 error when no OAuth operation sent. | Tom Needham | 2012-08-03 | 1 | -2/+2 |
| | * | | | | | | | | Move OAuth classes into lib/oauth | Tom Needham | 2012-08-03 | 1 | -1/+1 |
| | * | | | | | | | | API: Use OC_API::checkLoggedIn() and OAuth scopes are app_$appname | Tom Needham | 2012-08-03 | 1 | -1/+3 |
| | * | | | | | | | | OAuth server implementation using oauth library | Michael Gapczynski | 2012-08-02 | 1 | -4/+19 |
| | * | | | | | | | | Check if required apps are installed | Tom Needham | 2012-07-30 | 4 | -9/+53 |
| | * | | | | | | | | Authorisation requires you to be logged in | Tom Needham | 2012-07-30 | 1 | -0/+1 |
| | * | | | | | | | | Include the css for the OAuth page | Tom Needham | 2012-07-30 | 1 | -0/+1 |
| | * | | | | | | | | Improve styling of permission request page | Tom Needham | 2012-07-30 | 2 | -12/+15 |
| | * | | | | | | | | Basic template for authorising exernal apps with OAuth | Tom Needham | 2012-07-30 | 2 | -0/+60 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-04 | 1 | -0/+4 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-03 | 3 | -0/+54 |
* | | | | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-02 | 70 | -1247/+1290 |
|\| | | | | | | | | |
|
| * | | | | | | | | | omit type attribute in script tag to use fallback (text/javascript) | Jörn Friedrich Dreyer | 2013-01-02 | 1 | -1/+1 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-02 | 1 | -0/+16 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-01 | 2 | -23/+43 |
| | |_|_|_|_|_|/ /
| |/| | | | | | | |
|
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-31 | 10 | -3/+99 |
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-12-30 | 54 | -119/+69 |
| * | | | | | | | | Merge pull request #902 from owncloud/storage-wording | Thomas Müller | 2012-12-28 | 3 | -18/+43 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Change old variable name $default_quota to $defaultQuota | Michael Gapczynski | 2012-12-28 | 1 | -1/+1 |
| | * | | | | | | | | moving logic from template to the 'controller' | Thomas Müller | 2012-12-21 | 2 | -13/+22 |
| | * | | | | | | | | remove unused code | Thomas Müller | 2012-12-20 | 1 | -5/+0 |
| | * | | | | | | | | enable translations for quota sizes 'none' and 'default' | Thomas Müller | 2012-12-20 | 2 | -7/+28 |