summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22593 from owncloud/swift-docker-fixThomas Müller2016-02-242-277/+1
|\
| * Enable upstream entrypoint changes with Ceph DockerRobin McCorkell2016-02-232-277/+1
* | Merge pull request #22592 from owncloud/fix-response-headerThomas Müller2016-02-241-17/+0
|\ \
| * | Drop unneeded use statementsMorris Jobke2016-02-231-4/+0
| * | Add header for attachment disposition only onceLukas Reschke2016-02-231-13/+0
* | | Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entriesThomas Müller2016-02-231-11/+11
|\ \ \ | |_|/ |/| |
| * | Fix dav unit testsJoas Schilling2016-02-231-11/+11
| |/
* | Merge pull request #22582 from owncloud/case-insensitive-contact-searchThomas Müller2016-02-232-3/+3
|\ \
| * | Case insensitive search in contacts - fixes #22575Thomas Müller2016-02-222-3/+3
| |/
* | Merge pull request #22516 from owncloud/core-cumulativenotificationsThomas Müller2016-02-233-2/+11
|\ \ | |/ |/|
| * Fix unit tests affected by side effectsVincent Petry2016-02-222-1/+6
| * Accumulate notifications instead of blinkingVincent Petry2016-02-221-1/+5
* | Make non-public-method protectedJoas Schilling2016-02-222-9/+9
|/
* Merge pull request #22536 from owncloud/add-integration-tests-for-tagsThomas Müller2016-02-224-6/+285
|\
| * Check if user has permission to create such a tagLukas Reschke2016-02-194-6/+285
* | Merge pull request #22555 from owncloud/jenkins-19978Thomas Müller2016-02-221-0/+3
|\ \
| * | Solution for Proposal #19974Pierre Jochem2016-02-221-0/+3
| |/
* | Fix public page footer position in IEVincent Petry2016-02-221-0/+5
* | Fixes pagination in IEMorris Jobke2016-02-221-1/+0
|/
* Merge pull request #22503 from owncloud/issue_22500Thomas Müller2016-02-191-0/+3
|\
| * make sure that the file name doesn't end with a trailing slash. Can for examp...Bjoern Schiessle2016-02-191-0/+3
* | Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpointThomas Müller2016-02-191-0/+4
|\ \
| * | Add FilesPlugin - fixes #22507Thomas Müller2016-02-191-0/+4
* | | Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-urlThomas Müller2016-02-194-5/+90
|\ \ \ | |/ / |/| |
| * | Add correct principals for the current user before ACL checkJoas Schilling2016-02-193-3/+77
| * | Convert the old principal to the new principal before getting calendarsJoas Schilling2016-02-191-2/+13
* | | Merge pull request #22515 from owncloud/webdav_checksum_only_for_filesThomas Müller2016-02-191-5/+7
|\ \ \ | |/ / |/| |
| * | Only add checksum headers for filesRoeland Jago Douma2016-02-191-5/+7
| |/
* | 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-197-83/+84
|\ \ \
| * | | Require CSRF token for non WebDAV authenticated requestsLukas Reschke2016-02-187-83/+84
* | | | 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 #21610 from owncloud/quota-sharedfileThomas Müller2016-02-184-19/+158
|\ \ \ \
| * | | | Defer quota check in web UI when overwriting shared fileVincent Petry2016-02-172-9/+42
| * | | | Check the quota on the actual file's storage in dav quota pluginVincent Petry2016-02-172-10/+116
* | | | | Properly trigger testRemote after getting a 404 from remote fed shareVincent Petry2016-02-181-0/+3
| |_|_|/ |/| | |
* | | | Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracleThomas Müller2016-02-181-0/+9
|\ \ \ \
| * | | | 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