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

Revert "GeoIP re-attribution: debug output now shows changes to visits geo-location" #12480

Merged
merged 1 commit into from Jan 18, 2018

Conversation

mattab
Copy link
Member

@mattab mattab commented Jan 18, 2018

It was created on the wrong branch
Reverts #12478

@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 Jan 18, 2018
@mattab mattab merged commit 6f2c085 into master Jan 18, 2018
@mattab mattab deleted the revert-12478-patch-1 branch January 18, 2018 20:39
@Findus23
Copy link
Member

I guess we’ll need to revert #12412 :)

@tsteur
Copy link
Member

tsteur commented Jan 18, 2018

@Findus23 👍

c960657 pushed a commit to c960657/matomo that referenced this pull request Apr 19, 2018
mattab pushed a commit that referenced this pull request Apr 23, 2018
…nd multiple recorders. (#12733)

* visitorGeolocator: output actual changes in debug mode (#12478)

closes #12477

* Revert "visitorGeolocator: output actual changes in debug mode (#12478)" (#12480)

This reverts commit 19a7654.

* Fix SystemIntegration test (#12726)

Found `piwik`

* This addresses the various dead lock issues when using transactions and bulk load.  Issue #6398

* Fix archive test to work with multi recorder fix.

* Minor changes and renames
InfinityVoid pushed a commit to InfinityVoid/matomo that referenced this pull request Oct 11, 2018
…nd multiple recorders. (matomo-org#12733)

* visitorGeolocator: output actual changes in debug mode (matomo-org#12478)

closes matomo-org#12477

* Revert "visitorGeolocator: output actual changes in debug mode (matomo-org#12478)" (matomo-org#12480)

This reverts commit 19a7654.

* Fix SystemIntegration test (matomo-org#12726)

Found `piwik`

* This addresses the various dead lock issues when using transactions and bulk load.  Issue matomo-org#6398

* Fix archive test to work with multi recorder fix.

* Minor changes and renames
toredash pushed a commit to toredash/matomo that referenced this pull request Feb 5, 2020
toredash pushed a commit to toredash/matomo that referenced this pull request Feb 5, 2020
pebosi pushed a commit to pebosi/matomo that referenced this pull request Mar 2, 2020
sgiehl added a commit that referenced this pull request May 20, 2020
* Remoing gears

* Remove gears from test files

* revert removing gears column from dump

* Move sql update to core

* Revert "visitorGeolocator: output actual changes in debug mode (#12478)" (#12480)

This reverts commit 19a7654.

* Merge with latest changes

* Merge with latest changes

* revert

* revert, add migration

* add migration

* Merge

* Merge

* revert

* Update core/Tracker/Settings.php

Use 0 as default

Co-Authored-By: Stefan Giehl <stefan@matomo.org>

* fix tests

* rebuilt js

* updates expected UI files

* update changelog

* submodule updates

Co-authored-by: Peter Boden <p.boden@pax.de>
Co-authored-by: pebosi <mail@pebosi.net>
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>
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