Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-07-17 | Added initial UI integration tests that use cutycapt to take screenshots of ↵ | Benaka Moorthi | |
URLs. | |||
2013-07-07 | fixed some doc blocks, unresolved variables | sgiehl | |
2013-06-28 | Add composer.lock so everyone uses the same version | Fabian Becker | |
Remove composer.lock from .gitignore | |||
2013-06-25 | * Adding htaccess to allow loading SVG+PNG logos on Settings page | mattab | |
Refs #4019 | |||
2013-06-23 | Merge pull request #75 | Fabian Becker | |
2013-06-22 | Huge merge! Lets see how the tests run.. | Fabian Becker | |
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 | |||
2013-05-23 | Move the user logo from themes folder to misc | Thomas ZILLIOX | |
2013-05-15 | Modify XHProf building instructions & add more xhprof related files to ↵ | Benaka Moorthi | |
.gitingore. | |||
2013-04-04 | Add vendor/ to .gitignore for now | Fabian Becker | |
2013-04-01 | Add composer.phar/composer.lock to .gitignore | Fabian Becker | |
2013-03-16 | Add docs/ directory to gitignore | Fabian Becker | |
[ci skip] | |||
2013-03-07 | .gitignore | mattab | |
2013-03-06 | Minor feedback forum | mattab | |
2013-02-28 | Add xhprof build files to .gitignore. | diosmosis | |
2013-02-22 | git ignore custom logos #3318 | mattab | |
2013-02-20 | FIxes #3761 Regenerate cache file on first cache miss | mattab | |
2013-02-20 | Adding directory as it's missing | mattab | |
2013-02-13 | Merge remote-tracking branch 'upstream/master' into svg-map-widget | Gregor Aisch | |
Conflicts: .gitignore | |||
2013-02-11 | Fix tests | mattab | |
2013-02-08 | Merge branch 'master' of github.com:piwik/piwik | Stefan Giehl | |
2013-02-07 | Merge remote-tracking branch 'upstream/master' into svg-map-widget | Gregor Aisch | |
2013-02-07 | Added GeoIP test files to .gitignore. | diosmosis | |
2013-02-06 | Merge remote-tracking branch 'upstream/master' into svg-map-widget | Gregor Aisch | |
Conflicts: .gitignore plugins/UserCountryMap/Controller.php plugins/UserCountryMap/UserCountryMap.php | |||
2013-02-06 | Merge branch 'master' of github.com:piwik/piwik | Stefan Giehl | |
Conflicts: .gitignore | |||
2013-02-06 | Adding tests/results to .gitignore. | Fabian Becker | |
Also removing trailing * as it is not needed. | |||
2013-02-05 | Merge branch 'master' of github.com:piwik/piwik | Stefan Giehl | |
Conflicts: .gitignore | |||
2013-02-05 | Add contents of integration tests processed dir and VisualPHPUnit resource ↵ | diosmosis | |
cache dir to .gitignore. | |||
2013-02-04 | ignoring .DS_Store files (mac stuff) | Gregor Aisch | |
2013-02-04 | added config.ini.php to .gitignore | gka | |
to prevent accidental commit of database passwords | |||
2013-02-04 | added config.ini.php to .gitignore | Stefan Giehl | |
2013-02-04 | added phpunit.xml to .gitignore | Stefan Giehl | |
2013-02-03 | Adding .gitignore refs #3721 | mattab | |