github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2016-08-16	API should not prettify labels when requesting period=week with many periods ↵	Thomas Steur
	(#10381) * fixes #7480 API should not prettify labels when requesting period=week with many periods * we still need to format the period * fix tests * Update CHANGELOG.md
2014-10-11	Merge branch 'master' into deprecate_usersettings	sgiehl
	Conflicts: core/Version.php plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_day.xml tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_week.xml tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserEngines_day.xml tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserType_day.xml tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml tests/PHPUnit/System/expected/test_noVisit__UserSettings.getBrowserType_day.xml