summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Install new shipped apps after upgrading all existing appsThomas Müller2016-02-231-4/+4
* Before installing new shipped apps we need to load authentication apps - fixe...Thomas Müller2016-02-231-1/+1
* 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 checksBjoern Schiessle2016-02-221-3/+15
* | Merge pull request #22570 from owncloud/make-method-non-publicThomas Müller2016-02-222-9/+9
|\ \
| * | Make non-public-method protectedJoas Schilling2016-02-222-9/+9
|/ /
* | Merge pull request #22527 from wern/masterThomas Müller2016-02-221-2/+2
|\ \
| * | moved set -e after executable checking with which as old position off set -e ...Andreas Schubert2016-02-191-2/+2
| |/
* | Merge pull request #22536 from owncloud/add-integration-tests-for-tagsThomas Müller2016-02-227-6/+1139
|\ \
| * | Check if user has permission to create such a tagLukas Reschke2016-02-194-6/+285
| * | Add integration tests for tagsLukas Reschke2016-02-193-0/+854
* | | 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 optionJoas Schilling2016-02-221-2/+2
* | | | Merge pull request #22554 from owncloud/fix_22550Thomas Müller2016-02-224-1/+35
|\ \ \ \
| * | | | We should check for exceptions when trying to get the avatarRoeland Jago Douma2016-02-224-1/+35
| |/ / /
* | | | Merge pull request #22555 from owncloud/jenkins-19978Thomas Müller2016-02-221-0/+3
|\ \ \ \
| * | | | Solution for Proposal #19974Pierre Jochem2016-02-221-0/+3
| |/ / /
* | | | Merge pull request #22561 from owncloud/ie-publicpagefooterThomas Müller2016-02-221-0/+5
|\ \ \ \
| * | | | Fix public page footer position in IEVincent Petry2016-02-221-0/+5
|/ / / /
* | | | Merge pull request #22548 from owncloud/fix-pagination-in-ieVincent Petry2016-02-221-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes pagination in IEMorris Jobke2016-02-221-1/+0
|/ / /
* | | Merge pull request #22526 from owncloud/fix-english-textsThomas Müller2016-02-213-5/+5
|\ \ \ | |/ / |/| |
| * | Fix error ins source language stringsThomas Müller2016-02-193-5/+5
* | | Merge pull request #22511 from owncloud/add-integration-tests-for-commentsLukas Reschke2016-02-195-2/+531
|\ \ \
| * | | Add integration tests for commentsLukas Reschke2016-02-195-2/+531
|/ / /
* | | Merge pull request #22529 from owncloud/tags-styleThomas Müller2016-02-191-4/+32
|\ \ \
| * | | improve tags interface stylingJan-Christoph Borchardt2016-02-191-4/+32
* | | | Merge pull request #22503 from owncloud/issue_22500Thomas Müller2016-02-193-11/+105
|\ \ \ \
| * | | | make sure that the file name doesn't end with a trailing slash. Can for examp...Bjoern Schiessle2016-02-191-0/+3
| * | | | When (re-)sharing an incomming federated share set the corrent ownerRoeland Jago Douma2016-02-192-11/+102
| | |_|/ | |/| |
* | | | Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrenameThomas Müller2016-02-192-0/+8
|\ \ \ \
| * | | | Check delete permission before attemping copy+deleteVincent Petry2016-02-192-0/+8
| |/ / /
* | | | Merge pull request #22410 from owncloud/fix_22119Thomas Müller2016-02-192-33/+40
|\ \ \ \
| * | | | Do not copy skeleton on avatar accessRoeland Jago Douma2016-02-162-33/+40
* | | | | 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 #22521 from owncloud/mssql-is-not-support-since-agesThomas Müller2016-02-191-37/+0
|\ \ \ \ \
| * | | | | Remove old adapter - mssql is not supportedJoas Schilling2016-02-191-37/+0
| |/ / / /
* | | | | 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 #22218 from owncloud/occ-no-extra-messagesThomas Müller2016-02-192-2/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add global --no-warning option to occ in order not to pollute output with war...Victor Dubiniuk2016-02-192-2/+23
* | | | | | 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 #22487 from owncloud/hidden-text-for-informationThomas Müller2016-02-191-0/+7
|\ \ \ \ \ \
| * | | | | | Add hidden text to issue templatesLukas Reschke2016-02-181-0/+7
* | | | | | | 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