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.x => master #10664

Merged
merged 235 commits into from Oct 3, 2016
Merged

Merge 3.x => master #10664

merged 235 commits into from Oct 3, 2016

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Oct 3, 2016

Please issue pull request against the 3.x-dev branch as the master branch currently represents our 2.X version which is in LTS mode.

Important fixes will be merged into master if needed after it was merged to 3.x-dev.

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.
mattab and others added 25 commits October 2, 2016 10:22
when clicking related report, it loads the widget recursively (Resolu…
* updated our font pack, use some material design icons

* fix sign in icon, better help icon

* fix ui tests

* fix more screenshot tests

* add legal notice and readme

* fix remaining  tests
Check if this fixes the issue. If not I'd likely move it out of 3.0
* fixes #10613 - show description as part of the datatable
Clarify that we are in enforced LTS mode and will only merge code in 3.x
Conflicts:
	plugins/ScheduledReports/javascripts/pdf.js
	plugins/ScheduledReports/templates/_addReport.twig
@tsteur tsteur added Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review. not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. labels Oct 3, 2016
@tsteur tsteur merged commit 644db32 into master Oct 3, 2016
@mattab
Copy link
Member

mattab commented Oct 4, 2016

The start of a new era! Welcome to the future 🎉

@mattab mattab added this to the 3.0.0-b1 milestone Oct 4, 2016
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. Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants