Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure we don't quote column names twice | Joas Schilling | 2016-02-23 | 3 | -3/+3 |
| | |||||
* | Add ILIKE support to querybuilder | Thomas Müller | 2016-02-22 | 5 | -0/+79 |
| | |||||
* | Merge pull request #22552 from owncloud/fix-avconv-preview-parameters | Thomas Müller | 2016-02-22 | 1 | -2/+2 |
|\ | | | | | Move `-an` after the input arg because it is an output option | ||||
| * | Move `-an` after the input arg because it is an output option | Joas Schilling | 2016-02-22 | 1 | -2/+2 |
| | | |||||
* | | We should check for exceptions when trying to get the avatar | Roeland Jago Douma | 2016-02-22 | 1 | -0/+2 |
|/ | | | | | | | Fixes #22550 * Updated phpdoc of avatatmanager * Add unit test | ||||
* | Merge pull request #22503 from owncloud/issue_22500 | Thomas Müller | 2016-02-19 | 1 | -2/+14 |
|\ | | | | | When (re-)sharing an incomming federated share set the corrent owner | ||||
| * | When (re-)sharing an incomming federated share set the corrent owner | Roeland Jago Douma | 2016-02-19 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | Incomming federated shares are a special kind. We mount them as normal webdav shares but we do supply owner info with the federated cloud id of the share owner. Since we do not yet have the new resharing behaviour on federated shares we need to set the correct owner. Which will allow sharing and proper mounting for other users. fixes #22500 | ||||
* | | Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrename | Thomas Müller | 2016-02-19 | 2 | -0/+8 |
|\ \ | | | | | | | Check delete permission before attemping copy+delete | ||||
| * | | Check delete permission before attemping copy+delete | Vincent Petry | 2016-02-19 | 2 | -0/+8 |
| |/ | | | | | | | | | | | | | | | Some move operations when cross-storage will be replaced by copy and delete. Before attempting this, first check whether the source storage has delete permissions. This also prevents renaming system-wide external storages. | ||||
* | | Merge pull request #22410 from owncloud/fix_22119 | Thomas Müller | 2016-02-19 | 1 | -2/+20 |
|\ \ | | | | | | | Do not copy skeleton on avatar access | ||||
| * | | Do not copy skeleton on avatar access | Roeland Jago Douma | 2016-02-16 | 1 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22119 Just try to get the folder of the user. If it is not there a NotFoundException will be thrown. Which will be handled by the avatar endpoint. | ||||
* | | | Merge pull request #22521 from owncloud/mssql-is-not-support-since-ages | Thomas Müller | 2016-02-19 | 1 | -37/+0 |
|\ \ \ | | | | | | | | | Remove old adapter - mssql is not supported | ||||
| * | | | Remove old adapter - mssql is not supported | Joas Schilling | 2016-02-19 | 1 | -37/+0 |
| | | | | |||||
* | | | | Merge pull request #22218 from owncloud/occ-no-extra-messages | Thomas Müller | 2016-02-19 | 1 | -1/+21 |
|\ \ \ \ | |/ / / |/| | | | Add global --no-warnings option to occ… | ||||
| * | | | Add global --no-warning option to occ in order not to pollute output with ↵ | Victor Dubiniuk | 2016-02-19 | 1 | -1/+21 |
| | |/ | |/| | | | | | | | warnings | ||||
* | | | Fix even more | Roeland Jago Douma | 2016-02-19 | 1 | -1/+2 |
| | | | |||||
* | | | Fix more things | Joas Schilling | 2016-02-19 | 2 | -4/+5 |
| | | | |||||
* | | | Fix PHPDoc | Thomas Müller | 2016-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-02-19 | 6 | -16/+20 |
|/ / | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | Merge pull request #22493 from owncloud/issue_22467 | Thomas Müller | 2016-02-18 | 4 | -13/+9 |
|\ \ | | | | | | | getRootFolder should not setup the FS for any user | ||||
| * | | Make scrutinizer happy | Roeland Jago Douma | 2016-02-18 | 2 | -3/+2 |
| | | | |||||
| * | | getRootFolder should not setup the FS for any user | Roeland Jago Douma | 2016-02-18 | 3 | -10/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22467 This can go wrong when an app (take the ldap app) DIs something that needs the rootFolder. This break if we use cookie auth since then we know the user at that point and thus try to setup the fs for that user. However if there are then incomming shares from an ldap user they will fails since the user manager can't find them yet. Now getRootFolder does not setup the fs for any user. | ||||
* | | | Merge pull request #22482 from owncloud/getowner-cache | Thomas Müller | 2016-02-18 | 1 | -1/+6 |
|\ \ \ | | | | | | | | | cache result for getowner | ||||
| * | | | No more static | Joas Schilling | 2016-02-18 | 1 | -5/+4 |
| | | | | |||||
| * | | | cache result for getowner | Robin Appelman | 2016-02-17 | 1 | -1/+7 |
| | | | | |||||
* | | | | Merge pull request #21610 from owncloud/quota-sharedfile | Thomas Müller | 2016-02-18 | 1 | -5/+22 |
|\ \ \ \ | |_|/ / |/| | | | Fix quota check for single shared files | ||||
| * | | | Don't apply quota in stream wrapper for part files | Vincent Petry | 2016-02-17 | 1 | -5/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When overwriting shared files as recipient, the part file is written on the uploader's storage before overwriting the target file. If the uploader has no quota left, they should still be able to overwrite that file with Webdav. To make this work, they need to be able to write the part file to their own storage first. | ||||
* | | | | Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle | Thomas Müller | 2016-02-18 | 1 | -0/+11 |
|\ \ \ \ | |_|/ / |/| | | | Add index names so Doctrine does not use a too long random string | ||||
| * | | | Make sure our index names fit in oracle | Joas Schilling | 2016-02-16 | 1 | -0/+11 |
| | | | | |||||
* | | | | Merge pull request #16783 from owncloud/handle-redirects-global | Thomas Müller | 2016-02-17 | 2 | -2/+10 |
|\ \ \ \ | |_|/ / |/| | | | Adding global error handler for ajax calls which run into redirection… | ||||
| * | | | Send 401 header for OC_JSON::checkLoggedIn() | Lukas Reschke | 2016-02-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | Catch auth coming from JS in OCS | Lukas Reschke | 2016-02-15 | 1 | -2/+9 |
| |/ / | |||||
* | | | Handles null as return code and uses proper UserFolder in trashbin | Morris Jobke | 2016-02-16 | 1 | -1/+1 |
| | | | |||||
* | | | Return proper error string if sharing for this user is disabled | Roeland Jago Douma | 2016-02-16 | 1 | -11/+5 |
| |/ |/| | | | | | Fixes #22402 | ||||
* | | Merge pull request #22376 from owncloud/fix-return-code-getAppPath | Thomas Müller | 2016-02-15 | 1 | -14/+29 |
|\ \ | |/ |/| | Properly handle return code of OC_App::getAppPath | ||||
| * | Properly handle return code of OC_App::getAppPath | Morris Jobke | 2016-02-14 | 1 | -14/+29 |
| | | | | | | | | | | * fixes #20128 * getAppPath could return false, but it was not handled everywhere | ||||
* | | Merge pull request #22381 from owncloud/remove-not-needed-variable | Thomas Müller | 2016-02-15 | 1 | -1/+0 |
|\ \ | | | | | | | Remove not needed variable | ||||
| * | | Remove not needed variable | Morris Jobke | 2016-02-14 | 1 | -1/+0 |
| |/ | |||||
* | | Merge pull request #22380 from owncloud/make-scrutinizer-happy | Thomas Müller | 2016-02-15 | 2 | -2/+2 |
|\ \ | | | | | | | Fix typo in PHPDoc | ||||
| * | | Fix typo in PHPDoc | Morris Jobke | 2016-02-14 | 2 | -2/+2 |
| |/ | |||||
* / | Remove unreachable code in priavte/api.php | Morris Jobke | 2016-02-14 | 1 | -5/+0 |
|/ | |||||
* | Fix BMP support | Morris Jobke | 2016-02-14 | 1 | -0/+1 |
| | | | | * fixes #16461 | ||||
* | Merge pull request #22345 from ↵ | Thomas Müller | 2016-02-13 | 1 | -2/+0 |
|\ | | | | | | | | | owncloud/make-note-if-appcodechecker-is-not-enabled Add note if integrity check is disabled | ||||
| * | Add note if integrity check is disabled | Lukas Reschke | 2016-02-12 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | Our issue template states that users should post the output of `/index.php/settings/integrity/failed`, at the moment it displays that all passes have been passed if the integrity checker has been disabled. This is however a wrong approach considering that some distributions are gonna package Frankenstein releases and makes it harder for us to detect such issues. Thus if the integrity code checker is disabled (using the config switch) it displays now: `Appcode checker has been disabled. Integrity cannot be verified.` This is not displayed anywhere else in the UI except these URL used for us for debugging purposes. | ||||
* | | Merge pull request #22343 from owncloud/check-if-admin-user | Thomas Müller | 2016-02-13 | 1 | -1/+1 |
|\ \ | | | | | | | Check if admin user | ||||
| * | | Check if admin user | Lukas Reschke | 2016-02-12 | 1 | -1/+1 |
| |/ | | | | | | | We should not add the JS for not admin users. | ||||
* | | Always set up a config object within the user object | Morris Jobke | 2016-02-12 | 1 | -15/+10 |
| | | | | | | | | * the new getEmailAddress and setEmailAddress relies on this anyway | ||||
* | | Merge pull request #22309 from owncloud/infinite-recursion-on-expired-link | Thomas Müller | 2016-02-12 | 1 | -2/+2 |
|\ \ | | | | | | | Do not getShare in deleteShare, it's already there when deleting | ||||
| * | | Do not getShare in deleteShare, it's already there when deleting | Joas Schilling | 2016-02-11 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #22317 from owncloud/fix_invisible_linkshares | Thomas Müller | 2016-02-12 | 2 | -0/+27 |
|\ \ \ | |_|/ |/| | | Do not allow invisible link shares |