You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/10/23 00:41:54 UTC

[1/2] cordova-plugin-device git commit: add JIRA issue tracker link

Repository: cordova-plugin-device
Updated Branches:
  refs/heads/master 38b01b83f -> 370cbd64c


add JIRA issue tracker link


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/0d82bc98
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/0d82bc98
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/0d82bc98

Branch: refs/heads/master
Commit: 0d82bc984174c34a4e2ff5dc08020c21d7bc27a1
Parents: 08bf01d
Author: Julien Bouquillon <ju...@bouquillon.com>
Authored: Thu Sep 10 18:26:48 2015 +0200
Committer: Julien Bouquillon <ju...@bouquillon.com>
Committed: Thu Sep 10 18:26:48 2015 +0200

----------------------------------------------------------------------
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/0d82bc98/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b358dad..5a0b91f 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,9 @@ Although the object is in the global scope, it is not available until after the
         console.log(device.cordova);
     }
 
+:warning: Report issues on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20Device%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC)
+
+
 ## Installation
 
     cordova plugin add cordova-plugin-device
@@ -168,7 +171,7 @@ The details of how a UUID is generated are determined by the device manufacturer
 
 ### iOS Quirk
 
-The `uuid` on iOS uses the identifierForVendor property. It is unique to the device across the same vendor, but will be different for different vendors and will change if all apps from the vendor are deleted and then reinstalled. 
+The `uuid` on iOS uses the identifierForVendor property. It is unique to the device across the same vendor, but will be different for different vendors and will change if all apps from the vendor are deleted and then reinstalled.
 See https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIDevice_Class/#//apple_ref/occ/instp/UIDevice/identifierForVendor
 The UUID will be the same if app is restored from a backup or iCloud as it is saved in preferences. Users using older versions of this plugin will still receive the same previous UUID generated by another means as it will be retrieved from preferences.
 
@@ -211,4 +214,3 @@ Get the operating system version.
     // Windows Phone 7: returns current OS version number, ex. on Mango returns 7.10.7720
     // Tizen: returns "TIZEN_20120425_2"
     var deviceVersion = device.version;
-


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/2] cordova-plugin-device git commit: Fix merge conflict

Posted by pu...@apache.org.
Fix merge conflict


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/370cbd64
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/370cbd64
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/370cbd64

Branch: refs/heads/master
Commit: 370cbd64c8c6340ed1ab271ed720407e261579c3
Parents: 38b01b8 0d82bc9
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu Oct 22 15:41:01 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu Oct 22 15:41:01 2015 -0700

----------------------------------------------------------------------
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/370cbd64/README.md
----------------------------------------------------------------------
diff --cc README.md
index 0bc93f0,5a0b91f..23f2c2a
--- a/README.md
+++ b/README.md
@@@ -212,15 -214,3 +215,18 @@@ Get the operating system version
      // Windows Phone 7: returns current OS version number, ex. on Mango returns 7.10.7720
      // Tizen: returns "TIZEN_20120425_2"
      var deviceVersion = device.version;
++<<<<<<< HEAD
 +
 +## device.isVirtual
 +
 +whether the device is running on a simulator.
 +
 +    var isSim = device.isVirtual;
 +
 +### Supported Platforms
 +
 +- Android 2.1+
 +- iOS
 +- Windows Phone 8
++=======
++>>>>>>> 0d82bc984174c34a4e2ff5dc08020c21d7bc27a1


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org