@gka opened this Pull Request on February 19th 2013 Member
  • removed old flash map
  • added new SVG-based visitor map widget (build using Kartograph.js)
  • new features: country view showing cities and regions (and a lot more)
  • added new realtime map widget showing most recent vititors on a map
@halfdan commented on February 19th 2013 Member

This is beautiful!

There is a test failing on Travis-CI right now https://travis-ci.org/piwik/piwik/jobs/4901170/#L90 - is that reasonable or did you remove a widget from the list? Let me know and I'll merge + fix the test.

@gka commented on February 19th 2013 Member

I have not touched the test suite at all. Maybe it still looks for the old widget, I don't know...

@halfdan commented on February 19th 2013 Member

I'll look into it and make sure it works. Nice changes btw. - and great to see Tibet among the list of countries!

@robocoder commented on February 19th 2013 Contributor

Can I suggest rebasing (squashing commits) before merging?

@halfdan commented on February 19th 2013 Member

Will do that.

@sgiehl commented on February 19th 2013 Member

another small note: Maybe we shouldn't use plugin specific translation files for plugins in core. Those translations should be moved to the main translation files in /lang. That way it's easier to maintain those with OTrance.

@halfdan commented on February 19th 2013 Member

@sgiehl, good point - I'll merge them (at least en.php) with the current translation available.

@gka, can you try to avoid auto-commits in the future? Makes it really hard to see what happened between versions.

@halfdan commented on February 19th 2013 Member

OK - Rebase on this is not trivial, there are quite a number of merge conflicts which I have to look into. If someone else takes a shot at this: Don't just squash everything into a single commit, we would loose too much history then.

@gka commented on February 19th 2013 Member

I think this time it's fine to just merge the pull request. I was not expecting that my branch would be rebased, that's why I did all these auto-commits during development. Essentially it's a complete new feature, developed from scratch.

@halfdan commented on February 19th 2013 Member

That's fine, yet merging >250 commits with "auto commit" isn't really usefull, so at least these should be rebased/squashed into a single commit.

@mattab commented on February 19th 2013 Owner

@halfdan would you mind merging the pull request?

or do I just click "Merge pull request" ?

@halfdan commented on February 19th 2013 Member

I am working on it. There is some stuff that I want to filter-branch out before pushing the merge.

@mattab commented on February 20th 2013 Owner

@gka What an awesome piece of work!! :100:

I can't beleive it's now done... Let's all celebrate this moment!

@halfdan kuddos for merge :+1:

@ikamal commented on May 8th 2015
This Pull Request was closed on February 20th 2013
Powered by GitHub Issue Mirror