Welcome to mirror list, hosted at ThFree Co, Russian Federation.
github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
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
|
|
|
|
.gitingore.
|
|
|
|
|
|
[ci skip]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
.gitignore
|
|
|
|
|
|
|
|
|
|
Conflicts:
.gitignore
plugins/UserCountryMap/Controller.php
plugins/UserCountryMap/UserCountryMap.php
|
|
Conflicts:
.gitignore
|
|
Also removing trailing * as it is not needed.
|
|
Conflicts:
.gitignore
|
|
cache dir to .gitignore.
|
|
|
|
to prevent accidental commit of database passwords
|
|
|
|
|
|
|