aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* When (re-)sharing an incomming federated share set the corrent ownerRoeland Jago Douma2016-02-191-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 #22493 from owncloud/issue_22467Thomas Müller2016-02-184-13/+9
|\ | | | | getRootFolder should not setup the FS for any user
| * Make scrutinizer happyRoeland Jago Douma2016-02-182-3/+2
| |
| * getRootFolder should not setup the FS for any userRoeland Jago Douma2016-02-183-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-cacheThomas Müller2016-02-181-1/+6
|\ \ | | | | | | cache result for getowner
| * | No more staticJoas Schilling2016-02-181-5/+4
| | |
| * | cache result for getownerRobin Appelman2016-02-171-1/+7
| | |
* | | Merge pull request #21610 from owncloud/quota-sharedfileThomas Müller2016-02-181-5/+22
|\ \ \ | | | | | | | | Fix quota check for single shared files
| * | | Don't apply quota in stream wrapper for part filesVincent Petry2016-02-171-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.
* | | | set correct http status codev1r0x2016-02-181-1/+1
| |_|/ |/| | | | | Was intended to respond with a 303 (See other) status code instead of 307 (Temporary Redirect).
* | | Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracleThomas Müller2016-02-181-0/+11
|\ \ \ | |_|/ |/| | Add index names so Doctrine does not use a too long random string
| * | Make sure our index names fit in oracleJoas Schilling2016-02-161-0/+11
| | |
* | | Merge pull request #16783 from owncloud/handle-redirects-globalThomas Müller2016-02-172-2/+10
|\ \ \ | |_|/ |/| | Adding global error handler for ajax calls which run into redirection…
| * | Send 401 header for OC_JSON::checkLoggedIn()Lukas Reschke2016-02-161-0/+1
| | |
| * | Catch auth coming from JS in OCSLukas Reschke2016-02-151-2/+9
| |/
* | Merge pull request #22451 from owncloud/use-proper-user-folderThomas Müller2016-02-171-1/+1
|\ \ | | | | | | Handles null as return code and uses proper UserFolder in trashbin
| * | Handles null as return code and uses proper UserFolder in trashbinMorris Jobke2016-02-161-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-172-0/+8
|/ /
* | Merge pull request #22416 from owncloud/fix_22402Thomas Müller2016-02-161-11/+5
|\ \ | | | | | | Return proper error string if sharing for this user is disabled
| * | Return proper error string if sharing for this user is disabledRoeland Jago Douma2016-02-161-11/+5
| | | | | | | | | | | | Fixes #22402
* | | Merge pull request #22338 from owncloud/fix_22247Thomas Müller2016-02-161-2/+3
|\ \ \ | |/ / |/| | Allow more characters in filenames
| * | More characters are allowed on POSIX systemsRoeland Jago Douma2016-02-121-2/+3
| | |
* | | Merge pull request #22407 from fancycode/untrusted_domainThomas Müller2016-02-161-1/+1
|\ \ \ | | | | | | | | Pass checked host as "domain" variable to "untrustedDomain" template.
| * | | Pass checked host as "domain" variable to "untrustedDomain" template.Joachim Bauch2016-02-151-1/+1
| | |/ | |/| | | | | | | Currently the "SERVER_NAME" is passed to the template, which in some cases doesn't match the host returned by "getInsecureServerHost" (or is empty).
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-162-0/+2
| | |
* | | Merge pull request #22376 from owncloud/fix-return-code-getAppPathThomas Müller2016-02-151-14/+29
|\ \ \ | |/ / |/| | Properly handle return code of OC_App::getAppPath
| * | Properly handle return code of OC_App::getAppPathMorris Jobke2016-02-141-14/+29
| | | | | | | | | | | | | | | * fixes #20128 * getAppPath could return false, but it was not handled everywhere
* | | Merge pull request #22381 from owncloud/remove-not-needed-variableThomas Müller2016-02-151-1/+0
|\ \ \ | | | | | | | | Remove not needed variable
| * | | Remove not needed variableMorris Jobke2016-02-141-1/+0
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-156-0/+10
| | |
* | | Merge pull request #22380 from owncloud/make-scrutinizer-happyThomas Müller2016-02-152-2/+2
|\ \ \ | | | | | | | | Fix typo in PHPDoc
| * | | Fix typo in PHPDocMorris Jobke2016-02-142-2/+2
| |/ /
* / / Remove unreachable code in priavte/api.phpMorris Jobke2016-02-141-5/+0
|/ /
* | Fix BMP supportMorris Jobke2016-02-141-0/+1
| | | | | | | | * fixes #16461
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-142-0/+2
| |
* | Merge pull request #22345 from ↵Thomas Müller2016-02-131-2/+0
|\ \ | | | | | | | | | | | | owncloud/make-note-if-appcodechecker-is-not-enabled Add note if integrity check is disabled
| * | Add note if integrity check is disabledLukas Reschke2016-02-121-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-userThomas Müller2016-02-131-1/+1
|\ \ \ | | | | | | | | Check if admin user
| * | | Check if admin userLukas Reschke2016-02-121-1/+1
| |/ / | | | | | | | | | We should not add the JS for not admin users.
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1310-0/+12
| | |
* | | Always set up a config object within the user objectMorris Jobke2016-02-121-15/+10
| | | | | | | | | | | | * the new getEmailAddress and setEmailAddress relies on this anyway
* | | Merge pull request #22309 from owncloud/infinite-recursion-on-expired-linkThomas Müller2016-02-121-2/+2
|\ \ \ | | | | | | | | Do not getShare in deleteShare, it's already there when deleting
| * | | Do not getShare in deleteShare, it's already there when deletingJoas Schilling2016-02-111-2/+2
| | | |
* | | | Merge pull request #22317 from owncloud/fix_invisible_linksharesThomas Müller2016-02-122-0/+27
|\ \ \ \ | |_|/ / |/| | | Do not allow invisible link shares
| * | | Add parent for invisible link sharesRoeland Jago Douma2016-02-112-0/+27
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1284-84/+12
| |_|/ |/| |
* | | Merge pull request #22315 from owncloud/update-info-checker-requirementsThomas Müller2016-02-111-12/+5
|\ \ \ | | | | | | | | Update info checker requirements
| * | | Update info checker requirementsJoas Schilling2016-02-111-12/+5
| | |/ | |/|
* | | Merge pull request #22264 from owncloud/read-version-from-info.xml-onlyThomas Müller2016-02-114-19/+6
|\ \ \ | | | | | | | | No longer evaluate appinfo/version
| * | | No longer evaluate appinfo/versionThomas Müller2016-02-104-19/+6
| | | |