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

Clarify that we are in LTS and won't merge 2.x stuff anymore #10654

Closed
wants to merge 75 commits into from

Conversation

mattab
Copy link
Member

@mattab mattab commented Oct 3, 2016

Please issue pull request against the 3.x-dev branch only.

Piwik 2 is in LTS mode. This means we do not accept any pull request for 2.x except critical security bugs and major data loss bugs.

If you need to create a pull request for 2.x, then please also create the pull request against the 3.x-dev so we can merge both.

Happy hacking!

YAMAMOTO Takashi and others added 30 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
Merge 2.x dev 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
mattab and others added 26 commits September 29, 2016 11:25
…ritable...), the Updater (for core or plugins) will now automatically throw an error and cancel the update (#10423)

* When updating the config file failed (or when any other file is not writable...), the Updater (for core or plugins) will now automatically throw an error and cancel the update

* add integration test to check the correct exception is thrown when config not writabel

* New integration test for updater

* Make test better
* When opening the visitor profile, do not apply the segment

* added ui test for profile but does work for me

* next try to make ui test work

* add expected screenshot

* added missing doc
* Fix depraction test: use assertDeprecatedMethodIsRemovedInPiwik3

* Fix Scheduled Reports sent one hour late in daylight saving timezones (#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

* Added new event Archiving.makeNewArchiverObject to  allow customising 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

* UI tests: minor changes

* Comment out Visitor Log UI tests refs #10536

* Adds test checking if all screenshots are stored in lfs

* removed screenshots not stored in lfs

* readds screenshots to lfs

* 2.16.3-b4

* Issue translation updates against 2.x-dev

* language update

* Fix bug in widget list remove where the JSON object becomes array

* 2.16.3-rc1

* console command custom-piwik-js:update should work when directory is writable and file does not exist yet (#10576)

* followup #10449

* Fix test
(cherry picked from commit fac3d63)

* Prevent chmod(): No such file or directory

* Automatically update all marketplace plugins when updating Piwik (#10527)

* update plugins and piwik at the same time

* make sure plugins are updated with piwik

* use only one try/catch

* reload plugin information once it has been installed

* make sure to clear caches after an update

* fix ui tests

* make sure to use correct php version without any extras

* Additional informations passed in the hook "isExcludedVisit" (issue #10415) (#10564)

* Additional informations passed in the hook "isExcludedVisit" (issue #10415)

* Added better description to the new parameters

* Update VisitExcluded.php

* Remove two parameters not needed as better to use the Request object

* Update VisitExcluded.php

* remove extra two parameters in VisitExcluded constructor to prevent confusion (#10593)

* Update our libs to latest #10526

* Update composer libraries to latest #10526

* Update log analytics to latest

* When updating the config file failed (or when any other file is not writable...), the Updater (for core or plugins) will now automatically throw an error and cancel the update (#10423)

* When updating the config file failed (or when any other file is not writable...), the Updater (for core or plugins) will now automatically throw an error and cancel the update

* add integration test to check the correct exception is thrown when config not writabel

* New integration test for updater

* Make test better

* When opening the visitor profile, do not apply the segment (#10533)

* When opening the visitor profile, do not apply the segment

* added ui test for profile but does work for me

* next try to make ui test work

* add expected screenshot

* added missing doc
… loaded sync (#10557)

* make sure to properly load the tracker sync when requested

* added tests and fixed some
…" 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
…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
* Hide the new notification PHPVersionTooOldForNewestPiwikCheck in UI tests

* UI test minor update (one widget wasn't showing sparkline when it should)

* 2.16.3
@mattab mattab added this to the 3.0.0-b1 milestone Oct 3, 2016
@mattab mattab changed the base branch from master to 3.x-dev October 3, 2016 19:46
@mattab mattab closed this Oct 3, 2016
@mattab mattab deleted the pr_template branch October 4, 2016 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants