Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-25 | 608 | -1034/+4140 |
| | |||||
* | Merge pull request #22593 from owncloud/swift-docker-fix | Thomas Müller | 2016-02-24 | 2 | -277/+1 |
|\ | | | | | Enable upstream entrypoint changes with Ceph Docker | ||||
| * | Enable upstream entrypoint changes with Ceph Docker | Robin McCorkell | 2016-02-23 | 2 | -277/+1 |
| | | |||||
* | | Merge pull request #22612 from owncloud/davclient-update-headers | Thomas Müller | 2016-02-24 | 1 | -1/+2 |
|\ \ | | | | | | | Update davclient.js for headers fix | ||||
| * | | Update davclient.js for headers fix | Vincent Petry | 2016-02-24 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #22592 from owncloud/fix-response-header | Thomas Müller | 2016-02-24 | 3 | -21/+73 |
|\ \ \ | | | | | | | | | Add header for attachment disposition only once | ||||
| * | | | Drop unneeded use statements | Morris Jobke | 2016-02-23 | 1 | -4/+0 |
| | | | | |||||
| * | | | Add header for attachment disposition only once | Lukas Reschke | 2016-02-23 | 3 | -17/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent refactorings have resulted in the header being added twice, this makes browsers ignore the header which removes any security gains. This changeset adds the header only once and adds integration tests ensuring the correct header in future. https://github.com/owncloud/core/issues/22577 | ||||
* | | | | Merge pull request #22573 from owncloud/issue-22568-allow-string-object-ids | Thomas Müller | 2016-02-24 | 4 | -44/+43 |
|\ \ \ \ | | | | | | | | | | | Make sure we can store strings as per the interface | ||||
| * | | | | Make sure we can store strings as per the interface | Joas Schilling | 2016-02-22 | 4 | -44/+43 |
| | | | | | |||||
* | | | | | Merge pull request #22565 from owncloud/avoid-scanning-root-storage | Thomas Müller | 2016-02-24 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Avoids scanning the root storage | ||||
| * | | | | | Avoids scanning the root storage | Morris Jobke | 2016-02-22 | 1 | -0/+4 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This check will skip the background scan for the root storage because there is nothing in the root storage that isn't already in another (mostly user-) storage. Fixes #22501 | ||||
* | | | | | Merge pull request #22549 from ↵ | Thomas Müller | 2016-02-24 | 2 | -16/+18 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | owncloud/issue-20470-yellow-warning-for-user-and-group-errors Use the notification instead of the disruptive popup for settings/users errors | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Behat test for update of a shared file | ||||
| * | | | | | Add a test that reproduces #20686 | Morris Jobke | 2016-02-23 | 1 | -0/+11 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | * user with a quota of 0 gets a file shared and can't update this file because the wrong quota is used to verify if the update is allowed | ||||
* | | | | | Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries | Thomas Müller | 2016-02-23 | 4 | -17/+68 |
|\ \ \ \ \ | |/ / / / |/| | | | | Allow defining a limit and offset for getObjectIdsForTags | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Case insensitive contact search | ||||
| * | | | | | 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* | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Accumulate notifications instead of blinking | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The notification tests were not restoring the clock properly, but indirectly helped other tests pass. Since now we're restoring the clock properly, the other tests were fixed to still work. | ||||
| * | | | | | Accumulate notifications instead of blinking | Vincent Petry | 2016-02-22 | 4 | -115/+288 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | This makes it possible to display multiple notifications. If the options.type is set to "error", it will also add a close button. | ||||
* | | | | | 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 | ||||
| * | | | | Throw normal exceptions instead of eating them | Lukas Reschke | 2016-02-22 | 2 | -8/+23 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | Partially addresses https://github.com/owncloud/core/issues/22550 Replaces https://github.com/owncloud/core/pull/20185 | ||||
* | | | | 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… | ||||
| * | | | 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 FilesReportPlugin::processFilterRules non-public | ||||
| * | | | 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 option to enable executable checks again | ||||
| * | | | moved set -e after executable checking with which as old position off set -e ↵ | Andreas Schubert | 2016-02-19 | 1 | -2/+2 |
| |/ / | | | | | | | | | | stopped the script at this point without any error message | ||||
* | | | Merge pull request #22536 from owncloud/add-integration-tests-for-tags | Thomas Müller | 2016-02-22 | 7 | -6/+1139 |
|\ \ \ | | | | | | | | | Add integration tests for tags plus fix permissions | ||||
| * | | | Check if user has permission to create such a tag | Lukas Reschke | 2016-02-19 | 4 | -6/+285 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22512 | ||||
| * | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | We should check for exceptions when trying to get the avatar | Roeland Jago Douma | 2016-02-22 | 4 | -1/+35 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22550 * Updated phpdoc of avatatmanager * Add unit test | ||||
* | | | | Merge pull request #22555 from owncloud/jenkins-19978 | Thomas Müller | 2016-02-22 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Show username when writing "Insufficient storage" into owncloud.log | ||||
| * | | | | Solution for Proposal #19974 | Pierre Jochem | 2016-02-22 | 1 | -0/+3 |
| |/ / / | | | | | | | | | | | | | Show username when writing into owncloud.log | ||||
* | | | | Merge pull request #22561 from owncloud/ie-publicpagefooter | Thomas Müller | 2016-02-22 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | Fix public page footer position in IE | ||||
| * | | | | Fix public page footer position in IE | Vincent Petry | 2016-02-22 | 1 | -0/+5 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content element needs hasLayout, so triggering it with a display attribute. Without this, the #content element's height would be as high as the window's height instead of adjusting itself to its contents' height. | ||||
* | | | | Merge pull request #22548 from owncloud/fix-pagination-in-ie | Vincent Petry | 2016-02-22 | 1 | -1/+0 |
|\ \ \ \ | |/ / / |/| | | | Fixes pagination in IE | ||||
| * | | | Fixes pagination in IE | Morris Jobke | 2016-02-22 | 1 | -1/+0 |
|/ / / | | | | | | | | | | | | | * tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares * fixes #20044 |