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 2.x => 3.x-dev #10648
Merged
Merge 2.x => 3.x-dev #10648
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
Use kanji strings instead of just 'Piwik'.
* Mention usage of Git LFS in Changelog [ci skip] * Update CHANGELOG.md
Fix possible twig error in updater if support is defined but no email
Updates internal piwik component dependencies (2.x)
Add possibility to retry _paq plugin method calls at a later point
* Split piwik.js in multiple files minor tweak * Do not create the piwik.js in tests as it's not needed * check whether test failure is related to previous commit: re-add file_put_contents($targetFile, '');
* make sure to set an entry page if none is set yet * fix possible error * Site searches will set idaction=0, which is actually a valid entry page url, so we test specifically for false * Add test case where the visit directly starts with an event * Add system test where the first actions of a visit are events (without URL set), followed by a pageview later -> the pageview will be set as the entry page * Update processed api responses * UI tests: two new fields in log_visit have been updated * Processed API responses
Merge 2.x dev into master
Merge 2.x into master
…#10443) * convert hour to send report to/from UTC, to ensure it isn't affected by daylight savings * adds update script to change existing scheduled reports to use utc time * code improvement * adds missing param
…plugin archiving (#10366) * added hook to alllow plugin archiving prevention * cr code style notes * reworked PR to fit CR suggestions * added PHPDoc for hook * Event description more consistent
…it table: visit_entry_idaction_url
…" during upgrade by simply ignoring the whole error
Display warning in console command when the DB upgrade is major
Mark 2.16.3 DB upgrade as Major as it updates a field on the log_visit table: visit_entry_idaction_url
…ough to upgrade Piwik to latest major version
…ade_to_use_latest_major Warn users (in all admin pages) when the PHP version is not recent enough to upgrade Piwik to latest major version
Conflicts: core/Version.php
…writable, display a useful error message If Piwik is not installed yet, it's possible the tmp/ folder is not writable we prevent failing with an unclear message eg. coming from doctrine-cache by forcing to use a cache backend which always works ie. array
…_tmp_folder_show_useful_msg If Piwik is not installed yet, it's possible the tmp/ folder is not writable, display a useful error message
tsteur
added
not-in-changelog
For issues or pull requests that should not be included in our release changelog on matomo.org.
Needs Review
PRs that need a code review
labels
Oct 3, 2016
Conflicts: plugins/ScheduledReports/javascripts/pdf.js plugins/ScheduledReports/templates/_addReport.twig
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Needs Review
PRs that need a code review
not-in-changelog
For issues or pull requests that should not be included in our release changelog on matomo.org.
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.
When merging, please make sure to not squash