Permalink
Browse files

Merging upstream changes.

  • Loading branch information...
1 parent ab66541 commit 9665ed780925cbf3900cfa6e7c0af7a86f88d374 @timwindsor timwindsor committed Sep 19, 2012
Showing with 899 additions and 296 deletions.
  1. +17 −0 AIR_Samples.md
  2. +3 −1 Adobe_AIR.md
  3. +2 −2 AliceJS.md
  4. +15 −15 All_Pages.md
  5. +7 −0 All_Samples.json
  6. +0 −1 Android.md
  7. +10 −0 Andy_Abgottspon.md
  8. +10 −0 Artem_Simonov.md
  9. +17 −0 BWS_Samples.md
  10. +1 −1 Bangalore.md
  11. +2 −2 BlackBerry_10.md
  12. +1 −4 BlackBerry_10_0_06.md
  13. +1 −8 BlackBerry_10_0_06_Samples.md
  14. +2 −9 BlackBerry_10_Releases.md
  15. +1 −4 BlackBerry_10_Stories.md
  16. +0 −1 BlackBerry_Bridge.md
  17. +8 −0 BlackBerry_Enterprise_Server.md
  18. +26 −9 BlackBerry_Jam.md
  19. +1 −2 BlackBerry_Java.md
  20. +1 −2 BlackBerry_Messenger.md
  21. +8 −0 BlackBerry_OS4.md
  22. +8 −0 BlackBerry_OS5.md
  23. +8 −0 BlackBerry_OS6.md
  24. +8 −0 BlackBerry_OS7.md
  25. +2 −3 BlackBerry_Payment_Service.md
  26. +8 −0 BlackBerry_PlayBook.md
  27. +0 −1 BlackBerry_Push_Service.md
  28. +0 −1 BlackBerry_Smartphones.md
  29. +0 −2 BlackBerry_Web_Services.md
  30. +8 −0 BlackBerry_World.md
  31. +0 −1 Blogs.md
  32. +25 −0 Bogota.md
  33. +1 −1 Buenos_Aires.md
  34. +0 −1 Camera.md
  35. +25 −0 Campinas.md
  36. +1 −1 Cape_Town.md
  37. +25 −0 Caracas.md
  38. +4 −8 Cascades.md
  39. +1 −2 Cascades_Samples_and_Tips.md
  40. +1 −0 Clifford_Hung.md
  41. +1 −4 Cocos2d-x.md
  42. +1 −2 Code_Samples.md
  43. +0 −2 Code_Signing.md
  44. +0 −5 Contributor_Agreement.md
  45. +25 −0 Cordoba.md
  46. +0 −4 DebugToken.md
  47. +4 −5 Developer_Conferences.md
  48. +1 −1 Dubai.md
  49. +10 −0 Eduardo_Pelegri_Llopart.md
  50. 0 Emulators.txt → Emulators.md
  51. +1 −1 Events.md
  52. +2 −3 Forums.md
  53. +0 −3 FreeImage.md
  54. +11 −0 Gaming.md
  55. +17 −0 Gaming_Samples.md
  56. +10 −0 George_Staikos.md
  57. +1 −0 Google_APIs.md
  58. +10 −0 Gord_Tanner.md
  59. +25 −0 Guadelajara.md
  60. +2 −5 HTML5_Samples.md
  61. +0 −2 Immigration_Projects.md
  62. +0 −2 Inside_BlackBerry.txt → Inside_BlackBerry.md
  63. +10 −0 Jeremy_Nicholls.md
  64. +10 −0 Jim_Ing.md
  65. +10 −0 Jonathan_Feldstein.md
  66. +10 −0 Ken_Wallis.md
  67. +2 −3 Knowledge_Base.md
  68. +1 −1 Laurence_Muller.md
  69. +10 −0 Laurent_Hasson.md
  70. +25 −0 Medellin.md
  71. +1 −1 Mexico_City.md
  72. +2 −5 NME.md
  73. +0 −1 Native.md
  74. +0 −1 Native_SDK.md
  75. +3 −2 New_York.md
  76. +1 −1 NodeBeat.md
  77. +1 −1 OpenFrameworks.md
  78. +2 −2 OpenGL.md
  79. +20 −0 OpenVG.md
  80. +1 −1 Open_Source.md
  81. +2 −2 PeaksAndValleys.md
  82. +11 −0 PictureWall.md
  83. +25 −0 Porto_Alegre.md
  84. +2 −2 Python.md
  85. +8 −0 QNX.md
  86. +1 −2 QR_Code.md
  87. +25 −0 Recife.md
  88. +25 −0 Rio_de_Janeiro.md
  89. +0 −3 Ripple.md
  90. +25 −0 San_Luis.md
  91. +25 −0 Santiago.md
  92. +10 −0 Sean_Taylor.md
  93. +10 −0 Seth_Sandler.md
  94. +1 −1 Staying_Connected.md
  95. +1 −1 Sydney.md
  96. +1 −1 Tim_Neil.md
  97. +1 −1 TinyHippos.md
  98. +2 −6 TunnelTilt.md
  99. +1 −4 URL_Launcher.md
  100. +1 −3 Upstreaming.md
  101. +71 −34 Wanted_Pages.md
  102. +1 −1 WebGL.md
  103. +1 −2 WebGL_Samples.md
  104. +0 −4 Web_Inspector.md
  105. +0 −2 Wikitude.md
  106. +149 −80 _includes/common-defs.md
  107. +2 −2 bbUIjs.md
  108. +9 −0 jQuery-Mobile-Samples.md
  109. +1 −1 jQuery.md
  110. +0 −4 libscreen.md
View
@@ -0,0 +1,17 @@
+---
+layout: wanted
+
+title: AIR Samples
+oneline: Repo with samples showcasing Adobe AIR
+tags: Adobe, AIR
+---
+{% include common-defs.md %}
+
+### RIM Repositories
+[Adobe AIR Samples][repo:air-samples]
+
+### Other Repositories
+TBD
+
+### See Also
+[Adobe AIR]
View
@@ -1,4 +1,4 @@
----
+---
title: Adobe AIR
oneline: Framework to Build BlackBerry 10 Native Apps
forum: "http://supportforums.blackberry.com/t5/Cascades-Development/bd-p/Cascades"
@@ -68,3 +68,5 @@ From [DevBlog](http://devblog.blackberry.com):
* [Develop Adobe AIR Applications for BlackBerry 10 with Powerflasher's FDT 5](http://devblog.blackberry.com/2012/06/develope-adobe-air-applications-for-blackberry-10-with-powerflashers-fdt-5/)
### Also See
+
+TBD
View
@@ -22,7 +22,7 @@ The AliceJS repo includes a [Collection of Demos](http://blackberry.github.com/A
Also see [HTML5 Samples].
### Contacts
-Laurent Hasson and Jim Ing
+[Laurent Hasson] and [Jim Ing]
### Also See
-[Cascades_Samples], [Cascades], [HTML5_Samples]
+[Cascades Samples][Cascades_Samples], [Cascades], [HTML5 Samples]
View
@@ -15,7 +15,6 @@ title: All Pages
* [All Samples]
* [Apache Cordova]
* [bbUI.js]
-* [BlackBerry 10]
* [BlackBerry 10 Stories]
* [BlackBerry 10 Releases]
* [BlackBerry 10.0.06][blackberry_10_0_06]
@@ -27,7 +26,7 @@ title: All Pages
  • aka [Analytics][bb_analytics]
* [BlackBerry Jam][bb10jam]
* [BlackBerry Messenger][bbm]
-  • aka [BBM][bbm]
+  • aka [BBM]
* [BlackBerry Payment Service][bb_payment]
  • aka [Payment][bb_payment]
* [BlackBerry Platform Services][bps]
@@ -36,15 +35,18 @@ title: All Pages
  • aka [Push][bb_push]
* [BlackBerry Services]
* [BlackBerry Web Services][bws]
-  • aka [BWS][bws]
+  • aka [BWS]
+* [BlackBerry World][bbw]
* [Bugs]
+* [BWS Samples]
* [Camera]
* [Cascades]
* [Cascades Samples and Tips]
  • from [Cascades Samples]
+* [Cocos2d-x][cocos2d_x]
* [Code Samples]
* [Contributor Agreement]
-* [DebugToken]
+* [Debug Token][DebugToken]
* [Developer Conferences][devcon]
* [Events]
* [Frogatto]
@@ -59,15 +61,17 @@ title: All Pages
* [OpenCV]
* [OpenFrameworks]
* [OpenGL]
+* [OpenVG]
* [Open Source]
* [Open Source Wish List]
* [OpenTTD]
* [PeaksAndValleys]
* [PhoneGap]
+* [PictureWall]
* [Python]
* [QML]
* [QNX Sound Architecture][qsa]
-  • aka [QSA]
+  • aka [QSA]
* [QR Code]
* [Qt]
* [Samples]
@@ -88,15 +92,11 @@ title: All Pages
**Wanted and FAQ**
* [FAQ]
-* [Wanted_Pages](Wanted_Pages.html)
-
-**Staged**
-
+* [Wanted Pages]
**Places**
-* [Amsterdam]
-  • from [Netherlands]
+* [Amsterdam], [Netherlands]
* [Austin]
* [Bangalore]
* [Barcelona]
@@ -125,13 +125,13 @@ title: All Pages
**People**
-* [Clifford Hung](Clifford_Hung.html)
-* [Laurence Muller](Laurence_Muller.html)
-* [Tim Neil](Tim_Neil.html)
+* [Clifford Hung]
+* [Laurence Muller]
+* [Tim Neil]
**Other**
-* [All Pages](All_Pages.html)
+* [All Pages]
* [Community Wiki](Community_Wiki.html)
* [Contribute](other/Contribute.html)
* [Legal](other/Legal.html)
View
@@ -185,6 +185,13 @@
"repourl": "http://github.com/blackberry/Cascades-Samples",
"tags": [ "native", "cascades", "bb10", "dialog" ]
},
+ "DojoAppDetails": {
+ "desc": "Simple app to show usage of Dojo toolkit and blackberry.app API",
+ "url": "http://github.com/blackberry/WebWorks-Samples/tree/master/DojoAppDetails",
+ "repo": "WebWorks-Samples",
+ "repourl": "http://github.com/blackberry/WebWorks-Samples",
+ "tags": [ "html5", "client", "webworks", "dojo"]
+ },
"EmailListener(ext,bbos)": {
"desc": "WebWorks Java-based Smartphone extension to receive a Event Objet when email is received",
"url": "http://github.com/blackberry/WebWorks-Community-APIs/tree/master/Smartphone/EmailListener",
View
@@ -14,4 +14,3 @@ https://developer.blackberry.com/android/
* Publish to AppWorld
See also [Code_Signing]
-
View
@@ -0,0 +1,10 @@
+---
+layout: wanted
+
+title: Andy Abgottspon
+oneline: RIM developer
+tags: rim
+---
+{% include common-defs.md %}
+
+TBD
View
@@ -0,0 +1,10 @@
+---
+layout: wanted
+
+title: Artem Simonov
+oneline: RIM developer
+tags: rim
+---
+{% include common-defs.md %}
+
+TBD
View
@@ -0,0 +1,17 @@
+---
+layout: wanted
+
+title: BlackBerry Web Services Samples
+oneline: Repo with samples showcasing BlackBerry Web Services
+tags: BWS, HTML5
+---
+{% include common-defs.md %}
+
+### RIM Repositories
+[BlackBerry Web Services Samples][repo:bws]
+
+### Other Repositories
+TBD
+
+### See Also
+[BWS]
View
@@ -8,7 +8,7 @@ title: Bangalore
## Overview
BlackBerry Developer Community in the area around Bangalore, India.
-([Wikipedia](http://en.wikipedia.org/wiki/Bangalore), [City Website](http://www.bbmp.gov.in/)
+([Wikipedia](http://en.wikipedia.org/wiki/Bangalore), [City Website](http://www.bbmp.gov.in/))
## Future Events
View
@@ -7,6 +7,6 @@ layout: wanted
Clarification relative to PlayBook
-Hisotry
+History
-https://developer.blackberry.com/
+[https://developer.blackberry.com/](https://developer.blackberry.com/)
View
@@ -29,10 +29,7 @@ The accompanying open source repositories for all these have been released too.
* Many new Samples, see [BlackBerry 10.0.06 Samples](BlackBerry_10_0_06_Samples.html).
### Changelog
-TBD...
+TBD
### Also See
[BlackBerry 10], [BlackBerry 10 Releases]
-
-
-
@@ -15,32 +15,25 @@ This release added 3 new repositories: [BB10-WebWorks-Samples][repo:bb10-webwork
[Community-APIs-for-AIR][repo:community-apis-for-air] and
[Qt2Cascades-Samples][repo:qt2cascades-samples].
-
### HTML5 Samples
[WebWorks-Community-APIs][repo:webworks-community-apis]
-
[BB10-WebWorks-Samples][repo:bb10-webworks-samples]
bar
[WebGL-Samples][repo:webgl-samples]
bar
-
### Other Repositories
* [Samples-for-Java][repo:samples-for-java]
-
-
#### Java
-
-
+TBD
Repo and technology goes here
-
### Also See
[BlackBerry 10][blackberry_10], [BlackBerry 10 Releases][blackberry_10_releases], [BlackBerry 10.0.06][blackberry_10_0_06]
View
@@ -13,22 +13,15 @@ RIM published a roadmap for the BlackBerry 10 Releases at
on July 19, 2012. The releases are as follows:
* R4, May 2012
-* R6, July 2012 - [BlackBerry_10_0_06]
+* R6, July 2012 - [BlackBerry 10.0.06][BlackBerry_10_0_06]
BlackBerry 10.0.06 is the second beta of the [BlackBerry 10] platform. It is
also described as R6 (see [SDK Roadmap](http://devblog.blackberry.com/2012/07/blackberry-10-beta-sdk-updates/).
-
-
#### Release Schedule
The release includes updates to the BlackBerry 10 OS as well as the SDKs, and many samples.
The accompanying open source repositories for all these have been released too.
-The
-
### Also See
-[WebGL_Samples], [WebGL], [TunnelTilt]
-
-
-
+[WebGL Samples][WebGL_Samples], [WebGL], [TunnelTilt]
View
@@ -24,11 +24,8 @@ Digital brochure showcasing clinic treatments with ability to capture potential
**[BB10: Initial Impressions](http://www.danielbigham.ca/cgi-bin/document.pl?mode=Display&DocumentID=901)**, by Daniel Bigham
I was able to spend a few hours learning and playing with BB10 for the first time today, and I am so impressed...
-
-
### Note
Stories about PlayBook 2.0 are OK but only include cases that seem will transfer to BlackBerry 10.
### Also See
-TBD...
-
+TBD
View
@@ -11,4 +11,3 @@ http://docs.blackberry.com/en/smartphone_users/deliverables/27018/About_Bridge_1
### Also See
TBD
-
@@ -0,0 +1,8 @@
+---
+title: BlackBerry Enterprise Server
+
+layout: wanted
+---
+{% include common-defs.md %}
+
+Server stuff
View
@@ -11,11 +11,28 @@ Official Developer Conferences for BlackBerry 10.
## BlackBerry Jam Latin American Sessions
-As of this writting, there are 19 cities, from
-* August 25, 2012, in Recife, Brasil, to
-* November 11, 2012, in Mexico City, Mexico
+For details, see [Registration Page](http://blackberryjamsessions.com/registre-se/)
-For more details, see [Registration Page](http://blackberryjamsessions.com/registre-se/)
+### Next Cities
+
+* [Recife], September 1, 2012
+* [San Luis], September 8, 2012
+* [Campinas], September 15, 2012
+* [Rio de Janeiro], September 22, 2012
+* [Santiago], October 6, 2012
+* [Porto Alegre], October 13, 2012
+* [Caracas], October 16, 2012
+* [Cordoba], October 18, 2012
+* [Buenos Aires], October 20, 2012
+* [San Paulo], October 27, 2012
+* [Medellin], November 8, 2012
+* [Bogota], November 10, 2012
+* [Guadelajara], November 15, 2012
+* [Mexico City], November 17, 2012
+
+### Cities Visited
+
+* [Rosario], May 29, 2012
## BlackBerry 10 Jam World Tour
@@ -25,11 +42,6 @@ Full details are at [BlackBerry 10 Jam World Tour](http://www.blackberryjamworld
### Next Cities
The next few cities are:
-* [Buenos Aires], August 16, 2012
-* [Mexico City], August 21, 2012
-* [Sao Paulo], August 23, 2012
-* [Waterloo], August 23, 2012
-* [Vancouver], August 28, 2012
* [Amsterdam], September 18, 2012
### Cities Visited
@@ -54,6 +66,11 @@ The next few cities are:
* [Montreal], July 11, 2012
* [Sydney], July 12, 2012
* [Cape Town], July 31, 2012
+* [Waterloo], August 23, 2012
+* [Vancouver], August 28, 2012
+* [Buenos Aires], August 16, 2012
+* [Mexico City], August 21, 2012
+* [Sao Paulo], August 23, 2012
Slides from these presentations will be available in the near future.
View
@@ -5,9 +5,8 @@ layout: wanted
---
{% include common-defs.md %}
-
https://developer.blackberry.com/java/
Link to statement about NOT supported in PlayBook and BlackBerry 10
-Links to java.com and JavaME.
+Links to java.com and JavaME.
View
@@ -1,4 +1,4 @@
----
+---
title: BlackBerry Messenger
oneline: Instant Messenger for BlackBerry Smartphone owners
forum:
@@ -17,4 +17,3 @@ BlackBerry® Messenger is an instant messaging app just for BlackBerry smartphon
### Also See
[BlackBerry Services]
-
Oops, something went wrong.

0 comments on commit 9665ed7

Please sign in to comment.