summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #22472 from owncloud/scrutinizer-patch-1Thomas Müller2016-02-198-14/+21
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | 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
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #22198 from owncloud/birthday-calendarThomas Müller2016-02-1914-41/+548
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Adding cli command to sync birthday calendarThomas Müller2016-02-186-14/+171
| * | | | | | Prevent deletion of birthday calendarThomas Müller2016-02-183-8/+8
| * | | | | | Sync a users contacts birthday to the users birthday calendarThomas Müller2016-02-1810-38/+388
* | | | | | | Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixesThomas Müller2016-02-191-4/+13
|\ \ \ \ \ \ \
| * | | | | | | Fix GDrive handling of office filesVincent Petry2016-02-151-4/+13
* | | | | | | | Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdavThomas Müller2016-02-199-85/+90
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Require CSRF token for non WebDAV authenticated requestsLukas Reschke2016-02-189-85/+90
| | |_|/ / / / | |/| | | | |
* | | | | | | 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