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

Refs #3505 DevicesDetection plugin - provides detection of TVs #147

Closed
wants to merge 29 commits into from
Closed

Conversation

Solfire
Copy link

@Solfire Solfire commented Nov 13, 2013

This update provides detecting TVs with the DevicesDetection plugin based on the UserAgent.

  • Adding most common TV brands
  • Adding icons for new added TV brands
  • Adding ANTGalio Browser and ANT Browser familiy
  • Adding Opera Next Browser (Blink Engine)
  • Adding televisionRegexesFile
  • Adding getTelevisionRegexes()
  • Adding parseTelevision()
  • Adding isTelevision()
  • Adding televisions.yml with TV regexes
  • Modify parse()
  • Modify parseBrand()
  • Modify parseModel()
  • Update userAgentParserEnhancedFixtures
  • Update some brand icons

Testet with several devices (see picture attached):

update

diwel and others added 29 commits November 4, 2013 10:33
Adding regex for ANTGalio and Opera Next
Adding Regular Expressions for most common TV Brands
+ Adding most common TV Brands
+ Adding ANTGalio Browser and ANT Browser familiy
+ Adding Opera Next Browser (Blink Engine)
+ Adding $televisionRegexesFile
+ Adding getTelevisionRegexes()
+ Adding parseTelevision()
+ Adding isTelevision()
+ Modify parse()
+ Modify parseBrand()
+ Modify parseModel()
+ Modify pseudo TVs to desktop devices (AppleTV, GoogleTV)
+ Removing real TVs (now they are in televisions.yml)
+ Cleanup unnecessary blank lines
+ Add Medion Brand
+ Add Vestel Brand
+ Add Videoweb Brand
+ Modify Humax, Panasonic
+ Modify old icons
+ Adding new icons
+ Medion
+ Videoweb
+ Name / ShortName
+ Icon
+ Regex
Adding many televion UAs
remove double bracket
@mattab
Copy link
Member

mattab commented Nov 15, 2013

Thank you for the pull request!

I don't see the travis icon for the build, not sure why it is not shown here... It would be useful to see the travis status for your change to check tests pass.

it says "We can’t automatically merge this pull request.". Would you mind merging master in this pull request so it is mergeable?

@Solfire
Copy link
Author

Solfire commented Nov 15, 2013

I think the problem is that there are changes in the piwik master and my branch master that are going into different directions. The Content of some files are different between the piwik master and my branch, so git doesn't know how to merge this together.

I need to merge the latest changes of the master into my branch. But i didn't know how to do it.

@Solfire
Copy link
Author

Solfire commented Nov 15, 2013

If you revert your changes for the panasonic.ico, samsung.ico and panasonic.ico it will work perfect. thanks

@Solfire Solfire closed this Nov 22, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants