Skip to content

Commit

Permalink
Merge upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
EddyVerbruggen committed Jul 30, 2016
2 parents 461c68c + ff8cdc0 commit 207b054
Show file tree
Hide file tree
Showing 21 changed files with 1,131 additions and 854 deletions.
130 changes: 68 additions & 62 deletions Documentation/files/PushNotification-js.html

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions Documentation/index/Functions.html

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions Documentation/index/General.html

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions Documentation/javascript/searchdata.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,60 +29,60 @@ var indexSectionsWithContent = {
"Y": false,
"Z": false
},
"Classes": {
"Functions": {
"Symbols": false,
"Numbers": false,
"A": false,
"A": true,
"B": false,
"C": false,
"C": true,
"D": false,
"E": false,
"F": false,
"G": false,
"G": true,
"H": false,
"I": false,
"J": false,
"K": false,
"L": false,
"M": false,
"N": false,
"O": false,
"O": true,
"P": true,
"Q": false,
"R": false,
"S": false,
"R": true,
"S": true,
"T": false,
"U": false,
"U": true,
"V": false,
"W": false,
"X": false,
"Y": false,
"Z": false
},
"Functions": {
"Classes": {
"Symbols": false,
"Numbers": false,
"A": true,
"A": false,
"B": false,
"C": true,
"C": false,
"D": false,
"E": false,
"F": false,
"G": true,
"G": false,
"H": false,
"I": false,
"J": false,
"K": false,
"L": false,
"M": false,
"N": false,
"O": true,
"P": false,
"O": false,
"P": true,
"Q": false,
"R": true,
"S": true,
"R": false,
"S": false,
"T": false,
"U": true,
"U": false,
"V": false,
"W": false,
"X": false,
Expand Down
2 changes: 1 addition & 1 deletion Documentation/search/FunctionsC.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@



<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_cancelAllLocalNotifications><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.cancelAllLocalNotifications" target=_parent class=ISymbol>cancelAllLocalNotifications</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearLocalNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearLocalNotification" target=_parent class=ISymbol>clearLocalNotification</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearNotificationCenter><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearNotificationCenter" target=_parent class=ISymbol>clearNotificationCenter</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearPushHistory><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearPushHistory" target=_parent class=ISymbol>clearPushHistory</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_createLocalNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.createLocalNotification" target=_parent class=ISymbol>createLocalNotification</a>, <span class=IParent>PushNotification</span></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_cancelAllLocalNotifications><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.cancelAllLocalNotifications" target=_parent class=ISymbol>cancelAllLocalNotifications</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearLaunchNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearLaunchNotification" target=_parent class=ISymbol>clearLaunchNotification</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearLocalNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearLocalNotification" target=_parent class=ISymbol>clearLocalNotification</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearNotificationCenter><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearNotificationCenter" target=_parent class=ISymbol>clearNotificationCenter</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearPushHistory><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearPushHistory" target=_parent class=ISymbol>clearPushHistory</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_createLocalNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.createLocalNotification" target=_parent class=ISymbol>createLocalNotification</a>, <span class=IParent>PushNotification</span></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
document.getElementById("Loading").style.display="none";
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults", "HTML");
Expand Down
20 changes: 20 additions & 0 deletions Documentation/search/FunctionsP.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">

<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><link rel="stylesheet" type="text/css" href="../styles/main.css"><script language=JavaScript src="../javascript/main.js"></script></head><body class="PopupSearchResultsPage" onLoad="NDOnLoad()"><script language=JavaScript><!--
if (browserType) {document.write("<div class=" + browserType + ">");if (browserVer) {document.write("<div class=" + browserVer + ">"); }}// --></script>

<!-- Generated by Natural Docs, version 1.52 -->
<!-- http://www.naturaldocs.org -->

<!-- saved from url=(0026)http://www.naturaldocs.org -->




<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_postEvent><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.postEvent" target=_parent class=ISymbol>postEvent</a>, <span class=IParent>PushNotification</span></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
document.getElementById("Loading").style.display="none";
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults", "HTML");
searchResults.Search();
--></script></div><script language=JavaScript><!--
if (browserType) {if (browserVer) {document.write("</div>"); }document.write("</div>");}// --></script></body></html>
2 changes: 1 addition & 1 deletion Documentation/search/FunctionsS.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@



<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_setApplicationIconBadgeNumber><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setApplicationIconBadgeNumber" target=_parent class=ISymbol>setApplicationIconBadgeNumber</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setBeaconBackgroundMode><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setBeaconBackgroundMode" target=_parent class=ISymbol>setBeaconBackgroundMode</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setEnableLED><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setEnableLED" target=_parent class=ISymbol>setEnableLED</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setLightScreenOnNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setLightScreenOnNotification" target=_parent class=ISymbol>setLightScreenOnNotification</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setMultiNotificationMode><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setMultiNotificationMode" target=_parent class=ISymbol>setMultiNotificationMode</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setSingleNotificationMode><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setSingleNotificationMode" target=_parent class=ISymbol>setSingleNotificationMode</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setSoundType><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setSoundType" target=_parent class=ISymbol>setSoundType</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setTags><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setTags" target=_parent class=ISymbol>setTags</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setVibrateType><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setVibrateType" target=_parent class=ISymbol>setVibrateType</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_startBeaconPushes><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.startBeaconPushes" target=_parent class=ISymbol>startBeaconPushes</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_startGeoPushes><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.startGeoPushes" target=_parent class=ISymbol>startGeoPushes</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_startLocationTracking><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.startLocationTracking" target=_parent class=ISymbol>startLocationTracking</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_stopBeaconPushes><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.stopBeaconPushes" target=_parent class=ISymbol>stopBeaconPushes</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_stopGeoPushes><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.stopGeoPushes" target=_parent class=ISymbol>stopGeoPushes</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_stopLocationTracking><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.stopLocationTracking" target=_parent class=ISymbol>stopLocationTracking</a>, <span class=IParent>PushNotification</span></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_setApplicationIconBadgeNumber><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setApplicationIconBadgeNumber" target=_parent class=ISymbol>setApplicationIconBadgeNumber</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setBeaconBackgroundMode><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setBeaconBackgroundMode" target=_parent class=ISymbol>setBeaconBackgroundMode</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setEnableLED><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setEnableLED" target=_parent class=ISymbol>setEnableLED</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setLightScreenOnNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setLightScreenOnNotification" target=_parent class=ISymbol>setLightScreenOnNotification</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setMultiNotificationMode><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setMultiNotificationMode" target=_parent class=ISymbol>setMultiNotificationMode</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setSingleNotificationMode><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setSingleNotificationMode" target=_parent class=ISymbol>setSingleNotificationMode</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setSoundType><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setSoundType" target=_parent class=ISymbol>setSoundType</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setTags><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setTags" target=_parent class=ISymbol>setTags</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setUserId><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setUserId" target=_parent class=ISymbol>setUserId</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_setVibrateType><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.setVibrateType" target=_parent class=ISymbol>setVibrateType</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_startBeaconPushes><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.startBeaconPushes" target=_parent class=ISymbol>startBeaconPushes</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_startLocationTracking><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.startLocationTracking" target=_parent class=ISymbol>startLocationTracking</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_stopBeaconPushes><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.stopBeaconPushes" target=_parent class=ISymbol>stopBeaconPushes</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_stopLocationTracking><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.stopLocationTracking" target=_parent class=ISymbol>stopLocationTracking</a>, <span class=IParent>PushNotification</span></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
document.getElementById("Loading").style.display="none";
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults", "HTML");
Expand Down
2 changes: 1 addition & 1 deletion Documentation/search/GeneralC.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@



<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_cancelAllLocalNotifications><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.cancelAllLocalNotifications" target=_parent class=ISymbol>cancelAllLocalNotifications</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearLocalNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearLocalNotification" target=_parent class=ISymbol>clearLocalNotification</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearNotificationCenter><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearNotificationCenter" target=_parent class=ISymbol>clearNotificationCenter</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearPushHistory><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearPushHistory" target=_parent class=ISymbol>clearPushHistory</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_createLocalNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.createLocalNotification" target=_parent class=ISymbol>createLocalNotification</a>, <span class=IParent>PushNotification</span></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_cancelAllLocalNotifications><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.cancelAllLocalNotifications" target=_parent class=ISymbol>cancelAllLocalNotifications</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearLaunchNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearLaunchNotification" target=_parent class=ISymbol>clearLaunchNotification</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearLocalNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearLocalNotification" target=_parent class=ISymbol>clearLocalNotification</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearNotificationCenter><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearNotificationCenter" target=_parent class=ISymbol>clearNotificationCenter</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_clearPushHistory><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.clearPushHistory" target=_parent class=ISymbol>clearPushHistory</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_createLocalNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.createLocalNotification" target=_parent class=ISymbol>createLocalNotification</a>, <span class=IParent>PushNotification</span></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
document.getElementById("Loading").style.display="none";
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults", "HTML");
Expand Down
2 changes: 1 addition & 1 deletion Documentation/search/GeneralP.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@



<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_PushNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification" target=_parent class=ISymbol>PushNotification</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
<div id=Index><div class=SRStatus id=Loading>Loading...</div><table border=0 cellspacing=0 cellpadding=0><div class=SRResult id=SR_postEvent><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification.postEvent" target=_parent class=ISymbol>postEvent</a>, <span class=IParent>PushNotification</span></div></div><div class=SRResult id=SR_PushNotification><div class=IEntry><a href="../files/PushNotification-js.html#PushNotification" target=_parent class=ISymbol>PushNotification</a></div></div></table><div class=SRStatus id=Searching>Searching...</div><div class=SRStatus id=NoMatches>No Matches</div><script type="text/javascript"><!--
document.getElementById("Loading").style.display="none";
document.getElementById("NoMatches").style.display="none";
var searchResults = new SearchResults("searchResults", "HTML");
Expand Down
Loading

0 comments on commit 207b054

Please sign in to comment.