summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make autotest.sh able to output proper coverage againRoeland Jago Douma2015-12-011-1/+1
| | | | | The usage of single quotes make sure that a string is used verbatim in bash. And no variables are subsituted.
* Merge pull request #20855 from owncloud/output-log-integration-testsThomas Müller2015-12-011-2/+7
|\ | | | | tail the server log and exit with the exit code of behat
| * tail the server log and exit with the exit code of behatThomas Müller2015-12-011-2/+7
| |
* | Merge pull request #20850 from owncloud/use-text-instead-of-htmlThomas Müller2015-12-011-3/+3
|\ \ | | | | | | Use .text instead of .html
| * | Use .text instead of .htmlLukas Reschke2015-11-301-3/+3
| | | | | | | | | Makes some static source code analyzers happier.
* | | Merge pull request #20853 from owncloud/php-parser-1.4.1Thomas Müller2015-12-011-0/+0
|\ \ \ | | | | | | | | [3rdparty] Bump php-parser
| * | | [3rdparty] Bump php-parserRoeland Jago Douma2015-12-011-0/+0
| | |/ | |/|
* | | Merge pull request #20825 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-016-9/+9
|\ \ \ | |/ / |/| | Scrutinizer Auto-Fixes
| * | Adjust patchesThomas Müller2015-11-303-6/+6
| | |
| * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-11-305-6/+6
| | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | Merge pull request #20851 from owncloud/tests-for-kill-rebuild-parserThomas Müller2015-12-011-0/+0
|\ \ \ | | | | | | | | [3rdparty] Remove some unrequired files
| * | | Remove some unrequired filesLukas Reschke2015-12-011-0/+0
|/ / /
* | / [tx-robot] updated from transifexJenkins for ownCloud2015-12-016-6/+132
| |/ |/|
* | Merge pull request #20828 from owncloud/sharing_integration_test_20645_morrisThomas Müller2015-11-306-20/+122
|\ \ | |/ |/| Sharing integration test 20645, added sabre dav and propfind check.
| * Change from with ofSergio Bertolin2015-11-302-16/+16
| |
| * Added webdav test to check range downloadsSergio Bertolin2015-11-302-0/+22
| |
| * Making propfinds, having depth in mind and checking it in gherkin descriptionSergio Bertolin2015-11-302-17/+25
| |
| * Use depth 1 and valid properties to get a listVincent Petry2015-11-271-1/+2
| |
| * Added sabre dav in webdav, modified skeleton to have parent and child foldersSergio Bertolin2015-11-274-6/+77
| |
* | Merge pull request #20842 from owncloud/fix-date-time-columnThomas Müller2015-11-301-2/+2
|\ \ | | | | | | Fix column width of mtime column
| * | Fix column width of mtime columnMorris Jobke2015-11-301-2/+2
| | | | | | | | | | | | | | | | | | * in some translations (e.g. german) the header of this column otherwise got truncated "Zeitpunkt der Freigabe" vs "Zeitpunkt der Freig"
* | | Merge pull request #20784 from owncloud/jeremeamia_superclosure_2.1.0Thomas Müller2015-11-301-0/+0
|\ \ \ | | | | | | | | [3rdparty] bump jeremeamia/superclosure to 2.1.0
| * | | [3rdparty] bump jeremeamia/superclosure to 2.1.0Roeland Jago Douma2015-11-271-0/+0
| | | |
* | | | Merge pull request #20829 from owncloud/dav-define-phpunitThomas Müller2015-11-300-0/+0
|\ \ \ \ | | | | | | | | | | Fix already defined warning from dav test bootstrap
| * | | | Fix already defined warning from dav test bootstrapRobin Appelman2015-11-301-1/+3
| | | | |
* | | | | Merge pull request #20845 from owncloud/allow-di-in-appsThomas Müller2015-11-302-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Allow DI the system tag stuff without Application class
| * | | | | Allow DI the system tag stuff without Application classJoas Schilling2015-11-302-1/+9
| | | | | |
* | | | | | Merge pull request #20487 from owncloud/activity-oracle-sql-error-for-favoritesThomas Müller2015-11-303-18/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | Activity oracle sql error for favorites
| * | | | | | Inject the database connectionJoas Schilling2015-11-303-2/+16
| | | | | | |
| * | | | | | Only require the interfaceJoas Schilling2015-11-302-10/+10
| | | | | | |
| * | | | | | Add a unit test that executes the queryJoas Schilling2015-11-301-0/+15
| | | | | | |
| * | | | | | Correctly escape the paths so we only display favorites instead of wildcardsJoas Schilling2015-11-301-1/+1
| | | | | | |
| * | | | | | Oracle can not return statements but only valuesJoas Schilling2015-11-302-7/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | So evaluate the condition directly and return 1 or 0
* | | | | | Merge pull request #20832 from owncloud/update-js-dependenciesThomas Müller2015-11-304-121/+141
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update some JS dependencies
| * | | | | | update bootstrap from 3.3.5 to 3.3.6Morris Jobke2015-11-302-3/+3
| | | | | | |
| * | | | | | update backbone.js from 1.2.1 to 1.2.3Morris Jobke2015-11-303-118/+138
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #20843 from owncloud/fix-share-with-inputThomas Müller2015-11-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix the width of the share with input
| * | | | | | Fix the width of the share with inputMorris Jobke2015-11-301-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * the ID of this has changed to #shareWith-viewNUMBER and shouldn't be used in CSS * now uses the proper classes
* | | | | | Merge pull request #20841 from owncloud/generate-response-using-xml-writerThomas Müller2015-11-301-18/+29
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Use XMLWriter to generate response
| * | | | | Use XMLWriter to generate responseLukas Reschke2015-11-301-18/+29
| | |/ / / | |/| | | | | | | | | | | | | Gets rid of manual XML generation.
* | | | | Merge pull request #20837 from owncloud/fix-mountoptions-dropdownThomas Müller2015-11-301-1/+0
|\ \ \ \ \ | |_|/ / / |/| | | | Fix ext storage mount options dropdown
| * | | | Fix ext storage mount options dropdownVincent Petry2015-11-301-1/+0
| |/ / /
* | | | Merge pull request #20650 from owncloud/systemtags-coreThomas Müller2015-11-3011-5/+1508
|\ \ \ \ | | | | | | | | | | Implement systemtag managers and mapper
| * | | | Fix phpstorm complains in testsJoas Schilling2015-11-302-9/+7
| | | | |
| * | | | Cleanup imports and type hintingThomas Müller2015-11-302-11/+18
| | | | |
| * | | | Add phpunit group for testsJoas Schilling2015-11-302-0/+12
| | | | |
| * | | | Do not count the entries when we only need to know if it is at least oneJoas Schilling2015-11-301-5/+14
| | | | |
| * | | | Fix use statementsJoas Schilling2015-11-303-21/+25
| | | | |
| * | | | Add backticks inside function to escape the columnJoas Schilling2015-11-301-1/+1
| | | | |
| * | | | Added system tags data structure and PHP side managersVincent Petry2015-11-2711-5/+1478
| | | | | | | | | | | | | | | | | | | | Added SystemTagManager and SystemTagObjectMapper