Permalink
Browse files

Merge branch 'CL-8955' of https://github.com/pubnub/pubnub-api into C…

…L-8955
  • Loading branch information...
budgetpreneur committed Mar 20, 2013
2 parents dee9f16 + ee8c43b commit fc92d8b865d7aae2f0d5625b0638c5912ffbc345
Showing with 2,568 additions and 1,443 deletions.
  1. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/Andr.Unit.csproj
  2. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/Common.cs
  3. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/EncryptionTests.cs
  4. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/Properties/AndroidManifest.xml
  5. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/PubnubUnitTest.cs
  6. +51 −20 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/Resources/Resource.designer.cs
  7. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/WhenAClientIsPresented.cs
  8. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/WhenAMessageIsPublished.cs
  9. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/WhenDetailedHistoryIsRequested.cs
  10. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/WhenGetRequestServerTime.cs
  11. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/WhenSubscribedToAChannel.cs
  12. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Andr.Unit/WhenUnsubscribedToAChannel.cs
  13. 0 mono-for-android/3.4/Pubnub-Messaging/Andr.Unit-master/Android.NUnitLite/Android.NUnitLite.csproj
  14. 0 mono-for-android/3.4/Pubnub-Messaging/MonoDroid.Dialog/MonoDroid.Dialog.csproj
  15. 0 mono-for-android/3.4/Pubnub-Messaging/Newtonsoft.Json/Newtonsoft.Json.MonoDroid.csproj
  16. 0 mono-for-android/3.4/Pubnub-Messaging/Newtonsoft.Json/Newtonsoft.Json.MonoTouch.csproj
  17. BIN mono-for-android/3.4/Pubnub-Messaging/Newtonsoft.Json/Newtonsoft.Json.MonoTouch.pidb
  18. 0 mono-for-android/3.4/Pubnub-Messaging/Newtonsoft.Json/Utilities/LinqBridge.cs
  19. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Assets/AboutAssets.txt
  20. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/LaunchScreen.cs
  21. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/MainActivity.cs
  22. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Properties/AndroidManifest.xml
  23. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Properties/AssemblyInfo.cs
  24. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/PubNubMessaging.csproj
  25. +259 −73 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Pubnub.cs
  26. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Resources/AboutResources.txt
  27. +82 −51 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Resources/Resource.designer.cs
  28. BIN mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Resources/drawable/Icon.png
  29. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Resources/layout-large/Launch.axml
  30. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Resources/layout-large/Main.axml
  31. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Resources/layout/Launch.axml
  32. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Resources/layout/Main.axml
  33. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Resources/layout/Proxy.axml
  34. 0 mono-for-android/3.4/Pubnub-Messaging/PubNub_Messaging/Resources/values/Strings.xml
  35. 0 mono-for-android/3.4/Pubnub-Messaging/Pubnub-Messaging.sln
  36. +8 −10 mono-for-android/3.4/Pubnub-Messaging/Pubnub-Messaging.userprefs
  37. +1 −1 mono-for-linux/3.4/Pubnub-Messaging/PubNub-Console/AssemblyInfo.cs
  38. 0 mono-for-linux/3.4/Pubnub-Messaging/PubNub-Console/PubNub-Messaging.cs
  39. +7 −6 mono-for-linux/3.4/Pubnub-Messaging/PubNub-Console/PubNub-Messaging.csproj
  40. BIN mono-for-linux/3.4/Pubnub-Messaging/PubNub-Console/PubNub-Messaging.pidb
  41. +259 −73 mono-for-linux/3.4/Pubnub-Messaging/PubNub-Console/Pubnub.cs
  42. +426 −273 mono-for-linux/3.4/Pubnub-Messaging/PubNub-Console/PubnubExample.cs
  43. 0 mono-for-linux/3.4/Pubnub-Messaging/PubNub-Console/app.config
  44. 0 mono-for-linux/3.4/Pubnub-Messaging/PubNub-Messaging.sln
  45. +38 −30 mono-for-linux/3.4/Pubnub-Messaging/PubNub-Messaging.userprefs
  46. +1 −1 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/AssemblyInfo.cs
  47. +1 −1 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/Common.cs
  48. +453 −454 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/EncryptionTests.cs
  49. +12 −12 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/PubNub-Messaging.Tests.csproj
  50. BIN mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/PubNub-Messaging.Tests.pidb
  51. +1 −1 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/PubnubUnitTest.cs
  52. +1 −1 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/WhenAClientIsPresented.cs
  53. +5 −1 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/WhenAMessageIsPublished.cs
  54. 0 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/WhenDetailedHistoryIsRequested.cs
  55. 0 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/WhenGetRequestHistoryMessages.cs
  56. +0 −1 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/WhenGetRequestServerTime.cs
  57. 0 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/WhenSubscribedToAChannel.cs
  58. 0 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/WhenUnsubscribedToAChannel.cs
  59. +2 −3 mono-for-linux/3.4/Pubnub-Messaging/PubNubTest/app.config
  60. 0 mono-for-mac/3.4/PubNub-Messaging/PubNub-Console/AssemblyInfo.cs
  61. 0 mono-for-mac/3.4/PubNub-Messaging/PubNub-Console/PubNub-Messaging.cs
  62. 0 mono-for-mac/3.4/PubNub-Messaging/PubNub-Console/PubNub-Messaging.csproj
  63. +259 −73 mono-for-mac/3.4/PubNub-Messaging/PubNub-Console/Pubnub.cs
  64. +426 −273 mono-for-mac/3.4/PubNub-Messaging/PubNub-Console/PubnubExample.cs
  65. 0 mono-for-mac/3.4/PubNub-Messaging/PubNub-Console/app.config
  66. 0 mono-for-mac/3.4/PubNub-Messaging/PubNub-Messaging.sln
  67. +11 −8 mono-for-mac/3.4/PubNub-Messaging/PubNub-Messaging.userprefs
  68. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/AssemblyInfo.cs
  69. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/Common.cs
  70. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/EncryptionTests.cs
  71. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/PubNub-Messaging.Tests.csproj
  72. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/PubnubUnitTest.cs
  73. +1 −1 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/WhenAClientIsPresented.cs
  74. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/WhenAMessageIsPublished.cs
  75. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/WhenDetailedHistoryIsRequested.cs
  76. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/WhenGetRequestHistoryMessages.cs
  77. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/WhenGetRequestServerTime.cs
  78. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/WhenSubscribedToAChannel.cs
  79. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/WhenUnsubscribedToAChannel.cs
  80. 0 mono-for-mac/3.4/PubNub-Messaging/PubNubTest/app.config
  81. 0 monotouch/3.4/Pubnub-Messaging/Newtonsoft.Json/Newtonsoft.Json.MonoDroid.csproj
  82. 0 monotouch/3.4/Pubnub-Messaging/Newtonsoft.Json/Newtonsoft.Json.MonoTouch.csproj
  83. BIN monotouch/3.4/Pubnub-Messaging/Newtonsoft.Json/Newtonsoft.Json.MonoTouch.pidb
  84. 0 monotouch/3.4/Pubnub-Messaging/Newtonsoft.Json/Utilities/LinqBridge.cs
  85. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/AppDelegate.cs
  86. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/Common.cs
  87. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/EncryptionTests.cs
  88. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/Info.plist
  89. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/Main.cs
  90. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/Pubnub-Messaging.Tests.csproj
  91. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/PubnubUnitTest.cs
  92. +1 −1 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/WhenAClientIsPresented.cs
  93. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/WhenAMessageIsPublished.cs
  94. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/WhenDetailedHistoryIsRequested.cs
  95. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/WhenGetRequestHistoryMessages.cs
  96. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/WhenGetRequestServerTime.cs
  97. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/WhenSubscribedToAChannel.cs
  98. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.Tests/WhenUnsubscribedToAChannel.cs
  99. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.sln
  100. +4 −2 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging.userprefs
  101. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/AppDelegate.cs
  102. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/DeviceHardware.cs
  103. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/GraphHeader.cs
  104. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/GraphHeaderView.cs
  105. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/Info.plist
  106. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/InputAlertView.cs
  107. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/Main.cs
  108. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/PerformanceHeader.cs
  109. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/PerformanceHeaderView.cs
  110. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/Pubnub-Messaging.csproj
  111. +259 −73 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/Pubnub.cs
  112. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/Pubnub_MessagingMain.cs
  113. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/Pubnub_MessagingSpeedTest.cs
  114. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/Pubnub_MessagingSub.cs
  115. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/SdHeader.cs
  116. 0 monotouch/3.4/Pubnub-Messaging/Pubnub-Messaging/SdHeaderView.cs

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit fc92d8b

Please sign in to comment.