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
Merge 3.x => master #10664
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…me map when displayed on a page
…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.
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
Merge 2.x => 3.x-dev
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
The start of a new era! Welcome to the future 🎉 |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please issue pull request against the
3.x-dev
branch as themaster
branch currently represents our2.X
version which is in LTS mode.Important fixes will be merged into
master
if needed after it was merged to3.x-dev
.