summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #22549 from owncloud/issue-20470-yellow-warning-for-user-a...Thomas Müller2016-02-242-16/+18
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Use the notification instead of the disruptive popupJoas Schilling2016-02-222-16/+18
* | | | | | | | Merge pull request #20876 from owncloud/reproducing-test-for-20686Thomas Müller2016-02-231-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a test that reproduces #20686Morris Jobke2016-02-231-0/+11
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entriesThomas Müller2016-02-234-17/+68
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix dav unit testsJoas Schilling2016-02-231-11/+11
| * | | | | | | Allow defining a limit and offset for getObjectIdsForTagsJoas Schilling2016-02-233-6/+57
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #22582 from owncloud/case-insensitive-contact-searchThomas Müller2016-02-238-3/+95
|\ \ \ \ \ \ \
| * | | | | | | Make sure we don't quote column names twiceJoas Schilling2016-02-233-3/+3
| * | | | | | | Case insensitive search in contacts - fixes #22575Thomas Müller2016-02-222-3/+3
| * | | | | | | Add ILIKE support to querybuilderThomas Müller2016-02-226-0/+92
* | | | | | | | Merge pull request #22586 from owncloud/be-verbose-when-something-fails-on-ciThomas Müller2016-02-232-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add verbose flag to occ commands of autotest*Joas Schilling2016-02-232-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #22516 from owncloud/core-cumulativenotificationsThomas Müller2016-02-237-119/+299
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Remove unused update-notification styleVincent Petry2016-02-221-2/+2
| * | | | | | | Fix unit tests affected by side effectsVincent Petry2016-02-223-2/+9
| * | | | | | | Accumulate notifications instead of blinkingVincent Petry2016-02-224-115/+288
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #22551 from owncloud/make-exceptions-easier-to-debugThomas Müller2016-02-232-8/+23
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Throw normal exceptions instead of eating themLukas Reschke2016-02-222-8/+23
| | |_|/ / / | |/| | | |
* | | | | | 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
|\ \ \ \ \