Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
Merge branch 'master' into 2.x-twig
Conflicts:
core/ReportRenderer/Html.php
core/SmartyPlugins/function.ajaxLoadingDiv.php
plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
plugins/CoreHome/templates/donate.tpl
plugins/CoreHome/templates/html_report_header.tpl
plugins/CoreHome/templates/menu.tpl
plugins/CoreHome/templates/period_select.tpl
plugins/CoreHome/templates/reports_by_dimension.tpl
plugins/Feedback/templates/index.tpl
plugins/Goals/Controller.php
plugins/Goals/templates/overview.tpl
plugins/Live/API.php
plugins/Live/templates/lastVisits.tpl
plugins/Live/templates/visitorLog.tpl
plugins/MobileMessaging/templates/SMSReport.tpl
plugins/PDFReports/templates/add.tpl
plugins/PDFReports/templates/list.tpl
plugins/PDFReports/templates/report_parameters.tpl
plugins/SEO/templates/index.tpl
plugins/SegmentEditor/templates/selector.twig
plugins/UserCountry/javascripts/userCountry.js
plugins/Zeitgeist/stylesheets/common.css
tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
|
|
# The bug experienced here is a "test edge case" bug quite tricky to find (couldnt find it or reproduce it, need to setup phpenv properly)
# -> out of reach for my priorities at this stage (single task focus is my new reality). Will come back to fix this bug in June when things should be in control
|
|
Conflicts:
.travis.yml
|
|
|
|
|
|
My goal is to enable scheduled report tests on PHP 5.4 instead of 5.3
|
|
|
|
|
|
|
|
-> Only run full suite in PHP 5.4 with coverage
travis.sh
-> Remove code coverage from tests with specific suite
prepare.sh
-> Use/Install xmlstarlet to rewrite phpunit.xml
|
|
|
|
|
|
This now builds PHP 5.3/5.4/5.5 x 3 Testsuites + all PHP x whole test (for code coverage)
|
|
|
|
|
|
|
|
[ci skip]
|
|
[ci skip]
|
|
|
|
|
|
* removing debug from travis output
|
|
|
|
|
|
|
|
|
|
|
|
refs #3722
|
|
travis/setup_webserver.sh will install nginx + php-fpm
and create configuration files.
travis.sh adjusted to reflect changes.
Moved everything to tests/
refs #3722
|
|
Adjust travis.sh
refs #3722
|
|
and three testsuites together.
refs #3722
|
|
|
|
This should fix the build.
git-svn-id: http://dev.piwik.org/svn/trunk@7840 59fd770c-687e-43c8-a1e3-f5a4ff64c105
|
|
refs #3722
git-svn-id: http://dev.piwik.org/svn/trunk@7836 59fd770c-687e-43c8-a1e3-f5a4ff64c105
|
|
Using the before_script command we now copy a configuration file
to config/. We also create a database for tests.
PHPUnit complained about missing XDebug - so this is added.
git-svn-id: http://dev.piwik.org/svn/trunk@7833 59fd770c-687e-43c8-a1e3-f5a4ff64c105
|
|
http://travis-ci.org)
Travis will test agains PHP 5.3, 5.4 and 5.5.
refs #3721
git-svn-id: http://dev.piwik.org/svn/trunk@7826 59fd770c-687e-43c8-a1e3-f5a4ff64c105
|