summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-25608-1034/+4140
|
* Merge pull request #22593 from owncloud/swift-docker-fixThomas Müller2016-02-242-277/+1
|\ | | | | Enable upstream entrypoint changes with Ceph Docker
| * Enable upstream entrypoint changes with Ceph DockerRobin McCorkell2016-02-232-277/+1
| |
* | Merge pull request #22612 from owncloud/davclient-update-headersThomas Müller2016-02-241-1/+2
|\ \ | | | | | | Update davclient.js for headers fix
| * | Update davclient.js for headers fixVincent Petry2016-02-241-1/+2
| | |
* | | Merge pull request #22592 from owncloud/fix-response-headerThomas Müller2016-02-243-21/+73
|\ \ \ | | | | | | | | Add header for attachment disposition only once
| * | | Drop unneeded use statementsMorris Jobke2016-02-231-4/+0
| | | |
| * | | Add header for attachment disposition only onceLukas Reschke2016-02-233-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-idsThomas Müller2016-02-244-44/+43
|\ \ \ \ | | | | | | | | | | Make sure we can store strings as per the interface
| * | | | Make sure we can store strings as per the interfaceJoas Schilling2016-02-224-44/+43
| | | | |
* | | | | Merge pull request #22565 from owncloud/avoid-scanning-root-storageThomas Müller2016-02-241-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Avoids scanning the root storage
| * | | | | Avoids scanning the root storageMorris Jobke2016-02-221-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üller2016-02-242-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 popupJoas Schilling2016-02-222-16/+18
| | | | |
* | | | | Merge pull request #20876 from owncloud/reproducing-test-for-20686Thomas Müller2016-02-231-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Behat test for update of a shared file
| * | | | | Add a test that reproduces #20686Morris Jobke2016-02-231-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-entriesThomas Müller2016-02-234-17/+68
|\ \ \ \ \ | |/ / / / |/| | | | Allow defining a limit and offset for getObjectIdsForTags
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Case insensitive contact search
| * | | | | 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*
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Accumulate notifications instead of blinking
| * | | | | Remove unused update-notification styleVincent Petry2016-02-221-2/+2
| | | | | |
| * | | | | Fix unit tests affected by side effectsVincent Petry2016-02-223-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 blinkingVincent Petry2016-02-224-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-debugThomas Müller2016-02-232-8/+23
|\ \ \ \ \ | |_|/ / / |/| | | | Throw normal exceptions instead of eating them
| * | | | Throw normal exceptions instead of eating themLukas Reschke2016-02-222-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_interfaceThomas Müller2016-02-221-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 checksBjoern Schiessle2016-02-221-3/+15
| | | |
* | | | Merge pull request #22570 from owncloud/make-method-non-publicThomas Müller2016-02-222-9/+9
|\ \ \ \ | |_|_|/ |/| | | Make FilesReportPlugin::processFilterRules non-public
| * | | 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 option to enable executable checks again
| * | | moved set -e after executable checking with which as old position off set -e ↵Andreas Schubert2016-02-191-2/+2
| |/ / | | | | | | | | | stopped the script at this point without any error message
* | | Merge pull request #22536 from owncloud/add-integration-tests-for-tagsThomas Müller2016-02-227-6/+1139
|\ \ \ | | | | | | | | Add integration tests for tags plus fix permissions
| * | | Check if user has permission to create such a tagLukas Reschke2016-02-194-6/+285
| | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22512
| * | | 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 option
| * | | | 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 avatar
| * | | | We should check for exceptions when trying to get the avatarRoeland Jago Douma2016-02-224-1/+35
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22550 * Updated phpdoc of avatatmanager * Add unit test
* | | | Merge pull request #22555 from owncloud/jenkins-19978Thomas Müller2016-02-221-0/+3
|\ \ \ \ | | | | | | | | | | Show username when writing "Insufficient storage" into owncloud.log
| * | | | Solution for Proposal #19974Pierre Jochem2016-02-221-0/+3
| |/ / / | | | | | | | | | | | | Show username when writing into owncloud.log
* | | | Merge pull request #22561 from owncloud/ie-publicpagefooterThomas Müller2016-02-221-0/+5
|\ \ \ \ | | | | | | | | | | Fix public page footer position in IE
| * | | | Fix public page footer position in IEVincent Petry2016-02-221-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-ieVincent Petry2016-02-221-1/+0
|\ \ \ \ | |/ / / |/| | | Fixes pagination in IE
| * | | Fixes pagination in IEMorris Jobke2016-02-221-1/+0
|/ / / | | | | | | | | | | | | * tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares * fixes #20044