Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #22549 from owncloud/issue-20470-yellow-warning-for-user-a... | Thomas Müller | 2016-02-24 | 2 | -16/+18 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Use the notification instead of the disruptive popup | Joas Schilling | 2016-02-22 | 2 | -16/+18 | |
* | | | | | | | | Merge pull request #20876 from owncloud/reproducing-test-for-20686 | Thomas Müller | 2016-02-23 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add a test that reproduces #20686 | Morris Jobke | 2016-02-23 | 1 | -0/+11 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries | Thomas Müller | 2016-02-23 | 4 | -17/+68 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix dav unit tests | Joas Schilling | 2016-02-23 | 1 | -11/+11 | |
| * | | | | | | | Allow defining a limit and offset for getObjectIdsForTags | Joas Schilling | 2016-02-23 | 3 | -6/+57 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #22582 from owncloud/case-insensitive-contact-search | Thomas Müller | 2016-02-23 | 8 | -3/+95 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make sure we don't quote column names twice | Joas Schilling | 2016-02-23 | 3 | -3/+3 | |
| * | | | | | | | Case insensitive search in contacts - fixes #22575 | Thomas Müller | 2016-02-22 | 2 | -3/+3 | |
| * | | | | | | | Add ILIKE support to querybuilder | Thomas Müller | 2016-02-22 | 6 | -0/+92 | |
* | | | | | | | | Merge pull request #22586 from owncloud/be-verbose-when-something-fails-on-ci | Thomas Müller | 2016-02-23 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add verbose flag to occ commands of autotest* | Joas Schilling | 2016-02-23 | 2 | -3/+3 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #22516 from owncloud/core-cumulativenotifications | Thomas Müller | 2016-02-23 | 7 | -119/+299 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Remove unused update-notification style | Vincent Petry | 2016-02-22 | 1 | -2/+2 | |
| * | | | | | | | Fix unit tests affected by side effects | Vincent Petry | 2016-02-22 | 3 | -2/+9 | |
| * | | | | | | | Accumulate notifications instead of blinking | Vincent Petry | 2016-02-22 | 4 | -115/+288 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #22551 from owncloud/make-exceptions-easier-to-debug | Thomas Müller | 2016-02-23 | 2 | -8/+23 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Throw normal exceptions instead of eating them | Lukas Reschke | 2016-02-22 | 2 | -8/+23 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #22581 from owncloud/fix_interface | Thomas Müller | 2016-02-22 | 1 | -3/+15 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | since 9.0 we have a additional parameter $position used for integrity checks | Bjoern Schiessle | 2016-02-22 | 1 | -3/+15 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #22570 from owncloud/make-method-non-public | Thomas Müller | 2016-02-22 | 2 | -9/+9 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Make non-public-method protected | Joas Schilling | 2016-02-22 | 2 | -9/+9 | |
|/ / / / | ||||||
* | | | | Merge pull request #22527 from wern/master | Thomas Müller | 2016-02-22 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | moved set -e after executable checking with which as old position off set -e ... | Andreas Schubert | 2016-02-19 | 1 | -2/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #22536 from owncloud/add-integration-tests-for-tags | Thomas Müller | 2016-02-22 | 7 | -6/+1139 | |
|\ \ \ \ | ||||||
| * | | | | Check if user has permission to create such a tag | Lukas Reschke | 2016-02-19 | 4 | -6/+285 | |
| * | | | | Add integration tests for tags | Lukas Reschke | 2016-02-19 | 3 | -0/+854 | |
* | | | | | Merge pull request #22552 from owncloud/fix-avconv-preview-parameters | Thomas Müller | 2016-02-22 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Move `-an` after the input arg because it is an output option | Joas Schilling | 2016-02-22 | 1 | -2/+2 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #22554 from owncloud/fix_22550 | Thomas Müller | 2016-02-22 | 4 | -1/+35 | |
|\ \ \ \ \ | ||||||
| * | | | | | We should check for exceptions when trying to get the avatar | Roeland Jago Douma | 2016-02-22 | 4 | -1/+35 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #22555 from owncloud/jenkins-19978 | Thomas Müller | 2016-02-22 | 1 | -0/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Solution for Proposal #19974 | Pierre Jochem | 2016-02-22 | 1 | -0/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #22561 from owncloud/ie-publicpagefooter | Thomas Müller | 2016-02-22 | 1 | -0/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix public page footer position in IE | Vincent Petry | 2016-02-22 | 1 | -0/+5 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #22548 from owncloud/fix-pagination-in-ie | Vincent Petry | 2016-02-22 | 1 | -1/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fixes pagination in IE | Morris Jobke | 2016-02-22 | 1 | -1/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #22526 from owncloud/fix-english-texts | Thomas Müller | 2016-02-21 | 3 | -5/+5 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix error ins source language strings | Thomas Müller | 2016-02-19 | 3 | -5/+5 | |
* | | | | Merge pull request #22511 from owncloud/add-integration-tests-for-comments | Lukas Reschke | 2016-02-19 | 5 | -2/+531 | |
|\ \ \ \ | ||||||
| * | | | | Add integration tests for comments | Lukas Reschke | 2016-02-19 | 5 | -2/+531 | |
|/ / / / | ||||||
* | | | | Merge pull request #22529 from owncloud/tags-style | Thomas Müller | 2016-02-19 | 1 | -4/+32 | |
|\ \ \ \ | ||||||
| * | | | | improve tags interface styling | Jan-Christoph Borchardt | 2016-02-19 | 1 | -4/+32 | |
* | | | | | Merge pull request #22503 from owncloud/issue_22500 | Thomas Müller | 2016-02-19 | 3 | -11/+105 | |
|\ \ \ \ \ | ||||||
| * | | | | | make sure that the file name doesn't end with a trailing slash. Can for examp... | Bjoern Schiessle | 2016-02-19 | 1 | -0/+3 | |
| * | | | | | When (re-)sharing an incomming federated share set the corrent owner | Roeland Jago Douma | 2016-02-19 | 2 | -11/+102 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrename | Thomas Müller | 2016-02-19 | 2 | -0/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | Check delete permission before attemping copy+delete | Vincent Petry | 2016-02-19 | 2 | -0/+8 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #22410 from owncloud/fix_22119 | Thomas Müller | 2016-02-19 | 2 | -33/+40 | |
|\ \ \ \ \ |