Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.0 => 3.x-dev #9905

Merged
merged 61 commits into from Mar 9, 2016
Merged

Merge 3.0 => 3.x-dev #9905

merged 61 commits into from Mar 9, 2016

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Mar 9, 2016

re naming of this branch see #9891 . We can change it later.

This will be our develop branch for 3.X development. We should fix all bugs in the future here and in case it is a major bug or security bug, we can cherry-pick some fixes into the 2.x-dev branch (this branch does not exist yet).

This branch is very much work in progress but in general everything should work. It's a big diff as we have already merged many PRs into 3.0 branch over the last months.

There are 2 system tests failing currently. It's only a different order of a system test xml file. I cannot reproduce it locally (tests are green) and at the same time I cannot download the processed xml from travis / builds server as processed files by plugins are not uploaded to the builds server. I will have a look at this later again.

tsteur and others added 30 commits October 6, 2015 16:23
Author:    Jens Averkamp <j.averkamp@two-developers.com>
…cted

To the Piwik\Plugins\Login\Controller class: This change is to prevent extending classes (third-party login plugins reusing the core Login plugin implementation) from having to copy-paste \Login\Controller code which, if declared "private" cannot be part of the child class.

Please refer to #8681 for details - that PR, which is an exact copy, was merged into the Piwik 2.x branch, but then reverted to not break existing plugins. It was decided to do that on the 3.x branch instead, which this PR does.
tsteur and others added 25 commits October 19, 2015 14:22
Apply number formatting changes from master to 3.X branch
…y menu item and when category contains only one item
Conflicts:
	core/Version.php
	plugins/Actions/Menu.php
	plugins/CoreHome/angularjs/history/history.service.js
	plugins/CoreHome/javascripts/menu.js
	plugins/CoreHome/templates/_menu.twig
	plugins/Dashboard/Menu.php
	plugins/Ecommerce/Menu.php
	plugins/ExampleUI/Menu.php
	plugins/Goals/Menu.php
	plugins/Referrers/Menu.php
	plugins/VisitsSummary/Menu.php
	tests/UI/expected-ui-screenshots
	tests/UI/specs/UIIntegration_spec.js
Conflicts:
	core/Version.php
	plugins/CoreHome/javascripts/menu.js
	plugins/Events/Reports/GetActionFromCategoryId.php
	plugins/Events/Reports/GetActionFromNameId.php
	plugins/Events/Reports/GetCategoryFromActionId.php
	plugins/Events/Reports/GetCategoryFromNameId.php
	plugins/Events/Reports/GetNameFromActionId.php
	plugins/Events/Reports/GetNameFromCategoryId.php
	tests/UI/expected-ui-screenshots
Conflicts:
	.travis.yml
	CHANGELOG.md
	core/Plugin/ControllerAdmin.php
	core/Version.php
	core/testMinimumPhpVersion.php
	plugins/API/API.php
	plugins/Actions/Reports/GetPageUrls.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreHome/CoreHome.php
	plugins/CoreHome/templates/_menu.twig
	plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
	plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
	plugins/Goals/Controller.php
	tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
	tests/PHPUnit/Integration/Plugin/ManagerTest.php
	tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
	tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
	tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
	tests/UI/expected-ui-screenshots
	tests/UI/specs/Overlay_spec.js
	tests/UI/specs/UIIntegration_spec.js
Conflicts:
	core/Version.php
	plugins/CoreConsole/Commands/ManagePlugin.php
	plugins/CoreHome/angularjs/siteselector/siteselector.directive.js
	plugins/CoreHome/javascripts/corehome.js
	plugins/Ecommerce/Menu.php
	plugins/Events/Events.php
	plugins/Goals/Goals.php
	plugins/Live/templates/index.twig
	plugins/UserCountryMap/UserCountryMap.php
	plugins/UsersManager/stylesheets/usersManager.less
	plugins/VisitsSummary/Controller.php
	plugins/VisitsSummary/Reports/Get.php
	tests/UI/expected-ui-screenshots
@tsteur tsteur added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Mar 9, 2016
Conflicts:
	CHANGELOG.md
	composer.json
	core/Version.php
	core/WidgetsList.php
	lang/sq.json
	lang/tr.json
	plugins/API/API.php
	plugins/CoreHome/Widgets.php
	plugins/CoreHome/javascripts/corehome.js
	plugins/CoreHome/javascripts/menu_init.js
	plugins/CoreHome/javascripts/top_controls.js
	plugins/CoreHome/lang/en.json
	plugins/CoreHome/stylesheets/layout.less
	plugins/CoreHome/templates/_menu.twig
	plugins/Dashboard/Dashboard.php
	plugins/Dashboard/javascripts/dashboardObject.js
	plugins/ExampleRssWidget/Widgets/RssChangelog.php
	plugins/Goals/templates/getGoalReportView.twig
	tests/PHPUnit/Integration/WidgetsListTest.php
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
tsteur added a commit that referenced this pull request Mar 9, 2016
@tsteur tsteur merged commit 1854f5c into 3.x-dev Mar 9, 2016
@mattab mattab deleted the 3.0 branch October 4, 2016 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants