Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13753 from owncloud/use-403-instead-of-200 | Morris Jobke | 2015-02-07 | 1 | -4/+2 |
|\ | | | | | Use 403 instead of 200 response | ||||
| * | Use 403 instead of 200 response | Lukas Reschke | 2015-01-29 | 1 | -4/+2 |
| | | | | | | | | A forbidden should throw a 403 and this makes it easier for me to do some automated testing. | ||||
* | | Normalize before processing | Lukas Reschke | 2015-02-06 | 2 | -0/+31 |
| | | |||||
* | | detect root of mountpoint also if the trailing slash is missed | Bjoern Schiessle | 2015-02-04 | 1 | -0/+22 |
| | | |||||
* | | Merge pull request #13811 from owncloud/default-to-null | Lukas Reschke | 2015-02-02 | 1 | -27/+37 |
|\ \ | | | | | | | Default to `null` for lostpassword | ||||
| * | | Mock l10n in the setup | Lukas Reschke | 2015-02-01 | 1 | -26/+23 |
| | | | |||||
| * | | Add unit tests for empty token | Lukas Reschke | 2015-02-01 | 1 | -2/+15 |
| | | | |||||
* | | | Switch to a factory and add unit tests | Lukas Reschke | 2015-01-30 | 1 | -33/+373 |
| | | | |||||
* | | | Add unit tests | Lukas Reschke | 2015-01-30 | 2 | -8/+189 |
|/ / | |||||
* | | Dont remove a file from cache if the delete operation failed | Robin Appelman | 2015-01-29 | 1 | -0/+23 |
| | | |||||
* | | Fix webdav put for single file webdav shares | Robin Appelman | 2015-01-29 | 1 | -0/+25 |
| | | |||||
* | | Fix resolving paths for views rooted in a file | Robin Appelman | 2015-01-29 | 1 | -0/+16 |
| | | |||||
* | | Add unit test | Robin Appelman | 2015-01-28 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #13717 from owncloud/storage-donotwrapnullstorage | Morris Jobke | 2015-01-28 | 1 | -0/+69 |
|\ | | | | | Prevent wrapping null storage | ||||
| * | Prevent wrapping null storage | Vincent Petry | 2015-01-27 | 1 | -0/+69 |
| | | | | | | | | | | | | Can happen when trying to instantiate external storages that have incomplete config, where the constructor throws an exception (the exception is caught in createStorage()) | ||||
* | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix | Vincent Petry | 2015-01-27 | 1 | -1/+28 |
|\ \ | |/ |/| | Call final unlink in trash wrapper's storage | ||||
| * | Preserve mtime when doing cross storage move | Robin Appelman | 2015-01-23 | 1 | -1/+28 |
| | | |||||
* | | Merge pull request #13636 from ↵ | Lukas Reschke | 2015-01-27 | 1 | -27/+166 |
|\ \ | | | | | | | | | | | | | owncloud/add-warning-if-restore-of-data-is-not-possible Add value if restore of data is possible for a user | ||||
| * | | Add value if restore of data is possible for a user | Morris Jobke | 2015-01-27 | 1 | -27/+166 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reason: nice to know before password change in user management * restore is possible: * encryption is disabled * encryption is enabled, admin and user has checked the restore option * if not possible: * highlight users row in red once the admin wants to change the password * show also a little tipsy | ||||
* | | | certificate manager should always use a \OC\Files\View otherwise we will get ↵ | Bjoern Schiessle | 2015-01-26 | 1 | -2/+2 |
| | | | | | | | | | | | | problems for different primary storages | ||||
* | | | certificate manager only needs the user-id, no need to pass on the complete ↵ | Bjoern Schiessle | 2015-01-26 | 1 | -4/+2 |
|/ / | | | | | | | user object | ||||
* | | Merge pull request #13621 from owncloud/system-config-multiset | Thomas Müller | 2015-01-26 | 2 | -30/+63 |
|\ \ | | | | | | | Add a method to set/unset multiple config values with one write | ||||
| * | | Use setConfigs() instead of calling setConfig() multiple times | Joas Schilling | 2015-01-23 | 1 | -30/+33 |
| | | | |||||
| * | | Add a method to set/unset multiple config values in one call | Joas Schilling | 2015-01-23 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | This reduces the number of file writes we do for config.php and therefor hopefully helps lowering the chances for empty config.php files | ||||
* | | | Do not retrieve shares through group if user has no group | Vincent Petry | 2015-01-23 | 1 | -1/+26 |
|/ / | |||||
* | | Fix undefined offset 1 for wrong user mail address | Morris Jobke | 2015-01-22 | 1 | -12/+24 |
| | | | | | | | | * fixes Undefined offset: 1 at lib/private/mail.php#143 | ||||
* | | Merge pull request #13509 from owncloud/share-deletechildrenwhenunsharefromgroup | Morris Jobke | 2015-01-22 | 1 | -0/+47 |
|\ \ | | | | | | | Fix reshare permission change to not impair other deletion code | ||||
| * | | Fix reshare permission change to not impair other deletion code | Vincent Petry | 2015-01-22 | 1 | -0/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change that prevents reshare permission changes to delete group share children had the side-effect of also preventing group share children deletion when it needed to be done. This fix adds an extra flag to isolate the "reshare permission change" deletion case and keep the other ones as they were before, not only to fix the regression but also fix other potential regressions in code that uses this method. Also updated the comment because now Helper::delete() is no longer limited to reshares but also applies to group share children. | ||||
* | | | Merge pull request #13552 from owncloud/request-uri-double-slash | Thomas Müller | 2015-01-21 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Remove duplicated slashes from the requested url | ||||
| * | | | Add unit test | Robin Appelman | 2015-01-21 | 1 | -0/+1 |
| | |/ | |/| | |||||
* / | | Add unit test for external share JS dialog | Vincent Petry | 2015-01-21 | 1 | -1/+2 |
|/ / | | | | | | | | | | | Moved external share JS code into a small plugin to make it testable. Added unit test for the external share dialog logic + ajax calls. | ||||
* | | Add a test case for memcaches to store an array | Joas Schilling | 2015-01-20 | 1 | -0/+6 |
| | | |||||
* | | Fix chunked query for tags + unit test | Vincent Petry | 2015-01-19 | 1 | -3/+29 |
|/ | |||||
* | Merge pull request #13423 from ↵ | Thomas Müller | 2015-01-19 | 1 | -0/+35 |
|\ | | | | | | | | | owncloud/share-fixfindshareforuserwithmultiplegroups Fix getItemSharedWithUser for groups | ||||
| * | Fix getItemSharedWithUser for groups | Vincent Petry | 2015-01-16 | 1 | -0/+35 |
| | | | | | | | | | | | | Fixed SQL query for whenever a user has more than one group. Added missing $owner where clause for group lookup. Added unit tests for the group cases. | ||||
* | | Fix filtering for users when $gid is empty | Lukas Reschke | 2015-01-18 | 1 | -0/+127 |
| | | | | | | | | | | | | Previously when $gid was empty the users were not filtered at all. Rendering the search function in the user management pretty useless. Fixes itself | ||||
* | | Merge pull request #13319 from owncloud/replace-line-breaks-in-app-description | Lukas Reschke | 2015-01-17 | 1 | -0/+29 |
|\ \ | |/ |/| | replace line breaks in the app description by spaces - fixes #13315 | ||||
| * | OC_App::parseAppInfo | Morris Jobke | 2015-01-14 | 1 | -0/+29 |
| | | | | | | | | | | | | * replace line breaks (on non empty lines) in the app description by spaces * fixes #13315 * includes unit tests | ||||
* | | Merge pull request #13389 from owncloud/issue/13372-failing-oracle-tests-jenkins | Thomas Müller | 2015-01-15 | 1 | -40/+81 |
|\ \ | | | | | | | Mask table and column names with backticks and add lastInsertID() workar... | ||||
| * | | Mask table and column names with backticks and add lastInsertID() workaround | Joas Schilling | 2015-01-15 | 1 | -40/+81 |
| | | | |||||
* | | | Additional unit test for recursive remove | Robin Appelman | 2015-01-15 | 1 | -0/+19 |
| | | | |||||
* | | | always set url parameters when they are available in the app dispatch | Bernhard Posselt | 2015-01-15 | 1 | -0/+17 |
|/ / | | | | | | | | | | | prefer url parameters passed into the main method. If they are not present, use the containers urlParameters add space | ||||
* | | Merge pull request #13354 from owncloud/hhvm-redis | Morris Jobke | 2015-01-15 | 1 | -0/+10 |
|\ \ | | | | | | | HHVM: Prevent E_WARNING messages by Redis test in console output. | ||||
| * | | HHVM: Prevent E_WARNING messages by Redis test in console output. | Andreas Fischer | 2015-01-14 | 1 | -0/+10 |
| |/ | |||||
* | | Merge pull request #13317 from owncloud/partfile-fileinfo | Thomas Müller | 2015-01-14 | 1 | -0/+14 |
|\ \ | | | | | | | Return valid fileinfo objects for part files | ||||
| * | | Return valid fileinfo objects for part files | Robin Appelman | 2015-01-13 | 1 | -0/+14 |
| | | | |||||
* | | | Merge pull request #13344 from owncloud/issue/13334-cleanup-tags-repairstep | Morris Jobke | 2015-01-14 | 1 | -0/+143 |
|\ \ \ | | | | | | | | | Add a repair step to clean up orphan tags and tag entries | ||||
| * | | | Add a repair step to clean up orphan tags and tag entries | Joas Schilling | 2015-01-14 | 1 | -0/+143 |
| | |/ | |/| | |||||
* / | | Check new and old ways of required oC version for app compatibility | Joas Schilling | 2015-01-14 | 1 | -2/+51 |
|/ / | |||||
* / | Fix searchCommon to properly match path name | Vincent Petry | 2015-01-12 | 1 | -0/+39 |
|/ | | | | | | | The internal path was matched without the last "/" which caused "files_trashbin" to also match when the internal path was "files". This adds the missing slash for the comparison. |