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

Better piwik.js json compatibility #11024

Merged
merged 4 commits into from Dec 16, 2016
Merged

Better piwik.js json compatibility #11024

merged 4 commits into from Dec 16, 2016

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Dec 16, 2016

fixes #11023

Not necessarily needed to be merged in Piwik 3, can also do it in Piwik 3.1 or something.

@tsteur tsteur added the Needs Review PRs that need a code review label Dec 16, 2016
@tsteur tsteur added this to the 3.0.0-rc milestone Dec 16, 2016
@tsteur
Copy link
Member Author

tsteur commented Dec 16, 2016

tests should be fixed after the last commit

# Conflicts:
#	js/piwik.js
#	js/piwik.min.js
#	piwik.js
@mattab mattab merged commit a8240ff into 3.x-dev Dec 16, 2016
@mattab mattab deleted the jsonpiwik branch December 16, 2016 05:07
@mattab mattab added the Enhancement For new feature suggestions that enhance Matomo's capabilities or add a new report, new API etc. label Dec 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement For new feature suggestions that enhance Matomo's capabilities or add a new report, new API etc. Needs Review PRs that need a code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make JSON usage in piwik.js a bit more stable and reduce conflict with other libraries
2 participants