search

eldy / AWStats

AWStats Log Analyzer project (official sources)
https://www.awstats.org
370 stars 120 forks source link

Created Android family grouping and other OS updates #74

Closed brentil closed 4 years ago

brentil commented 6 years ago

Added Android family to operating_systems.pm for enhanced reporting on Android C to O versions Added Android family icons Added Mac OS 10.13 High Sierra to operating_systems.pm Updated operating_systems.pm Windows family broken links as most of them pointed to URLs that didn't exist anymore Updated Apple MAC OS X links to be HTTPS

AaronVanGeffen commented 6 years ago

Nice work! I'll consider my own PR for macOS 10.13 (#67), which has yet to be merged, superseded by yours.

brentil commented 6 years ago

I rebased to the 7.7 code and found no conflicts with this pull request.

AaronVanGeffen commented 6 years ago

It looks like you've merged the new commits in rather than rebasing your work on top of them.

It's quite a shame to see this hasn't made it into 7.7, though... 😕

brentil commented 6 years ago

It looks like you've merged the new commits in rather than rebasing your work on top of them. It's quite a shame to see this hasn't made it into 7.7, though... 😕

I'm still really new to using GIT, I thought I had done it right. Can you explain what I should have done to do it correctly? I had read the github docks on rebasing but I must have not understood them then.