Permalink
Browse files

updated to 2.6.0

  • Loading branch information...
1 parent b671091 commit 6d86eca02d6f8173dde07bf576b5c2a37d550a96 @stevengill stevengill committed Apr 9, 2013
Showing with 62,623 additions and 26,996 deletions.
  1. +1 −1 VERSION
  2. +65 −5 changelog
  3. +27 −3 doc/_index.html
  4. +31 −7 doc/cordova_accelerometer_accelerometer.md.html
  5. +27 −3 doc/cordova_camera_camera.cleanup.md.html
  6. +28 −4 doc/cordova_camera_camera.md.html
  7. +30 −6 doc/cordova_compass_compass.md.html
  8. +28 −4 doc/cordova_connection_connection.md.html
  9. +35 −11 doc/cordova_contacts_contacts.md.html
  10. +32 −8 doc/cordova_device_device.md.html
  11. +28 −4 doc/cordova_device_device.model.md.html
  12. +57 −33 doc/cordova_events_events.md.html
  13. +32 −8 doc/cordova_file_file.md.html
  14. +32 −8 doc/cordova_geolocation_geolocation.md.html
  15. +40 −16 doc/cordova_globalization_globalization.md.html
  16. +31 −7 doc/cordova_inappbrowser_inappbrowser.md.html
  17. +30 −6 doc/cordova_media_capture_capture.md.html
  18. +36 −12 doc/cordova_media_media.md.html
  19. +32 −8 doc/cordova_notification_notification.md.html
  20. +29 −5 doc/cordova_splashscreen_splashscreen.md.html
  21. +33 −9 doc/cordova_storage_storage.md.html
  22. +27 −3 doc/guide_command-line_index.md.html
  23. +27 −3 doc/guide_cordova-webview_android.md.html
  24. +27 −3 doc/guide_cordova-webview_index.md.html
  25. +27 −3 doc/guide_cordova-webview_ios.md.html
  26. +28 −4 doc/guide_getting-started_android_index.md.html
  27. +28 −4 doc/guide_getting-started_bada_index.md.html
  28. +28 −4 doc/guide_getting-started_blackberry_index.md.html
  29. +27 −3 doc/guide_getting-started_index.md.html
  30. +32 −8 doc/guide_getting-started_ios_index.md.html
  31. +28 −4 doc/guide_getting-started_symbian_index.md.html
  32. +28 −4 doc/guide_getting-started_tizen_index.md.html
  33. +28 −4 doc/guide_getting-started_webos_index.md.html
  34. +28 −4 doc/guide_getting-started_windows-8_index.md.html
  35. +28 −4 doc/guide_getting-started_windows-phone-7_index.md.html
  36. +28 −4 doc/guide_getting-started_windows-phone-8_index.md.html
  37. +27 −3 doc/guide_plugin-development_android_index.md.html
  38. +27 −3 doc/guide_plugin-development_bada_index.md.html
  39. +27 −3 doc/guide_plugin-development_blackberry_index.md.html
  40. +27 −3 doc/guide_plugin-development_index.md.html
  41. +27 −3 doc/guide_plugin-development_ios_index.md.html
  42. +27 −3 doc/guide_plugin-development_tizen_index.md.html
  43. +27 −3 doc/guide_plugin-development_webos_index.md.html
  44. +27 −3 doc/guide_plugin-development_windows-phone_index.md.html
  45. +27 −3 doc/guide_project-settings_android_index.md.html
  46. +27 −3 doc/guide_project-settings_bada_index.md.html
  47. +27 −3 doc/guide_project-settings_blackberry_index.md.html
  48. +27 −3 doc/guide_project-settings_firefoxos_index.md.html
  49. +28 −4 doc/guide_project-settings_index.md.html
  50. +27 −3 doc/guide_project-settings_ios_index.md.html
  51. +27 −3 doc/guide_project-settings_webos_index.md.html
  52. +27 −3 doc/guide_project-settings_windows8_index.md.html
  53. +27 −3 doc/guide_project-settings_wp7_index.md.html
  54. +27 −3 doc/guide_project-settings_wp8_index.md.html
  55. +32 −8 doc/guide_upgrading_android_index.md.html
  56. +27 −3 doc/guide_upgrading_bada_index.md.html
  57. +27 −3 doc/guide_upgrading_blackberry_index.md.html
  58. +27 −3 doc/guide_upgrading_index.md.html
  59. +58 −9 doc/guide_upgrading_ios_index.md.html
  60. +27 −3 doc/guide_upgrading_symbian_index.md.html
  61. +27 −3 doc/guide_upgrading_tizen_index.md.html
  62. +31 −7 doc/guide_upgrading_webos_index.md.html
  63. +31 −7 doc/guide_upgrading_windows-phone_index.md.html
  64. +27 −3 doc/guide_whitelist_index.md.html
  65. +27 −3 doc/index.html
  66. +1 −1 lib/android/VERSION
  67. BIN lib/android/bin/templates/cordova/appinfo.jar
  68. +2 −2 lib/android/bin/templates/project/assets/www/index.html
  69. +2 −0 lib/android/changelog
  70. BIN lib/android/{cordova-2.6.0rc1.jar → cordova-2.6.0.jar}
  71. +4 −3 lib/android/{cordova-2.6.0rc1.js → cordova-2.6.0.js}
  72. +4 −3 lib/android/example/assets/www/{cordova-2.6.0rc1.js → cordova-2.6.0.js}
  73. +2 −2 lib/android/example/assets/www/index.html
  74. BIN lib/android/example/cordova/appinfo.jar
  75. BIN lib/android/example/libs/{cordova-2.6.0rc1.jar → cordova-2.6.0.jar}
  76. +1 −1 lib/blackberry/VERSION
  77. +1 −1 lib/blackberry/bin/templates/project/www/VERSION
  78. +1 −1 lib/blackberry/bin/templates/project/www/index.html
  79. +7 −5 lib/blackberry/changelog
  80. 0 lib/blackberry/example/lib/{cordova.2.6.0rc1 → cordova.2.6.0}/ext-air/Cordova_Network/library.xml
  81. 0 ...rdova.2.6.0rc1 → cordova.2.6.0}/ext-air/Cordova_Network/src/org/apache/cordova/network/Network.as
  82. 0 lib/blackberry/example/lib/{cordova.2.6.0rc1 → cordova.2.6.0}/ext-qnx/org.apache.cordova/client.js
  83. 0 lib/blackberry/example/lib/{cordova.2.6.0rc1 → cordova.2.6.0}/ext-qnx/org.apache.cordova/index.js
  84. 0 ...lackberry/example/lib/{cordova.2.6.0rc1 → cordova.2.6.0}/ext-qnx/org.apache.cordova/manifest.json
  85. 0 lib/blackberry/example/lib/{cordova.2.6.0rc1 → cordova.2.6.0}/ext-qnx/readme.md
  86. BIN ...rry/example/lib/{cordova.2.6.0rc1/ext/cordova.2.6.0rc1.jar → cordova.2.6.0/ext/cordova.2.6.0.jar}
  87. +4 −4 ...lib/{cordova.2.6.0rc1/javascript/cordova-2.6.0rc1.js → cordova.2.6.0/javascript/cordova-2.6.0.js}
  88. +1 −1 lib/blackberry/example/www/VERSION
  89. +4 −4 lib/blackberry/example/www/{cordova-2.6.0rc1.js → cordova-2.6.0.js}
  90. BIN lib/blackberry/example/www/ext/{cordova.2.6.0rc1.jar → cordova.2.6.0.jar}
  91. +1 −1 lib/blackberry/example/www/index.html
  92. +1 −1 lib/blackberry/framework/ext/src/org/apache/cordova/device/Device.java
  93. +4 −4 lib/blackberry/javascript/cordova.blackberry.js
  94. +5 −1 lib/cordova-cli/README.md
  95. +13 −17 lib/ios/CordovaLib/Classes/CDVCamera.m
  96. +31 −28 lib/ios/CordovaLib/Classes/CDVJpegHeaderWriter.m
  97. +6 −1 lib/ios/CordovaLib/Classes/CDVSplashScreen.m
  98. +1 −1 lib/ios/CordovaLib/VERSION
  99. +2 −2 lib/ios/CordovaLib/cordova.ios.js
  100. +4 −0 lib/ios/RELEASENOTES.md
  101. +7 −0 lib/ios/changelog
  102. BIN lib/windows-phone-7/CordovaWP7_2_6_0_Full.zip
  103. BIN lib/windows-phone-7/CordovaWP7_2_6_0_StandAlone.zip
  104. +1 −1 lib/windows-phone-7/VERSION
  105. +2 −2 lib/windows-phone-7/bin/create.js
  106. +11 −0 lib/windows-phone-7/changelog
  107. +1 −1 lib/windows-phone-7/example/CordovaExample.csproj
  108. +1 −1 lib/windows-phone-7/example/CordovaSourceDictionary.xml
  109. +2 −2 lib/windows-phone-7/example/www/{cordova-2.6.0rc1.js → cordova-2.6.0.js}
  110. +1 −1 lib/windows-phone-7/example/www/cordova-current.js
  111. +1 −1 lib/windows-phone-7/framework/Properties/AssemblyInfo.cs
  112. +7 −1 lib/windows-phone-7/templates/full/CordovaAppProj.csproj
  113. +1 −1 lib/windows-phone-7/templates/full/CordovaSourceDictionary.xml
  114. BIN lib/windows-phone-7/templates/full/Images/appbar.back.rest.png
  115. BIN lib/windows-phone-7/templates/full/Images/appbar.close.rest.png
  116. BIN lib/windows-phone-7/templates/full/Images/appbar.feature.video.rest.png
  117. BIN lib/windows-phone-7/templates/full/Images/appbar.next.rest.png
  118. BIN lib/windows-phone-7/templates/full/Images/appbar.save.rest.png
  119. BIN lib/windows-phone-7/templates/full/Images/appbar.stop.rest.png
  120. +1 −1 lib/windows-phone-7/templates/full/VERSION
  121. +2 −2 lib/windows-phone-7/templates/{standalone/www/cordova-2.6.0rc1.js → full/www/cordova-2.6.0.js}
  122. +1 −1 lib/windows-phone-7/templates/full/www/index.html
  123. +7 −1 lib/windows-phone-7/templates/standalone/CordovaAppProj.csproj
  124. BIN lib/windows-phone-7/templates/standalone/Images/appbar.back.rest.png
  125. BIN lib/windows-phone-7/templates/standalone/Images/appbar.close.rest.png
  126. BIN lib/windows-phone-7/templates/standalone/Images/appbar.feature.video.rest.png
  127. BIN lib/windows-phone-7/templates/standalone/Images/appbar.next.rest.png
  128. BIN lib/windows-phone-7/templates/standalone/Images/appbar.save.rest.png
  129. BIN lib/windows-phone-7/templates/standalone/Images/appbar.stop.rest.png
  130. +1 −1 lib/windows-phone-7/templates/standalone/MainPage.xaml
  131. +4 −4 lib/windows-phone-7/templates/standalone/MainPage.xaml.cs
  132. +1 −1 lib/windows-phone-7/templates/standalone/VERSION
  133. +1 −1 lib/windows-phone-7/templates/standalone/cordovalib/Commands/Device.cs
  134. +0 −1 lib/windows-phone-7/templates/standalone/cordovalib/Commands/InAppBrowser.cs
  135. +33 −8 lib/windows-phone-7/templates/standalone/cordovalib/Commands/Notification.cs
  136. +2 −2 ...ne-8/example/www/cordova-2.6.0rc1.js → windows-phone-7/templates/standalone/www/cordova-2.6.0.js}
  137. +1 −1 lib/windows-phone-7/templates/standalone/www/index.html
  138. +4 −4 lib/windows-phone-7/templates/vs/MyTemplateFull.vstemplate
  139. +4 −4 lib/windows-phone-7/templates/vs/MyTemplateStandAlone.vstemplate
  140. +1 −1 lib/windows-phone-7/templates/vs/description.txt
  141. +9 −7 lib/windows-phone-7/tooling/scripts/dist.js
  142. +5 −4 lib/windows-phone-7/tooling/scripts/win-zip.js
  143. BIN lib/windows-phone-8/CordovaWP8_2_6_0rc1_Full.zip
  144. BIN lib/windows-phone-8/CordovaWP8_2_6_0rc1_StandAlone.zip
  145. +1 −1 lib/windows-phone-8/VERSION
  146. +9 −0 lib/windows-phone-8/changelog
  147. +1 −1 lib/windows-phone-8/example/CordovaExample.csproj
  148. +1 −1 lib/windows-phone-8/example/MainPage.xaml
  149. +3 −3 lib/windows-phone-8/example/MainPage.xaml.cs
  150. +2 −2 ...ws-phone-7/templates/full/www/cordova-2.6.0rc1.js → windows-phone-8/example/www/cordova-2.6.0.js}
  151. +1 −1 lib/windows-phone-8/example/www/cordova-current.js
  152. +1 −1 lib/windows-phone-8/framework/Properties/AssemblyInfo.cs
  153. +1 −1 lib/windows-phone-8/templates/custom/CordovaAppProj.csproj
  154. +1 −1 lib/windows-phone-8/templates/custom/VERSION
  155. +6,647 −0 lib/windows-phone-8/templates/custom/www/cordova-2.6.0.js
  156. +0 −6,647 lib/windows-phone-8/templates/custom/www/cordova-2.6.0rc1.js
  157. +1 −1 lib/windows-phone-8/templates/custom/www/index.html
  158. +7 −1 lib/windows-phone-8/templates/full/CordovaAppProj.csproj
  159. BIN lib/windows-phone-8/templates/full/Images/appbar.back.rest.png
  160. BIN lib/windows-phone-8/templates/full/Images/appbar.close.rest.png
  161. BIN lib/windows-phone-8/templates/full/Images/appbar.feature.video.rest.png
  162. BIN lib/windows-phone-8/templates/full/Images/appbar.next.rest.png
  163. BIN lib/windows-phone-8/templates/full/Images/appbar.save.rest.png
  164. BIN lib/windows-phone-8/templates/full/Images/appbar.stop.rest.png
  165. +0 −11 lib/windows-phone-8/templates/full/README.md
  166. +1 −1 lib/windows-phone-8/templates/full/VERSION
  167. +6,647 −0 lib/windows-phone-8/templates/full/www/cordova-2.6.0.js
  168. +0 −6,647 lib/windows-phone-8/templates/full/www/cordova-2.6.0rc1.js
  169. +1 −1 lib/windows-phone-8/templates/full/www/index.html
  170. +8 −1 lib/windows-phone-8/templates/standalone/CordovaAppProj.csproj
  171. BIN lib/windows-phone-8/templates/standalone/Images/appbar.back.rest.png
  172. BIN lib/windows-phone-8/templates/standalone/Images/appbar.close.rest.png
  173. BIN lib/windows-phone-8/templates/standalone/Images/appbar.feature.video.rest.png
  174. BIN lib/windows-phone-8/templates/standalone/Images/appbar.next.rest.png
  175. BIN lib/windows-phone-8/templates/standalone/Images/appbar.save.rest.png
  176. BIN lib/windows-phone-8/templates/standalone/Images/appbar.stop.rest.png
  177. +2 −1 lib/windows-phone-8/templates/standalone/MainPage.xaml
  178. +4 −4 lib/windows-phone-8/templates/standalone/MainPage.xaml.cs
  179. +0 −13 lib/windows-phone-8/templates/standalone/README.md
  180. +1 −1 lib/windows-phone-8/templates/standalone/VERSION
  181. +1 −1 lib/windows-phone-8/templates/standalone/cordovalib/CommandFactory.cs
  182. +1 −1 lib/windows-phone-8/templates/standalone/cordovalib/Commands/BaseCommand.cs
  183. +1 −1 lib/windows-phone-8/templates/standalone/cordovalib/Commands/Device.cs
  184. +20 −18 lib/windows-phone-8/templates/standalone/cordovalib/Commands/InAppBrowser.cs
  185. +48 −23 lib/windows-phone-8/templates/standalone/cordovalib/Commands/Notification.cs
  186. +2 −2 lib/windows-phone-8/templates/standalone/cordovalib/DOMStorageHelper.cs
  187. +12 −12 lib/windows-phone-8/templates/standalone/cordovalib/OrientationHelper.cs
  188. +0 −6,446 lib/windows-phone-8/templates/standalone/www/cordova-2.5.0.js
  189. +6,647 −0 lib/windows-phone-8/templates/standalone/www/cordova-2.6.0.js
  190. +0 −6,647 lib/windows-phone-8/templates/standalone/www/cordova-2.6.0rc1.js
  191. +1 −1 lib/windows-phone-8/templates/standalone/www/index.html
  192. +4 −4 lib/windows-phone-8/templates/vs/MyTemplateCustom.vstemplate
  193. +4 −4 lib/windows-phone-8/templates/vs/MyTemplateFull.vstemplate
  194. +4 −4 lib/windows-phone-8/templates/vs/MyTemplateStandAlone.vstemplate
  195. +4 −4 lib/windows-phone-8/templates/vs/description.txt
  196. +1 −1 lib/windows8/VERSION
  197. +8,075 −0 lib/windows8/cordova-2.6.0.js
  198. +1 −1 lib/windows8/cordova-2.6.0rc1.js
  199. +1 −1 lib/windows8/samples/Media_Test/Media_Test/Media_Test.jsproj
  200. +8,075 −0 lib/windows8/samples/Media_Test/Media_Test/cordova-2.6.0.js
  201. +1 −1 lib/windows8/samples/Media_Test/Media_Test/cordova-2.6.0rc1.js
  202. +1 −1 lib/windows8/samples/Media_Test/Media_Test/cordova.js
  203. +1 −1 lib/windows8/samples/Notification Test/Notification Test/Notification Test.jsproj
  204. +8,075 −0 lib/windows8/samples/Notification Test/Notification Test/cordova-2.6.0.js
  205. +1 −1 lib/windows8/samples/Notification Test/Notification Test/cordova.js
  206. BIN lib/windows8/samples/Notification Test/Notification Test/index.html
  207. +1 −1 lib/windows8/template/CordovaApp.jsproj
  208. +8,075 −0 lib/windows8/template/www/cordova-2.6.0.js
  209. +1 −1 lib/windows8/template/www/cordova-2.6.0rc1.js
  210. +2 −2 lib/windows8/template/www/index.html
  211. +1 −1 lib/windows8/test/CordovaTestApp.jsproj
  212. +8,075 −0 lib/windows8/test/cordova-2.6.0.js
  213. +1 −1 lib/windows8/test/cordova-2.6.0rc1.js
  214. +1 −1 lib/windows8/test/cordova.js
View
@@ -1 +1 @@
-2.6.0rc1
+2.6.0
View
@@ -3,6 +3,13 @@
iOS
---
+8afed3f [CB-2902] re-added long/short tags to template dict, fixed subExifIFD offset
+3181b0b [CB-2896] fixed error in exif subifd offset calculation for tag 8769
+4685ecc [CB-2896] split writing of working tags off here, multipart tags not supported
+4dd1c81 Updated cordova.js to 2.6.0
+360a3ad Updated VERSION to 2.6.0
+c9be68b [CB-2732] Only set camera device when allowed.
+ebc74ec [CB-2848] ShowSplashScreenSpinner not used
30a9e5c Added updated 2.6.0rc1 cordova.js
fda308b [CB-2790] removed old splice code, replaced with JpegHeaderWriter api calls
99a1cc9 [CB-2790] added splice function to header writer: accepts jpeg as NSData, and splices in exif data specified by a string
@@ -91,6 +98,8 @@ f55d0d9 Merge branch 'next'
Android
---
+34b606b Prep for 2.6.0 final
+d1932ad CB-1796: Let's make sure we actually write the file instead of just writing EXIF to NOTHING
ff6ef1e JS Changed once again, this will require a retag of 2.6.0rc1
b7e67ff Merge branch '2.6.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.6.x
4ab4606 Fixing CB-1700, we had the file names reversed, so exif was never being written right. Needed to upload a file to debug this thing
@@ -157,11 +166,13 @@ fdb3679 Merge branch 'next'
BlackBerry
---
-9a26b94 [CB-2766] - updated version
-4ab1a56 [CB-2745] - updating javascript again
-a6bd8cd [CB-2756] - updating www/ for bb
-5f2c12d [CB-2745] - updating javascript
-f3ee54c [CB-2809] resolveFileSystemURI now reports native IllegalArgument exception, getEntryFromURI now handles query strings
+b91a32e [CB-2878] - updated version and tagged
+e4dc9dd [CB-2858] - updating javascript
+f01e629 [CB-2766] - updated version
+88372d1 [CB-2745] - updating javascript again
+af26b12 [CB-2809] resolveFileSystemURI now reports native IllegalArgument exception, getEntryFromURI now handles query strings
+d42a18a [CB-2756] - updating www/ for bb
+059bf2b [CB-2745] - updating javascript
e50fcd5 [CB-2646] removed mistaken modification to mkdir file access
3dba2ed [CB-2646] added fileSize method to file utilities
1e9e95a Fix create script for Linux
@@ -173,12 +184,25 @@ c57ceeb [CB-2649] ammended solution: includes Absolute Value function wrapper, p
Windows
---
+1aa0197 Merge pull request #1 from purplecabbage/2.6.0_ReleasePrep
+5b8e461 update rc1 to release version
7326fcb 2.6.0rc1 release updates
Windows Phone 7
---
+5c74aca add images for full template
+33e2af8 remove unused ref to CordovaView.Browser
+a9c6bbe fix standalone template refs to PGView which does not exist and add images for use by InAppBrowser
+91fc060 removed temp bunk added by Benn
+c328e4f Merge tag '2.6.0' of git://github.com/bennmapes/cordova-wp7
+567e17d 2.6.0 prep
+2dbd98f Merge branch 'master' of github.com:purplecabbage/cordova-wp7
+4dd39a7 notif boxes store ref to previous so they can be dismissed in order
+906ac31 notification alert handles backbutton correctly with multiple alerts
+001e15e Merge pull request #10 from bennmapes/CB-2832
+f658c74 [CB-2832] Fixed zipping script to ensure all items are copied
37751cf updated js files
404152e update version to 2.6.0rc1
77431c1 Merge branch 'master' of github.com:purplecabbage/cordova-wp7
@@ -200,6 +224,14 @@ aeb213b added OnInit method to basecommand, virtual
Windows Phone 8
---
+ab2e84e fix for missing images on InAppBrowser application bar
+d8f1d20 issues with InAppBrowser fixed in template
+2922d08 updates for 2.6.0 release
+9d360e8 alerts + confirms are dismissed in order CB-2821
+87e0d98 Merge pull request #16 from purplecabbage/CB-2500
+a9e2a6b Merge branch 'CB-2500' of git://github.com/cmarcelk/cordova-wp8 into CB-2500
+a7ff6a0 Merge pull request #15 from purplecabbage/CB2821
+26501df remove some differences between template project variable naming, rename some gap references
6a6a518 Merge branch 'master' of github.com:purplecabbage/cordova-wp8
2d79dd6 2.6.0 rc1 updates
2b98697 Merge pull request #14 from bennmapes/CB-2831
@@ -220,11 +252,14 @@ c652707 Merge pull request #10 from purplecabbage/CB-2692
e14552a Oops, all calls were Synchronous for a moment there
f19295d Remove CordovaMediaonResult
57bc645 Removed dependency on CordovaCommandResult, removed obsolete 'cast' param from callbacks
+59555ed CB-2500: handle multiple concurrent alerts
OSX
---
+9aa9bab Updated VERSION to 2.6.0
+97646e6 Updated cordova.js to 2.6.0
04601fa Updated 2.6.0rc1 cordova.js
28454d0 [CB-2805] ARC weak reference issues in 10.7
9f29a16 [CB-2804] Project does not compile under OS X Lion (10.7)
@@ -247,6 +282,8 @@ e0f2cdd Added cordova-app-hello-world
Docs
---
+dd03d97 Version 2.6.0
+5a774fd Added iOS upgrading instructions from 2.5.0 to 2.6.0
15b56f0 Version 2.6.0rc1 with files.
778fc54 Version 2.6.0rc1
a897edd [CB-2781] Create iOS Project Setting for KeyboardShrinksView
@@ -287,6 +324,25 @@ b26f4b7 updated for 2.5.0
MobileSpec
---
+4cf1a5b Revert "[CB-2305] Add spec tests for InAppBrowser.insertCSS and InAppBrowser.executeScript APIs"
+83a5ef0 Revert "[CB-2226] Add spec test for FileTransfer.abort error callback"
+7502d51 Revert "[CB-1517] [CB-1518] Add spec test for gzip-encoded resources"
+0e3bf88 Updated version to 2.6.0
+550f014 Merge branch '2.6.x' of https://git-wip-us.apache.org/repos/asf/cordova-mobile-spec into 2.6.x
+ae8d5ca [CB-2899] literally one line removed, debug statement in camera manual test page
+acd1b96 Merge remote-tracking branch 'apache/master' into 2.6.x
+7a0d5de [CB-2600] match case for cordova.ios.js
+b261439 [CB-2600] match case for cordova.ios.js
+f6cbe2e [CB-2793] added definition and display of default values for camera.getPicture test
+f08af16 Merge remote-tracking branch 'apache/master'
+b3caa3e [CB-2600] - fix for old blackberry
+826d443 [CB-2793] added definition and display of default values for camera.getPicture test
+fd16116 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-mobile-spec
+2003ff7 [CB-1517] Add an assertion that progress.total < progress.loaded
+da89eaa [CB-1517] [CB-1518] Add spec test for gzip-encoded resources
+c00970f [CB-2600] - fix for old blackberry
+46e478f [CB-2226] Add spec test for FileTransfer.abort error callback
+dbf631c [CB-2305] Add spec tests for InAppBrowser.insertCSS and InAppBrowser.executeScript APIs
e17a27b 2.6.0rc1
64e9bba CB-2680 - Add prompt dialog to Notification API
c5107bb [CB-2729] write mobile-spec tests to handle basic auth tests for FileTransfer download and upload
@@ -319,6 +375,7 @@ bc23611 Merge branch 'next'
CordovaJS
---
+125dca5 Incrememnting the version can be done on the branch, right? This doesn't need to be added back to master.
104709b catch XHR exception in cordova_plugins.json loading code
47593b2 2.6.0rc1
bbf1562 CB-2679 Add prompt to Notification API for js
@@ -346,13 +403,16 @@ d53601e Fixed CB-2620: console.log prints only the first argument on Xcode conso
Hello World App
---
+bb5d103 Version 2.6.0
54fb5d6 Version 2.6.0rc1
c033a6f Update www/index.html
Cordova CLI
---
+67d94ca updated version to 2.6.0
+69a49e4 CB-2811: shell and module-level hooks should receive project root as parameter.
37b92ff 2.6.0rc1 used for libs now. Bumped npm version to 2.6.0. added androids local.properties to gitignore.
50e8e4e Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli
6c844bc Merge branch 'next'
View
@@ -21,18 +21,19 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width">
<meta name="generator" content="joDoc">
-<title>Apache Cordova API Documentation</title>
+<title>PhoneGap API Documentation</title>
<link rel="stylesheet" type="text/css" href="index.css">
<link rel="stylesheet" type="text/css" href="mobile.css" media="only screen and (max-device-width: 1024px)">
<link rel="stylesheet" type="text/css" href="prettify/prettify.css">
</head>
<body>
<div id="header">
- <h1><a href="index.html">Apache <strong>Cordova</strong> Documentation</a></h1>
+ <h1><a href="index.html">PhoneGap Documentation</a></h1>
<small>
<select><optgroup label="English" value="en">
<option value="edge">edge</option>
-<option selected value="2.6.0rc1">2.6.0rc1</option>
+<option value="2.6.0rc1">2.6.0rc1</option>
+<option selected value="2.6.0">2.6.0</option>
<option value="2.5.0rc1">2.5.0rc1</option>
<option value="2.5.0">2.5.0</option>
<option value="2.4.0rc1">2.4.0rc1</option>
@@ -60,6 +61,28 @@ <h1><a href="index.html">Apache <strong>Cordova</strong> Documentation</a></h1>
<option value="1.6.0">1.6.0</option>
<option value="1.5.0rc1">1.5.0rc1</option>
<option value="1.5.0">1.5.0</option>
+<option value="1.4.1">1.4.1</option>
+<option value="1.4.0rc1">1.4.0rc1</option>
+<option value="1.4.0">1.4.0</option>
+<option value="1.3.0">1.3.0</option>
+<option value="1.2.0">1.2.0</option>
+<option value="1.1.0">1.1.0</option>
+<option value="1.0.0rc3">1.0.0rc3</option>
+<option value="1.0.0rc2">1.0.0rc2</option>
+<option value="1.0.0rc1">1.0.0rc1</option>
+<option value="1.0.0">1.0.0</option>
+<option value="0.9.6">0.9.6</option>
+<option value="0.9.5.1">0.9.5.1</option>
+<option value="0.9.5">0.9.5</option>
+<option value="0.9.4">0.9.4</option>
+<option value="0.9.3">0.9.3</option>
+<option value="0.9.2">0.9.2</option>
+</optgroup>
+<optgroup label="Español" value="es"><option value="1.0.0">1.0.0</option></optgroup>
+<optgroup label="Français" value="fr">
+<option value="1.3.0">1.3.0</option>
+<option value="1.2.0">1.2.0</option>
+<option value="1.1.0">1.1.0</option>
</optgroup>
<optgroup label="Japanese" value="jp">
<option value="2.2.0">2.2.0</option>
@@ -68,6 +91,7 @@ <h1><a href="index.html">Apache <strong>Cordova</strong> Documentation</a></h1>
<option value="1.9.0">1.9.0</option>
<option value="1.8.1">1.8.1</option>
<option value="1.7.0">1.7.0</option>
+<option value="0.9.5">0.9.5</option>
</optgroup>
<optgroup label="Korean" value="kr"><option value="2.0.0">2.0.0</option></optgroup></select></small>
</div>
@@ -21,18 +21,19 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width">
<meta name="generator" content="joDoc">
-<title>Apache Cordova API Documentation</title>
+<title>PhoneGap API Documentation</title>
<link rel="stylesheet" type="text/css" href="index.css">
<link rel="stylesheet" type="text/css" href="mobile.css" media="only screen and (max-device-width: 1024px)">
<link rel="stylesheet" type="text/css" href="prettify/prettify.css">
</head>
<body>
<div id="header">
- <h1><a href="index.html">Apache <strong>Cordova</strong> Documentation</a></h1>
+ <h1><a href="index.html">PhoneGap Documentation</a></h1>
<small>
<select><optgroup label="English" value="en">
<option value="edge">edge</option>
-<option selected value="2.6.0rc1">2.6.0rc1</option>
+<option value="2.6.0rc1">2.6.0rc1</option>
+<option selected value="2.6.0">2.6.0</option>
<option value="2.5.0rc1">2.5.0rc1</option>
<option value="2.5.0">2.5.0</option>
<option value="2.4.0rc1">2.4.0rc1</option>
@@ -60,6 +61,28 @@ <h1><a href="index.html">Apache <strong>Cordova</strong> Documentation</a></h1>
<option value="1.6.0">1.6.0</option>
<option value="1.5.0rc1">1.5.0rc1</option>
<option value="1.5.0">1.5.0</option>
+<option value="1.4.1">1.4.1</option>
+<option value="1.4.0rc1">1.4.0rc1</option>
+<option value="1.4.0">1.4.0</option>
+<option value="1.3.0">1.3.0</option>
+<option value="1.2.0">1.2.0</option>
+<option value="1.1.0">1.1.0</option>
+<option value="1.0.0rc3">1.0.0rc3</option>
+<option value="1.0.0rc2">1.0.0rc2</option>
+<option value="1.0.0rc1">1.0.0rc1</option>
+<option value="1.0.0">1.0.0</option>
+<option value="0.9.6">0.9.6</option>
+<option value="0.9.5.1">0.9.5.1</option>
+<option value="0.9.5">0.9.5</option>
+<option value="0.9.4">0.9.4</option>
+<option value="0.9.3">0.9.3</option>
+<option value="0.9.2">0.9.2</option>
+</optgroup>
+<optgroup label="Español" value="es"><option value="1.0.0">1.0.0</option></optgroup>
+<optgroup label="Français" value="fr">
+<option value="1.3.0">1.3.0</option>
+<option value="1.2.0">1.2.0</option>
+<option value="1.1.0">1.1.0</option>
</optgroup>
<optgroup label="Japanese" value="jp">
<option value="2.2.0">2.2.0</option>
@@ -68,6 +91,7 @@ <h1><a href="index.html">Apache <strong>Cordova</strong> Documentation</a></h1>
<option value="1.9.0">1.9.0</option>
<option value="1.8.1">1.8.1</option>
<option value="1.7.0">1.7.0</option>
+<option value="0.9.5">0.9.5</option>
</optgroup>
<optgroup label="Korean" value="kr"><option value="2.0.0">2.0.0</option></optgroup></select></small>
</div>
@@ -288,7 +312,7 @@ <h2>
&lt;head&gt;
&lt;title&gt;<a href="cordova_accelerometer_accelerometer.md.html#Acceleration">Acceleration</a> Example&lt;/title&gt;
- &lt;script type="text/javascript" charset="utf-8" src="cordova-2.5.0.js"&gt;&lt;/script&gt;
+ &lt;script type="text/javascript" charset="utf-8" src="cordova-2.6.0.js"&gt;&lt;/script&gt;
&lt;script type="text/javascript" charset="utf-8"&gt;
// Wait for Cordova to load
@@ -396,7 +420,7 @@ <h2>
&lt;head&gt;
&lt;title&gt;<a href="cordova_accelerometer_accelerometer.md.html#Acceleration">Acceleration</a> Example&lt;/title&gt;
- &lt;script type="text/javascript" charset="utf-8" src="cordova-2.5.0.js"&gt;&lt;/script&gt;
+ &lt;script type="text/javascript" charset="utf-8" src="cordova-2.6.0.js"&gt;&lt;/script&gt;
&lt;script type="text/javascript" charset="utf-8"&gt;
// The watch id references the current `watchAcceleration`
@@ -512,7 +536,7 @@ <h2>
&lt;head&gt;
&lt;title&gt;<a href="cordova_accelerometer_accelerometer.md.html#Acceleration">Acceleration</a> Example&lt;/title&gt;
- &lt;script type="text/javascript" charset="utf-8" src="cordova-2.5.0.js"&gt;&lt;/script&gt;
+ &lt;script type="text/javascript" charset="utf-8" src="cordova-2.6.0.js"&gt;&lt;/script&gt;
&lt;script type="text/javascript" charset="utf-8"&gt;
// The watch id references the current `watchAcceleration`
@@ -638,7 +662,7 @@ <h2>
&lt;head&gt;
&lt;title&gt;<a href="cordova_accelerometer_accelerometer.md.html#Acceleration">Acceleration</a> Example&lt;/title&gt;
- &lt;script type="text/javascript" charset="utf-8" src="cordova-2.5.0.js"&gt;&lt;/script&gt;
+ &lt;script type="text/javascript" charset="utf-8" src="cordova-2.6.0.js"&gt;&lt;/script&gt;
&lt;script type="text/javascript" charset="utf-8"&gt;
// Wait for Cordova to load
@@ -21,18 +21,19 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width">
<meta name="generator" content="joDoc">
-<title>Apache Cordova API Documentation</title>
+<title>PhoneGap API Documentation</title>
<link rel="stylesheet" type="text/css" href="index.css">
<link rel="stylesheet" type="text/css" href="mobile.css" media="only screen and (max-device-width: 1024px)">
<link rel="stylesheet" type="text/css" href="prettify/prettify.css">
</head>
<body>
<div id="header">
- <h1><a href="index.html">Apache <strong>Cordova</strong> Documentation</a></h1>
+ <h1><a href="index.html">PhoneGap Documentation</a></h1>
<small>
<select><optgroup label="English" value="en">
<option value="edge">edge</option>
-<option selected value="2.6.0rc1">2.6.0rc1</option>
+<option value="2.6.0rc1">2.6.0rc1</option>
+<option selected value="2.6.0">2.6.0</option>
<option value="2.5.0rc1">2.5.0rc1</option>
<option value="2.5.0">2.5.0</option>
<option value="2.4.0rc1">2.4.0rc1</option>
@@ -60,6 +61,28 @@ <h1><a href="index.html">Apache <strong>Cordova</strong> Documentation</a></h1>
<option value="1.6.0">1.6.0</option>
<option value="1.5.0rc1">1.5.0rc1</option>
<option value="1.5.0">1.5.0</option>
+<option value="1.4.1">1.4.1</option>
+<option value="1.4.0rc1">1.4.0rc1</option>
+<option value="1.4.0">1.4.0</option>
+<option value="1.3.0">1.3.0</option>
+<option value="1.2.0">1.2.0</option>
+<option value="1.1.0">1.1.0</option>
+<option value="1.0.0rc3">1.0.0rc3</option>
+<option value="1.0.0rc2">1.0.0rc2</option>
+<option value="1.0.0rc1">1.0.0rc1</option>
+<option value="1.0.0">1.0.0</option>
+<option value="0.9.6">0.9.6</option>
+<option value="0.9.5.1">0.9.5.1</option>
+<option value="0.9.5">0.9.5</option>
+<option value="0.9.4">0.9.4</option>
+<option value="0.9.3">0.9.3</option>
+<option value="0.9.2">0.9.2</option>
+</optgroup>
+<optgroup label="Español" value="es"><option value="1.0.0">1.0.0</option></optgroup>
+<optgroup label="Français" value="fr">
+<option value="1.3.0">1.3.0</option>
+<option value="1.2.0">1.2.0</option>
+<option value="1.1.0">1.1.0</option>
</optgroup>
<optgroup label="Japanese" value="jp">
<option value="2.2.0">2.2.0</option>
@@ -68,6 +91,7 @@ <h1><a href="index.html">Apache <strong>Cordova</strong> Documentation</a></h1>
<option value="1.9.0">1.9.0</option>
<option value="1.8.1">1.8.1</option>
<option value="1.7.0">1.7.0</option>
+<option value="0.9.5">0.9.5</option>
</optgroup>
<optgroup label="Korean" value="kr"><option value="2.0.0">2.0.0</option></optgroup></select></small>
</div>
Oops, something went wrong.

0 comments on commit 6d86eca

Please sign in to comment.