Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't pollute the global namespace | Thomas Müller | 2015-04-21 | 3 | -33/+44 |
| | |||||
* | make jshint happy | Thomas Müller | 2015-04-20 | 2 | -14/+17 |
| | | | | This reverts commit ae681f0061f534b48b45cf9a41f6110c0ff20b1d. | ||||
* | use a simple function - OC.Encryption is already defined - fixes #15707 | Thomas Müller | 2015-04-20 | 1 | -23/+13 |
| | | | | This reverts commit 0ca6398aa34e0a3698f3aed0305f0e9299578bbc. | ||||
* | Merge pull request #15677 from owncloud/enc_reset_private_key_password | Thomas Müller | 2015-04-20 | 5 | -10/+379 |
|\ | | | | | [encryption] let user update the private key password | ||||
| * | Dont use the old .status way | Joas Schilling | 2015-04-20 | 3 | -24/+12 |
| | | |||||
| * | Fix several minor things | Joas Schilling | 2015-04-20 | 2 | -24/+21 |
| | | |||||
| * | let user update the private key password in case the login password was ↵ | Bjoern Schiessle | 2015-04-17 | 4 | -0/+384 |
| | | | | | | | | changed from outside | ||||
* | | Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more | Vincent Petry | 2015-04-20 | 6 | -26/+78 |
|\ \ | | | | | | | Introduce Storage::getData() to allow storage implementations more contr... | ||||
| * | | move permission related code into getMetaData() | Thomas Müller | 2015-04-20 | 3 | -15/+20 |
| | | | |||||
| * | | Avoid function name collision in dropbox external storage | Thomas Müller | 2015-04-20 | 1 | -7/+7 |
| | | | |||||
| * | | Introduce Storage::getMetaData() to allow storage implementations more ↵ | Thomas Müller | 2015-04-20 | 5 | -10/+10 |
| | | | | | | | | | | | | control over the data array | ||||
| * | | Introduce Storage::getData() to allow storage implementations more control ↵ | Thomas Müller | 2015-04-20 | 5 | -10/+57 |
| | | | | | | | | | | | | over the data array | ||||
* | | | Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound | Lukas Reschke | 2015-04-20 | 2 | -9/+21 |
|\ \ \ | | | | | | | | | Fix wrong path generation | ||||
| * | | | Add tests for correct path | Joas Schilling | 2015-04-20 | 1 | -1/+2 |
| | | | | |||||
| * | | | Fix phpStorm complains and namespace | Joas Schilling | 2015-04-20 | 1 | -7/+18 |
| | | | | |||||
| * | | | Fix wrong path generation | Morris Jobke | 2015-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | * fixes #15742 | ||||
* | | | | Merge pull request #15635 from owncloud/issue/15634-empty-txt-previews | Morris Jobke | 2015-04-20 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Scale up the font on larger previews | ||||
| * | | | | Scale up the font on larger previews | Joas Schilling | 2015-04-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #15735 from owncloud/fix-visibility | Morris Jobke | 2015-04-20 | 8 | -22/+22 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix visibility of interfaces in \OCP | ||||
| * | | | | Fix visibility of public API methods | Joas Schilling | 2015-04-20 | 3 | -4/+4 |
| | | | | | |||||
| * | | | | Fix visibility of interfaces in \OCP | Morris Jobke | 2015-04-19 | 5 | -18/+18 |
| | | | | | |||||
* | | | | | Merge pull request #15637 from owncloud/migrate-certificate-stuff | Lukas Reschke | 2015-04-20 | 15 | -132/+359 |
|\ \ \ \ \ | | | | | | | | | | | | | Migrate personal certificate handling to AppFramework controllers | ||||
| * | | | | | Adjust tests and statuscode | Lukas Reschke | 2015-04-20 | 3 | -9/+19 |
| | | | | | | |||||
| * | | | | | fix date variable | Morris Jobke | 2015-04-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix files | Lukas Reschke | 2015-04-20 | 1 | -2/+6 |
| | | | | | | |||||
| * | | | | | Proper return types | Lukas Reschke | 2015-04-20 | 2 | -3/+4 |
| | | | | | | |||||
| * | | | | | Migrate personal certificate handling into AppFramework controllers | Lukas Reschke | 2015-04-20 | 10 | -100/+298 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also added unit-tests and better error-handling | ||||
| * | | | | | Verify if returned object is an array | Lukas Reschke | 2015-04-20 | 2 | -24/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | The error has to be thrown at this point as otherwise errors and notices are thrown since the time cannot be parsed in L60 and L61 | ||||
* | | | | | | Merge pull request #15733 from owncloud/remove-oc_backgroundjob | Lukas Reschke | 2015-04-20 | 3 | -60/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Removed OC_BackgroundJob - reduce class overhead | ||||
| * | | | | | | Removed OC_BackgroundJob - reduce class overhead | Morris Jobke | 2015-04-18 | 3 | -60/+7 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | * method code is now in the static public namespace (5 sloc) | ||||
* | | | | | | Merge pull request #15747 from owncloud/ldap-remove-deprecated-const-usage-group | Joas Schilling | 2015-04-20 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | move away from deprecated consts | ||||
| * | | | | | move away from deprecated consts | Arthur Schiwon | 2015-04-20 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #15629 from owncloud/deprecate-potential-dangerous-methods | Lukas Reschke | 2015-04-20 | 2 | -3/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Deprecate unused `\OCP\Response::sendFile` | ||||
| * | | | | | Add version to deprecation notice | Lukas Reschke | 2015-04-20 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | As requested by @MorrisJobke | ||||
| * | | | | | Deprecate unused `\OCP\Response::sendFile` | Lukas Reschke | 2015-04-20 | 2 | -3/+6 |
|/ / / / / | | | | | | | | | | | | | | | | This function is unused in our own code and can be better achieved using the AppFramework. Also very easy to do grave mistaked using this function. | ||||
* | | | | | Merge pull request #15717 from ↵ | Morris Jobke | 2015-04-20 | 15 | -81/+120 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue/15716-fixing-ocp-api-namespace-usage Fixing OCS API namespace usage | ||||
| * | | | | | Add @since tag to public namespace constants | Morris Jobke | 2015-04-18 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Fix usage of deprecated private constants | Joas Schilling | 2015-04-18 | 14 | -71/+76 |
| | | | | | | |||||
| * | | | | | Deprecate the OC_API constants in favor of the OCP ones | Joas Schilling | 2015-04-18 | 1 | -8/+24 |
| | | | | | | |||||
| * | | | | | Move constants to OCP\API so apps can use them | Joas Schilling | 2015-04-18 | 1 | -2/+18 |
| | | | | | | |||||
| * | | | | | Correctly prefix OC_API with \ since its not in the namespace | Joas Schilling | 2015-04-18 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-20 | 20 | -4/+78 |
| | | | | | | |||||
* | | | | | | Merge pull request #15739 from DavidPrevot/symfony-2.7 | Morris Jobke | 2015-04-19 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Replace `_method` requirement by {g,s}etMethods() | ||||
| * | | | | | Replace `_method` requirement by {g,s}etMethods() | David Prévot | 2015-04-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the call compatible with future Symfony version, and avoid E_USER_DEPRECATED as thrown by the current 2.7.0-beta1: The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getMethods() instead. at …/Symfony/Component/Routing/Route.php#554 The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setMethods() method instead or the "methods" option in the route definition. at …/Symfony/Component/Routing/Route.php#662 | ||||
* | | | | | | Merge pull request #15740 from owncloud/get_rid_of_geo | Thomas Müller | 2015-04-19 | 2 | -73/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | get rid of OC_Geo | ||||
| * | | | | | | get rid of OC_Geo | Georg Ehrke | 2015-04-19 | 2 | -73/+0 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #15724 from owncloud/ldap-remove-deprecated-const-usage | Thomas Müller | 2015-04-19 | 1 | -5/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | LDAP - move from constants to class member constants | ||||
| * | | | | | LDAP - move from constants to class member constants | Morris Jobke | 2015-04-18 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes scrutinizer warnings * drops the usage of deprecated code usage | ||||
* | | | | | | Merge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocp | Roeland Douma | 2015-04-19 | 3 | -9/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Reduce call of legacy wrapper by call the OCP directly | ||||
| * | | | | | | Reduce call of legacy wrapper by call the OCP directly | Morris Jobke | 2015-04-19 | 3 | -9/+10 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * ref #15734 * reduces the call depth, because the private methods just call OCP stuff |