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 master to 3.x-dev #10458

Closed
wants to merge 250 commits into from
Closed

Merge master to 3.x-dev #10458

wants to merge 250 commits into from

Conversation

sgiehl
Copy link
Member

@sgiehl sgiehl commented Aug 31, 2016

No description provided.

Matthieu Aubry and others added 30 commits April 13, 2016 08:42
Here is a recent comment from a community member ` another colleague found and pointed me to your changelog for 2.16.1, which was admittedly hard to find, ` which triggered me to add a clear link in our visible changelog root file.
* Update link to the overview

* Remove deprecated method from example
…ent is tracked without a URL (#10018)

* use idGoal parameter in system tests

* Trigger a Goal conversion for "Event matching goals" even when an event is tracked without a URL

* Test files for green build

* Add new expected test file
…ed yet (#10071)

Eg could start a session during tracking if a tracker plugin is not compatible with the current Piwik and it would try to trigger a notification because of this.
* Implement the UserId module, that adds a new Users report showing all unique user IDs and some aggregated data. Includes reindexing of raw visitors log into aggregated user ids table

* Update UserId module: add total_actions, total_events and total_searches columns; format dates

* Use an injected model instead of creating a new object

* Rework the UserId plugin to use core archiver instead of custom indexer

* Users report small changes:
- remove logger injection
- change archive record name
- add low population filter
- add all columns visualization
- add datatable_archiving_maximum_rows_userid_users configuration, default value is 50000

* Remove unused method parameter

* Users report: remove custom visualizations and add data-row-metadata attribute for every row
Add TweakStyle icon to browsers folder
Eg nb_actions_per_visit
bounce_rate
avg time per visit

Bounce rate seems to always show 100% now but not sure why
* Ignore idvisitor in system tests as it always changes in each test
* Skip email tests in case intl extension is not installed
* Update ui tests
[automatic translation update] Updated 42 strings in 5 languages (ru, de, sv, pt-br, fr)
…not fail every time IANA adds a new domain extension...
…0094)

* Removed group:legacy from travis.yml template

* use latest php 5.3 instead of php 5.3.3

* Run MySQL off the RAM in our CI server to have fast builds
[automatic translation update] Updated 491 strings in 48 languages (am, ar, be, bg, ca, cs, da, de, el, es, et, eu, fa, fi, fr, gl, he, hi, hr, hu, id, it, ja, ko, lt, lv, nb, nl, nn, pl, pt-br, pt, ro, ru, sk, sl, sq, sr, sv, ta, te, th, tl, tr, uk, vi, zh-cn, zh-tw)
tsteur and others added 25 commits August 31, 2016 08:31
* fix #8458 Apply default filter_limit to all API calls

* return all results where needed instead of default filter limit of 100

* make sure to apply offset

* fix unit tests

* fix import logs test as they post the filter value
Process goal conversions for device data (type, brand, model)
Moved UI screenshots inside the repository using git-lfs
Conflicts:
	.travis.yml
	CHANGELOG.md
	bower.json
	composer.json
	core/Notification/Manager.php
	core/Updates.php
	core/Version.php
	js/piwik.min.js
	libs/bower_components/html5shiv/MIT and GPL2 licenses.md
	libs/bower_components/jquery/.bower.json
	libs/bower_components/jquery/LICENSE.txt
	libs/bower_components/jquery/dist/jquery.js
	libs/bower_components/jquery/dist/jquery.min.js
	libs/bower_components/jquery/dist/jquery.min.map
	libs/bower_components/jquery/sizzle/dist/sizzle.js
	libs/bower_components/jquery/src/ajax.js
	libs/bower_components/jquery/src/ajax/jsonp.js
	libs/bower_components/jquery/src/ajax/load.js
	libs/bower_components/jquery/src/ajax/parseJSON.js
	libs/bower_components/jquery/src/ajax/parseXML.js
	libs/bower_components/jquery/src/ajax/script.js
	libs/bower_components/jquery/src/ajax/var/nonce.js
	libs/bower_components/jquery/src/ajax/var/rquery.js
	libs/bower_components/jquery/src/ajax/xhr.js
	libs/bower_components/jquery/src/attributes.js
	libs/bower_components/jquery/src/attributes/attr.js
	libs/bower_components/jquery/src/attributes/classes.js
	libs/bower_components/jquery/src/attributes/prop.js
	libs/bower_components/jquery/src/attributes/support.js
	libs/bower_components/jquery/src/attributes/val.js
	libs/bower_components/jquery/src/callbacks.js
	libs/bower_components/jquery/src/core.js
	libs/bower_components/jquery/src/core/access.js
	libs/bower_components/jquery/src/core/init.js
	libs/bower_components/jquery/src/core/parseHTML.js
	libs/bower_components/jquery/src/core/ready.js
	libs/bower_components/jquery/src/core/var/rsingleTag.js
	libs/bower_components/jquery/src/css.js
	libs/bower_components/jquery/src/css/addGetHookIf.js
	libs/bower_components/jquery/src/css/curCSS.js
	libs/bower_components/jquery/src/css/defaultDisplay.js
	libs/bower_components/jquery/src/css/hiddenVisibleSelectors.js
	libs/bower_components/jquery/src/css/support.js
	libs/bower_components/jquery/src/css/var/cssExpand.js
	libs/bower_components/jquery/src/css/var/isHidden.js
	libs/bower_components/jquery/src/css/var/rmargin.js
	libs/bower_components/jquery/src/css/var/rnumnonpx.js
	libs/bower_components/jquery/src/data.js
	libs/bower_components/jquery/src/data/support.js
	libs/bower_components/jquery/src/deferred.js
	libs/bower_components/jquery/src/deprecated.js
	libs/bower_components/jquery/src/dimensions.js
	libs/bower_components/jquery/src/effects.js
	libs/bower_components/jquery/src/effects/Tween.js
	libs/bower_components/jquery/src/effects/animatedSelector.js
	libs/bower_components/jquery/src/effects/support.js
	libs/bower_components/jquery/src/event.js
	libs/bower_components/jquery/src/event/alias.js
	libs/bower_components/jquery/src/event/support.js
	libs/bower_components/jquery/src/exports/amd.js
	libs/bower_components/jquery/src/exports/global.js
	libs/bower_components/jquery/src/intro.js
	libs/bower_components/jquery/src/jquery.js
	libs/bower_components/jquery/src/manipulation.js
	libs/bower_components/jquery/src/manipulation/_evalUrl.js
	libs/bower_components/jquery/src/manipulation/support.js
	libs/bower_components/jquery/src/manipulation/var/rcheckableType.js
	libs/bower_components/jquery/src/offset.js
	libs/bower_components/jquery/src/outro.js
	libs/bower_components/jquery/src/queue.js
	libs/bower_components/jquery/src/queue/delay.js
	libs/bower_components/jquery/src/selector-sizzle.js
	libs/bower_components/jquery/src/selector.js
	libs/bower_components/jquery/src/serialize.js
	libs/bower_components/jquery/src/support.js
	libs/bower_components/jquery/src/traversing.js
	libs/bower_components/jquery/src/traversing/findFilter.js
	libs/bower_components/jquery/src/traversing/var/rneedsContext.js
	libs/bower_components/jquery/src/var/class2type.js
	libs/bower_components/jquery/src/var/concat.js
	libs/bower_components/jquery/src/var/deletedIds.js
	libs/bower_components/jquery/src/var/hasOwn.js
	libs/bower_components/jquery/src/var/indexOf.js
	libs/bower_components/jquery/src/var/pnum.js
	libs/bower_components/jquery/src/var/push.js
	libs/bower_components/jquery/src/var/rnotwhite.js
	libs/bower_components/jquery/src/var/slice.js
	libs/bower_components/jquery/src/var/support.js
	libs/bower_components/jquery/src/var/toString.js
	libs/bower_components/jquery/src/wrap.js
	piwik.js
	plugins/API/ProcessedReport.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreConsole/Commands/ManagePlugin.php
	plugins/CoreHome/javascripts/dataTable.js
	plugins/CoreHome/templates/_topBar.twig
	plugins/CoreUpdater/templates/updateSuccess.twig
	plugins/CustomAlerts
	plugins/CustomDimensions
	plugins/CustomVariables/tests/UI/expected-ui-screenshots/CustomVariables_link_in_menu.png
	plugins/CustomVariables/tests/UI/expected-ui-screenshots/CustomVariables_manage.png
	plugins/DevicesDetection/Reports/GetBrowserVersions.php
	plugins/DevicesDetection/Reports/GetBrowsers.php
	plugins/ExamplePlugin/Updates/0.0.2.php
	plugins/ExamplePlugin/plugin.json
	plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePage.png
	plugins/ExamplePlugin/tests/UI/expected-ui-screenshots/SimpleUITest_simplePagePartial.png
	plugins/ExampleTheme/plugin.json
	plugins/Feedback/templates/index.twig
	plugins/LogViewer
	plugins/Morpheus/stylesheets/general/_forms.less
	plugins/Morpheus/templates/layout.twig
	plugins/Morpheus/templates/user.twig
	plugins/QueuedTracking
	plugins/SegmentEditor/stylesheets/segmentation.less
	plugins/SitesManager/tests/Integration/ApiTest.php
	plugins/UserId/Reports/Base.php
	plugins/UserId/Reports/GetUsers.php
	tests/PHPUnit/Integration/ReleaseCheckListTest.php
	tests/PHPUnit/Integration/WidgetsListTest.php
	tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_week.xml
	tests/UI/expected-ui-screenshots
	tests/UI/specs/SegmentSelectorEditor_spec.js
@sgiehl sgiehl added the Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review. label Aug 31, 2016
@tsteur
Copy link
Member

tsteur commented Sep 1, 2016

@sgiehl I'll close this one as discussed. the UI tests were not working etc. I merged master => 3.x-dev again without a squash this time. Do you mind merging master => 3.x again? I need to fix one or two tests tmrw but otherwise it should work

@tsteur tsteur closed this Sep 1, 2016
@sgiehl sgiehl deleted the 3.0-m7 branch September 1, 2016 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet