summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22582 from owncloud/case-insensitive-contact-searchThomas Müller2016-02-236-0/+92
|\ | | | | Case insensitive contact search
| * Make sure we don't quote column names twiceJoas Schilling2016-02-233-3/+3
| |
| * Add ILIKE support to querybuilderThomas Müller2016-02-226-0/+92
| |
* | Merge pull request #22581 from owncloud/fix_interfaceThomas Müller2016-02-221-3/+15
|\ \ | |/ |/| since 9.0 we have a additional parameter $position used for integrity…
| * since 9.0 we have a additional parameter $position used for integrity checksBjoern Schiessle2016-02-221-3/+15
| |
* | Merge pull request #22552 from owncloud/fix-avconv-preview-parametersThomas Müller2016-02-221-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 optionJoas Schilling2016-02-221-2/+2
| | |
* | | We should check for exceptions when trying to get the avatarRoeland Jago Douma2016-02-222-0/+4
|/ / | | | | | | | | | | | | Fixes #22550 * Updated phpdoc of avatatmanager * Add unit test
* | Merge pull request #22503 from owncloud/issue_22500Thomas Müller2016-02-191-2/+14
|\ \ | | | | | | When (re-)sharing an incomming federated share set the corrent owner
| * | 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 #22518 from owncloud/checkdeletebeforecopyinsteadofrenameThomas Müller2016-02-192-0/+8
|\ \ | | | | | | Check delete permission before attemping copy+delete
| * | Check delete permission before attemping copy+deleteVincent Petry2016-02-192-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_22119Thomas Müller2016-02-191-2/+20
|\ \ | | | | | | Do not copy skeleton on avatar access
| * | Do not copy skeleton on avatar accessRoeland Jago Douma2016-02-161-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-agesThomas Müller2016-02-191-37/+0
|\ \ \ | | | | | | | | Remove old adapter - mssql is not supported
| * | | Remove old adapter - mssql is not supportedJoas Schilling2016-02-191-37/+0
| | | |
* | | | Merge pull request #22218 from owncloud/occ-no-extra-messagesThomas Müller2016-02-191-1/+21
|\ \ \ \ | |/ / / |/| | | Add global --no-warnings option to occ…
| * | | Add global --no-warning option to occ in order not to pollute output with ↵Victor Dubiniuk2016-02-191-1/+21
| | |/ | |/| | | | | | | warnings
* | | Fix even moreRoeland Jago Douma2016-02-191-1/+2
| | |
* | | Fix more thingsJoas Schilling2016-02-194-7/+7
| | |
* | | Fix PHPDocThomas Müller2016-02-191-1/+1
| | |
* | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-02-198-16/+22
|/ / | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | 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
| |/ /