Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: faisalman/ua-parser-js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cbba2f5728cd0a590253cb61efe3dce93c466c5d
Choose a base ref
...
head repository: faisalman/ua-parser-js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9999815ac8c969306594c650566695fba3506830
Choose a head ref
55 contributors

Commits on Oct 10, 2015

  1. Rewrite util.extend to a clone version

    @malash
    malash committed Oct 10, 2015
    Copy the full SHA
    792dc02 View commit details

Commits on Nov 3, 2015

  1. add support for wechat

    @dhcmrlchtdj
    dhcmrlchtdj committed Nov 3, 2015
    Copy the full SHA
    2e5dff9 View commit details

Commits on Dec 23, 2015

  1. Add name to UA-Parser

    @gryphon
    gryphon committed Dec 23, 2015
    Copy the full SHA
    99a80e8 View commit details

Commits on Dec 30, 2015

  1. fix it for opera mini 8 above on iphone 

    https://dev.opera.com/blog/opera-mini-8-for-ios/
    Yun Young-jin committed Dec 30, 2015
    Copy the full SHA
    8e81811 View commit details

Commits on Jan 4, 2016

  1. Meteor fixes

    @cesarve77
    cesarve77 committed Jan 4, 2016
    Copy the full SHA
    5d57850 View commit details

Commits on Jan 7, 2016

  1. Merge pull request #161 from yupmin/opera-mini-8-above-iphone 

    fix it for opera mini 8 above on iphone
    @faisalman
    faisalman committed Jan 7, 2016
    Copy the full SHA
    1f92d61 View commit details

  2. Merge pull request #162 from cesarve77/patch-1 

    Meteor fixes
    @faisalman
    faisalman committed Jan 7, 2016
    Copy the full SHA
    8e46a85 View commit details

Commits on Jan 28, 2016

  1. Optimized pattern for Android browser, moved them before the Chrome p… 

    …attern to avoid errors in the some of the newest browsers
    Andrea Vaghi committed Jan 28, 2016
    Copy the full SHA
    909d6fc View commit details

  2. run build

    Andrea Vaghi committed Jan 28, 2016
    Copy the full SHA
    4344c43 View commit details

Commits on Feb 21, 2016

  1. Merge pull request #160 from gryphon/master 

    Add name to UA-Parser RequireJS module
    @faisalman
    faisalman committed Feb 21, 2016
    Copy the full SHA
    1ec2119 View commit details

  2. Merge pull request #163 from jobrapido/develop 

    Optimized Android browser regex patterns
    @faisalman
    faisalman committed Feb 21, 2016
    Copy the full SHA
    0d42b3a View commit details

Commits on Feb 22, 2016

  1. Merge branch 'master' into fix/util-extend 

    * master:
  Meteor fixes
  fix it for opera mini 8 above on iphone
  Add name to UA-Parser
  Fix image #150
  Increment build version: 0.7.10
  Check for tablet first
  Fix #153 mistaken Search phrase for Arch OS
  Seems to fix the issue for specific UA found in #159
  UAParser is exposed globally to the window object. It can be used directly.
  Fix detection of Firefox on iOS.
  Added hasOwnProperty check
  Generalize the check for an unidentifiable mobile or tablet to correctly categorize unidentifiable Android smartphones as "mobile".
  travis update: node_js stable, cache node_modules, sudo false
  Detect Nexus 6 as Motorola only.
  Add Playstation 4 support.
  Added Nexus 6 detection
  Added DEVICE regular expressions for "Samsung galaxy S6" and "Samsung Galaxy S6 Edge" devices + test cases
  Adding PhantomJS (http://phantomjs.org/)
  Add Sleipnir
    @malash
    malash committed Feb 22, 2016
    Copy the full SHA
    d929c3e View commit details

Commits on Feb 25, 2016

  1. Merge pull request #136 from malash/fix/util-extend 

    Rewrite util.extend to a clone version
    @faisalman
    faisalman committed Feb 25, 2016
    Copy the full SHA
    3a457f9 View commit details

Commits on Feb 26, 2016

  1. Get SmartTV device by HbbTV part

    @philippsimon
    philippsimon committed Feb 26, 2016
    Copy the full SHA
    bb69ef2 View commit details

Commits on Mar 17, 2016

  1. Fixed require sample in readme 

    Module name is `ua-parser-js`, not `ua-parser` (see [here](https://github.com/faisalman/ua-parser-js/blob/d929c3e5087fd88083e8012d06fc2da013809757/src/ua-parser.js#L855))
    @fcamblor
    fcamblor committed Mar 17, 2016
    Copy the full SHA
    5ba9fd5 View commit details

Commits on Mar 22, 2016

  1. Add generic device detection for samsung smartphones

    @benurb
    benurb committed Mar 22, 2016
    Copy the full SHA
    1020d10 View commit details

Commits on May 23, 2016

  1. rewrote license field to be SPDX compatible 

    According to [NPM docs](https://docs.npmjs.com/files/package.json#license) the `license` field in package.json should be SPDX compatible.

[SPDX](https://spdx.org/licenses/) is a format which allows you to specify your licenses in an easy understandable, machine parseable way.

These changes reflect your license choice according to #1
    @leipert
    leipert committed May 23, 2016
    Copy the full SHA
    b254f93 View commit details

Commits on May 26, 2016

  1. Add device detection for HP 10 tablet

    Lithin committed May 26, 2016
    Copy the full SHA
    c3f7294 View commit details

Commits on Sep 29, 2016

  1. Merge pull request #179 from leipert/patch-1 

    rewrote license field to be SPDX compatible
    @faisalman
    faisalman authored Sep 29, 2016
    Copy the full SHA
    2a5cd4d View commit details

  2. Merge pull request #172 from fcamblor/patch-1 

    Fixed require sample in readme
    @faisalman
    faisalman authored Sep 29, 2016
    Copy the full SHA
    fbcfe24 View commit details

Commits on Oct 18, 2016

  1. Add CDNJS version badge in readme 

    This will add the badge to show its version on CDNJS and also link to its page on CDNJS!
    @kennynaoh
    kennynaoh authored Oct 18, 2016
    Copy the full SHA
    550420d View commit details

Commits on Oct 21, 2016

  1. Merge pull request #191 from kennynaoh/master 

    Add CDNJS version badge in readme
    @faisalman
    faisalman authored Oct 21, 2016
    Copy the full SHA
    51b8089 View commit details

Commits on Oct 28, 2016

  1. Fix #174: "Tablet PC" != tablet device

    @faisalman
    faisalman committed Oct 28, 2016
    Copy the full SHA
    bf4c2e1 View commit details

Commits on Nov 3, 2016

  1. Add HTML imports entry-point

    @mkazlauskas
    mkazlauskas authored Nov 3, 2016
    Copy the full SHA
    c71373b View commit details

Commits on Nov 4, 2016

  1. Merge pull request #195 from firmfirm/master 

    Add HTML imports entry-point
    @faisalman
    faisalman authored Nov 4, 2016
    Copy the full SHA
    55e75dd View commit details

Commits on Nov 6, 2016

  1. Merge pull request #181 from WebEngage/hp-10-tablet-device 

    Add device detection for HP 10 tablet
    @faisalman
    faisalman authored Nov 6, 2016
    Copy the full SHA
    93993dc View commit details

  2. Merge pull request #173 from sueddeutsche/fix/samsung-device-detection 

    Add generic device detection for samsung smartphones
    @faisalman
    faisalman authored Nov 6, 2016
    Copy the full SHA
    4e7c662 View commit details

  3. Merge pull request #149 from dhcmrlchtdj/wechat 

    add support for WeChat
    @faisalman
    faisalman authored Nov 6, 2016
    Copy the full SHA
    4e0aa0b View commit details

  4. Merge pull request #167 from philippsimon/hbbtv 

    Get SmartTV device by HbbTV part
    @faisalman
    faisalman authored Nov 6, 2016
    Copy the full SHA
    eade7a9 View commit details

  5. Add WeChat

    @faisalman
    faisalman committed Nov 6, 2016
    Copy the full SHA
    c03a84a View commit details

  6. Increment build version to 0.7.11

    @faisalman
    faisalman committed Nov 6, 2016
    Copy the full SHA
    10775bd View commit details

Commits on Nov 7, 2016

  1. Fix: don't define the RequireJs module with name 

    If we define it with name it becomes less portable and breaks code that used version `0.7.10`.
This is not correct according to **semver**, as this is a `patch` only which should not break APIs.

I think defining the module with a name should be a responsibility of build tools / optimisation tools.
    @leventebalogh
    leventebalogh authored Nov 7, 2016
    1
    Copy the full SHA
    f28f87c View commit details

  2. Merge pull request #196 from leventebalogh/patch-1 

    Fix: don't define the RequireJs module with name
    @faisalman
    faisalman authored Nov 7, 2016
    Copy the full SHA
    458f3c3 View commit details

  3. Fix #188 distinguish webview from chrome

    @faisalman
    faisalman committed Nov 7, 2016
    Copy the full SHA
    a56c990 View commit details

  4. Merge branch 'master' of github.com:faisalman/ua-parser-js

    @faisalman
    faisalman committed Nov 7, 2016
    Copy the full SHA
    87b8824 View commit details

Commits on Nov 8, 2016

  1. Fix #197 microsoft lumia

    @faisalman
    faisalman committed Nov 8, 2016
    Copy the full SHA
    3dae55a View commit details

  2. Test case for #174

    @faisalman
    faisalman committed Nov 8, 2016
    Copy the full SHA
    d1a33d7 View commit details

Commits on Nov 9, 2016

  1. Split mediaplayer test cases, edit readme

    @faisalman
    faisalman committed Nov 9, 2016
    Copy the full SHA
    d3f959e View commit details

  2. Samsung smarttv misidentified as mobile

    @faisalman
    faisalman committed Nov 9, 2016
    Copy the full SHA
    d0b7c58 View commit details

  3. Fix #188 Separate Chrome WebView from Chrome

    @faisalman
    faisalman committed Nov 9, 2016
    Copy the full SHA
    aadabcc View commit details

  4. Fix #22 #33 #34 #129 Distinguish stock Android Browser from Chrome

    @faisalman
    faisalman committed Nov 9, 2016
    Copy the full SHA
    2467a45 View commit details

  5. Edit readme: guide to contribute

    @faisalman
    faisalman committed Nov 9, 2016
    Copy the full SHA
    1a4dab5 View commit details

  6. Fix #32 browser recognized as version

    @faisalman
    faisalman committed Nov 9, 2016
    Copy the full SHA
    88f2f4e View commit details

  7. Smart-TV ordering

    @faisalman
    faisalman committed Nov 9, 2016
    Copy the full SHA
    1fb82fb View commit details

  8. Fix #99 Wrong Windows version

    @faisalman
    faisalman committed Nov 9, 2016
    Copy the full SHA
    0f0ea13 View commit details

Commits on Nov 10, 2016

  1. Fix #37 #38 test case for nexus 7 & ipod

    @faisalman
    faisalman committed Nov 10, 2016
    Copy the full SHA
    73735e1 View commit details

  2. Fix #43 #68 xperia sp & asus padfone

    @faisalman
    faisalman committed Nov 10, 2016
    Copy the full SHA
    58880fd View commit details

  3. Fix #87 oneplus one

    @faisalman
    faisalman committed Nov 10, 2016
    Copy the full SHA
    61b0f1c View commit details

  4. Fix #158 xiaomi mi note

    @faisalman
    faisalman committed Nov 10, 2016
    Copy the full SHA
    b99840d View commit details

  5. Fix #96 Moto X

    @faisalman
    faisalman committed Nov 10, 2016
    Copy the full SHA
    9fe7561 View commit details
Showing with 3,263 additions and 2,027 deletions.
  1. +6 −2 .gitignore
  2. +1 −0 .npmrc
  3. +4 −1 .travis.yml
  4. +2 −28 bower.json
  5. +0 −24 component.json
  6. +1 −0 dist/ua-parser.html
  7. +6 −5 dist/ua-parser.min.js
  8. +6 −5 dist/ua-parser.pack.js
  9. +21 −0 license.md
  10. +3 −2 package.js
  11. +76 −26 package.json
  12. +127 −70 readme.md
  13. +377 −321 src/ua-parser.js
  14. +0 −1,232 test/browser&mediaplayer-test.json
  15. +599 −74 test/browser-test.json
  16. +8 −0 test/cpu-test.json
  17. +1,258 −184 test/device-test.json
  18. +27 −0 test/engine-test.json
  19. +582 −0 test/mediaplayer-test.json
  20. +111 −12 test/os-test.json
  21. +48 −9 test/test.js
  22. +0 −32 ua-parser-js.jquery.json
8 changes: 6 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
node_modules/
npm-debug.log

### vim ###
.*.s[a-w][a-z]
*.un~
@@ -8,17 +9,20 @@ Session.vim
*~
.versions

### editors ###
.vscode
.idea
*.sublime-*

### OSX ###
.DS_Store
.AppleDouble
.LSOverride
Icon


# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes
.idea
1 change: 1 addition & 0 deletions .npmrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
5 changes: 4 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
arch:
- amd64
- ppc64le
language: node_js
node_js:
- stable
- "0.10"
- lts/*

notifications:
email: false
30 changes: 2 additions & 28 deletions bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "ua-parser-js",
"version": "0.7.10",
"version": "0.7.24",
"authors": [
"Faisal Salman <fyzlman@gmail.com>"
"Faisal Salman <f@faisalman.com>"
],
"private": false,
"main": "src/ua-parser.js",
@@ -13,31 +13,5 @@
"test",
"tests"
],
"contributors": [
"Faisal Salman <fyzlman@gmail.com>",
"Benjamin Bertrand <bertrand.design@gmail.com>",
"Carl C Von Lewin <carlchristianlewin@gmail.com>",
"Christopher De Cairos <chris.decairos@gmail.com>",
"Davit Barbakadze <jayarjo@gmail.com>",
"Dmitry Tyschenko <dtyschenko@gmail.com>",
"Douglas Li <doug@knotch.it>",
"Dumitru Uzun <duzun@mail.ru>",
"Erik Hesselink <hesselink@gmail.com>",
"Fabian Becker <halfdan@xnorfz.de>",
"Hendrik Helwich <h.helwich@iplabs.de>",
"Jackpoll <jackpoll123456@gmail.com>",
"Jake Mc <startswithaj@users.noreply.github.com>",
"John Tantalo <john.tantalo@gmail.com>",
"John Yanarella <jmy@codecatalyst.com>",
"Jon Buckley <jon@jbuckley.ca>",
"Kendall Buchanan <kendall@kendagriff.com>",
"Lee Treveil <leetreveil@gmail.com>",
"Leonardo <leofiore@libero.it>",
"Max Maurer <maxemanuel.maurer@gmail.com>",
"Michael Hess <mhess@connectify.me>",
"OtakuSiD <otakusid@gmail.com>",
"Ross Noble <rosshnoble@gmail.com>",
"Sandro Sonntag <sandro.sonntag@adorsys.de>"
],
"dependencies": {}
}
24 changes: 0 additions & 24 deletions component.json
View file

This file was deleted.

1 change: 1 addition & 0 deletions dist/ua-parser.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<script src="./ua-parser.min.js"></script>
Loading