Age | Commit message (Collapse) | Author |
|
* Fix MySQLI rounding tests
* CustomDimensions: Fixed require string
* Submodule
* submodule
* UI test
* Fixes #11299
|
|
|
|
* referrer tests
* Core system tests
* Log Analytics is compatible with Python 2.7
* Note
* Submodule
* UI tests: Gender neutral
|
|
Reverts https://github.com/piwik/piwik/pull/10928/files
Refs https://github.com/piwik/piwik/issues/8566
|
|
array (#10928)
* Make JSON2 the now JSON formatting to fix an issue in formatting associative arrays
* fix unit test
* Minor changes
* call API with json format in the Angular JS frontend
* Log Analytics
|
|
|
|
|
|
|
|
Conflicts:
.travis.yml
bower.json
core/Notification/Manager.php
core/Updates.php
core/Updates/2.16.2-b2.php
core/Version.php
libs/Zend/Validate/Hostname.php
libs/bower_components/jScrollPane/ajax.html
libs/bower_components/jScrollPane/anchors.html
libs/bower_components/jScrollPane/api.html
libs/bower_components/jScrollPane/arrow_hover.html
libs/bower_components/jScrollPane/arrow_positions.html
libs/bower_components/jScrollPane/arrows.html
libs/bower_components/jScrollPane/auto_reinitialise.html
libs/bower_components/jScrollPane/basic.html
libs/bower_components/jScrollPane/caps.html
libs/bower_components/jScrollPane/changelog.html
libs/bower_components/jScrollPane/destroy.html
libs/bower_components/jScrollPane/drag_size.html
libs/bower_components/jScrollPane/dynamic_content.html
libs/bower_components/jScrollPane/dynamic_height.html
libs/bower_components/jScrollPane/dynamic_width.html
libs/bower_components/jScrollPane/events.html
libs/bower_components/jScrollPane/faqs.html
libs/bower_components/jScrollPane/fixed_width.html
libs/bower_components/jScrollPane/focus.html
libs/bower_components/jScrollPane/fullpage_scroll.html
libs/bower_components/jScrollPane/iframe.html
libs/bower_components/jScrollPane/iframe2.html
libs/bower_components/jScrollPane/iframe_content1.html
libs/bower_components/jScrollPane/iframe_content2.html
libs/bower_components/jScrollPane/image.html
libs/bower_components/jScrollPane/image2.html
libs/bower_components/jScrollPane/index.html
libs/bower_components/jScrollPane/invisibles.html
libs/bower_components/jScrollPane/known_issues.html
libs/bower_components/jScrollPane/less_basic.html
libs/bower_components/jScrollPane/mwheel_intent.html
libs/bower_components/jScrollPane/override_animate.html
libs/bower_components/jScrollPane/runeimp.html
libs/bower_components/jScrollPane/runeimp2.html
libs/bower_components/jScrollPane/scroll_on_left.html
libs/bower_components/jScrollPane/scroll_to.html
libs/bower_components/jScrollPane/scroll_to_animate.html
libs/bower_components/jScrollPane/settings.html
libs/bower_components/jScrollPane/short.html
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/xhr.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/css.js
libs/bower_components/jquery/src/css/curCSS.js
libs/bower_components/jquery/src/css/hiddenVisibleSelectors.js
libs/bower_components/jquery/src/css/support.js
libs/bower_components/jquery/src/css/var/swap.js
libs/bower_components/jquery/src/data.js
libs/bower_components/jquery/src/data/accepts.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/event.js
libs/bower_components/jquery/src/event/support.js
libs/bower_components/jquery/src/manipulation.js
libs/bower_components/jquery/src/manipulation/support.js
libs/bower_components/jquery/src/offset.js
libs/bower_components/jquery/src/queue.js
libs/bower_components/jquery/src/serialize.js
libs/bower_components/jquery/src/traversing.js
libs/bower_components/jquery/src/traversing/findFilter.js
libs/bower_components/jquery/src/var/concat.js
libs/bower_components/jquery/src/var/indexOf.js
libs/bower_components/jquery/src/var/push.js
libs/bower_components/jquery/src/var/slice.js
libs/bower_components/jquery/src/wrap.js
plugins/API/ProcessedReport.php
plugins/AnonymousPiwikUsageMeasurement
plugins/CoreConsole/Commands/ManagePlugin.php
plugins/CoreHome/javascripts/dataTable.js
plugins/CoreHome/javascripts/manifest.json
plugins/CoreHome/templates/_topBar.twig
plugins/CoreUpdater/templates/updateSuccess.twig
plugins/CustomAlerts
plugins/CustomDimensions
plugins/DevicesDetection/Reports/GetBrowserVersions.php
plugins/DevicesDetection/Reports/GetBrowsers.php
plugins/ExamplePlugin/Updates/0.0.2.php
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
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/UI/expected-ui-screenshots
tests/UI/specs/SegmentSelectorEditor_spec.js
|
|
Notice: Use of undefined constant PIWIK_DOCUMENT_ROOT - assumed 'PIWIK_DOCUMENT_ROOT' in plugins/CustomPiwikJs/Commands/UpdateTracker.php
|
|
|
|
|
|
(#10279)
* Clarify that token_auth must be an admin or super user token.
* Reset the list of items in the cart, after tracking an ecommerce conversion
But do not reset the list of itms in the cart after tracking an ecommerce cart update.
fixes #10252
* Adding changelog note
`piwik.js`: after an ecommerce order is tracked using `trackEcommerceOrder`, the items in the cart will now be removed from the JavaScript object. Calling `trackEcommerceCartUpdate` will not remove the items in the cart.
|
|
|
|
|
|
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
|
contain enough records
|
|
|
|
Conflicts:
core/Version.php
core/WidgetsList.php
plugins/CustomDimensions
plugins/Goals/templates/getGoalReportView.twig
plugins/Goals/templates/getOverviewView.twig
tests/UI/expected-ui-screenshots
|
|
|
|
|
|
archive.php on cli
|
|
|
|
User ID log parsing - refs https://github.com/piwik/piwik/issues/9236
|
|
fake common logs for tests.
|
|
https://github.com/piwik/piwik-log-analytics/pull/122
|
|
|
|
|
|
|
|
|
|
Conflicts:
core/Version.php
plugins/CoreConsole/Commands/ManagePlugin.php
plugins/CoreHome/angularjs/siteselector/siteselector.directive.js
plugins/CoreHome/javascripts/corehome.js
plugins/Ecommerce/Menu.php
plugins/Events/Events.php
plugins/Goals/Goals.php
plugins/Live/templates/index.twig
plugins/UserCountryMap/UserCountryMap.php
plugins/UsersManager/stylesheets/usersManager.less
plugins/VisitsSummary/Controller.php
plugins/VisitsSummary/Reports/Get.php
tests/UI/expected-ui-screenshots
|
|
|
|
|
|
|
|
Conflicts:
.travis.yml
CHANGELOG.md
core/Plugin/ControllerAdmin.php
core/Version.php
core/testMinimumPhpVersion.php
plugins/API/API.php
plugins/Actions/Reports/GetPageUrls.php
plugins/AnonymousPiwikUsageMeasurement
plugins/CoreHome/CoreHome.php
plugins/CoreHome/templates/_menu.twig
plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
plugins/Goals/Controller.php
tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
tests/PHPUnit/Integration/Plugin/ManagerTest.php
tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
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.getSegmentsMetadata.xml
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
tests/UI/expected-ui-screenshots
tests/UI/specs/Overlay_spec.js
tests/UI/specs/UIIntegration_spec.js
|
|
|
|
Conflicts:
core/Version.php
plugins/Actions/Menu.php
plugins/CoreHome/angularjs/history/history.service.js
plugins/CoreHome/javascripts/menu.js
plugins/CoreHome/templates/_menu.twig
plugins/Dashboard/Menu.php
plugins/Ecommerce/Menu.php
plugins/ExampleUI/Menu.php
plugins/Goals/Menu.php
plugins/Referrers/Menu.php
plugins/VisitsSummary/Menu.php
tests/UI/expected-ui-screenshots
tests/UI/specs/UIIntegration_spec.js
|
|
|
|
|
|
This reverts commit a2f8768b1f9d1cd1c7e98d6f0ab9a31ef10935ef.
|
|
in the UI
|
|
|
|
and tests/travis (some more debug output in one script).
|
|
|
|
|
|
|
|
https://github.com/piwik/piwik-log-analytics/pull/99
|
|
https://github.com/piwik/piwik-log-analytics/issues/67 and update expected test output.
|
|
https://github.com/piwik/piwik-log-analytics/issues/83
|
|
https://github.com/piwik/piwik-log-analytics/issues/72 fix.
|