summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 9.0.0 beta 2v9.0.0beta2C Montero-Luque2016-02-181-2/+2
* Merge pull request #22493 from owncloud/issue_22467Thomas Müller2016-02-184-13/+9
|\
| * Make scrutinizer happyRoeland Jago Douma2016-02-182-3/+2
| * getRootFolder should not setup the FS for any userRoeland Jago Douma2016-02-183-10/+7
* | Merge pull request #22482 from owncloud/getowner-cacheThomas Müller2016-02-181-1/+6
|\ \
| * | No more staticJoas Schilling2016-02-181-5/+4
| * | cache result for getownerRobin Appelman2016-02-171-1/+7
* | | Merge pull request #22444 from owncloud/fix-federated-share-deleteThomas Müller2016-02-183-79/+152
|\ \ \
| * | | get the actual user instead of a federated cloud idBjoern Schiessle2016-02-181-15/+43
| * | | get the actual user instead of a federated cloud idBjoern Schiessle2016-02-182-64/+109
* | | | Merge pull request #22496 from owncloud/jenkins-22355Thomas Müller2016-02-181-1/+1
|\ \ \ \
| * | | | Fix on shared groups assignment.Leonardo Diez2016-02-181-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #22422 from owncloud/issue-17230-better-promotion-of-app-u...Thomas Müller2016-02-182-1/+12
|\ \ \ \
| * | | | Make app updates better visibleJoas Schilling2016-02-182-1/+12
| | |_|/ | |/| |
* | | | Merge pull request #22489 from owncloud/bump-zipstreamerThomas Müller2016-02-181-0/+0
|\ \ \ \
| * | | | Bump ZipstreamerLukas Reschke2016-02-181-0/+0
| | |/ / | |/| |
* | | | Merge pull request #21610 from owncloud/quota-sharedfileThomas Müller2016-02-185-24/+180
|\ \ \ \
| * | | | Defer quota check in web UI when overwriting shared fileVincent Petry2016-02-172-9/+42
| * | | | Don't apply quota in stream wrapper for part filesVincent Petry2016-02-171-5/+22
| * | | | Check the quota on the actual file's storage in dav quota pluginVincent Petry2016-02-172-10/+116
* | | | | Merge pull request #22498 from owncloud/fedshare-testremote-after-404Thomas Müller2016-02-181-0/+3
|\ \ \ \ \
| * | | | | Properly trigger testRemote after getting a 404 from remote fed shareVincent Petry2016-02-181-0/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #22497 from owncloud/fix-redirect-responseThomas Müller2016-02-182-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix unit testv1r0x2016-02-181-1/+1
| * | | | set correct http status codev1r0x2016-02-181-1/+1
|/ / / /
* | | | Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracleThomas Müller2016-02-182-0/+20
|\ \ \ \
| * | | | Make sure our index names fit in oracleJoas Schilling2016-02-161-0/+11
| * | | | Add index names so Doctrine does not use a too long random stringJoas Schilling2016-02-151-0/+9
* | | | | Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_sharesThomas Müller2016-02-182-7/+356
|\ \ \ \ \
| * | | | | Add unit tests for formatShareRoeland Jago Douma2016-02-171-0/+325
| * | | | | OCS Share API should not return invalid sharesRoeland Jago Douma2016-02-172-7/+31
| | |/ / / | |/| | |
* | | | | Merge pull request #22478 from owncloud/external-missing-authThomas Müller2016-02-181-0/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | dont die when missing an auth backendRobin Appelman2016-02-171-0/+7
| | |_|/ | |/| |
* | | | Merge pull request #22475 from owncloud/fix-js-issuesThomas Müller2016-02-181-2/+2
|\ \ \ \
| * | | | Fixes code analysis issuesMorris Jobke2016-02-171-2/+2
* | | | | Merge pull request #22418 from owncloud/issue-22393-filelist-plugins-for-othe...Thomas Müller2016-02-182-9/+8
|\ \ \ \ \
| * | | | | Show the comments and tags on the share filtersJoas Schilling2016-02-162-9/+8
* | | | | | Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detectionThomas Müller2016-02-181-1/+2
|\ \ \ \ \ \
| * | | | | | Fix GDrive mime type detection with encryptionVincent Petry2016-02-151-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #22491 from pra85/patch-1Thomas Müller2016-02-181-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix a typo in ReadmePrayag Verma2016-02-181-1/+1
|/ / / / /
* | | | | Merge pull request #22446 from owncloud/3rdparty-adjustmentThomas Müller2016-02-171-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add new patchwork referencesLukas Reschke2016-02-171-0/+0
* | | | | Merge pull request #22340 from owncloud/allow-licensephp-for-app-repos-aswellThomas Müller2016-02-171-9/+53
|\ \ \ \ \
| * | | | | Check the mailmap file of core as wellJoas Schilling2016-02-171-1/+28
| * | | | | Allow the script to run for different git rootsJoas Schilling2016-02-171-8/+25
* | | | | | Merge pull request #16783 from owncloud/handle-redirects-globalThomas Müller2016-02-179-20/+130
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | Add handler for global ajax errorsVincent Petry2016-02-157-22/+117