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 2.x dev into master #10524

Merged
merged 23 commits into from Sep 19, 2016
Merged

Merge 2.x dev into master #10524

merged 23 commits into from Sep 19, 2016

Conversation

mattab
Copy link
Member

@mattab mattab commented Sep 19, 2016

No description provided.

YAMAMOTO Takashi and others added 23 commits August 25, 2016 17:33
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
@mattab mattab added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Sep 19, 2016
@mattab mattab added this to the 2.16.3 milestone Sep 19, 2016
@mattab mattab merged commit 482d4cf into master Sep 19, 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants