Pull SignalR fix #14

Closed
wants to merge 14 commits into
from

Conversation

Projects
None yet
2 participants
Owner

StevenHouben commented Feb 5, 2013

No description provided.

Soren Nielsen and others added some commits Aug 24, 2012

Soren Nielsen updated up- and download 1796815
Soren Nielsen merged ea4001a
Soren Nielsen Merge branch 'StevenHouben-master'
Conflicts:
	NooSphere/Libs/MonoDroid.System.Net.Http/Custom/AsyncHttpClientExtensions.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/Custom/HttpWebRequestExtensions.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/Custom/OperationCanceledException.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/Custom/RequestHelper.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/MonoDroid.System.Net.Http.csproj
	NooSphere/Libs/MonoDroid.System.Net.Http/Properties/AssemblyInfo.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/AsyncResult.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/CacheResponseProperty.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/CompletedAsyncResult.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/DelegatingStream.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/DetectEofStream.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/DrainOnCloseStream.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/AcceptRangeUnit.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/AuthenticationHelper.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/ByteRange.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/CacheControl.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Challenge.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Connection.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/ContentCoding.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/ContentRange.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Cookie.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Credential.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/DateOrDeltaSeconds.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/DateOrEntityTag.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/EntityTag.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Expect.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/HeaderFormatter.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/HeaderStore.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/HeaderString.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/HeaderValues.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Host.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/HttpHeaders.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Product.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/ProductOrComment.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Range.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/RequestHeaders.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/ResponseHeaders.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/StringWithOptionalQuality.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/TransferCoding.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Via.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/Headers/Warning.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpAsyncStage.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpClient.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpContent.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpFormFile.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpFormValue.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpMessageCore.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpMessageExtensions.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpMethod.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpMethodExtensions.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpMultipartMimeForm.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpProcessingException.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpProcessingStage.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpQueryString.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpRequestMessage.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpResponseMessage.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpStage.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpStageProcessingAsyncResult.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpStageProcessingAsyncState.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpStageProcessingException.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpTransportSettings.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpUrlEncodedForm.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpUtility.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/HttpWebRequestTransportStage.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/ICreateHttpContent.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/SendCompletedEventArgs.cs
	NooSphere/Libs/MonoDroid.System.Net.Http/REST Client Lib/StreamExtensions.cs
	NooSphere/NooSphere.ActivitySystem/Base/Client/ActivityClient.cs
	NooSphere/NooSphere.ActivitySystem/Base/Service/ActivityCloudConnector.cs
	NooSphere/NooSphere.ActivitySystem/FileServer/FileStore.cs
	NooSphere/NooSphere.ActivitySystem/NooSphere.ActivitySystem.MonoDroid.csproj
	NooSphere/NooSphere.Helpers/NooSphere.Helpers.MonoDroid.csproj
	NooSphere/NooSphere.Helpers/NooSphere.Helpers.csproj
	NooSphere/NooSphere.Helpers/Rest.cs
	NooSphere/NooSphere.Helpers/packages.config
	NooSphere/NooSphere.MonoDroid.sln
9990c5a
Soren Nielsen Merge branch 'master' of https://github.com/sorniels/NooSphere
Conflicts:
	NooSphere/NooSphere.ActivitySystem/Base/Client/ActivityClient.cs
	NooSphere/NooSphere.ActivitySystem/FileServer/FileStore.cs
	NooSphere/NooSphere.Context/IContextService.cs
	NooSphere/NooSphere.Context/IO/PointerNode.cs
	NooSphere/NooSphere.Context/Multicast/MulticastSocket.cs
	NooSphere/NooSphere.Core/ActivityModel/Resource.cs
de41983
Soren Nielsen MonoDroid cleaning 40d3bca
Soren Nielsen added gitattributes. 4593476
Soren Nielsen some droid additions c8ce2f8
Soren Nielsen Merge branch 'StevenHouben-master'
Conflicts:
	NooSphere/ActivityBar/Xaml/ActivityBar.xaml.cs
	NooSphere/ActivityBar/Xaml/Login/LoginWindow.xaml
	NooSphere/ActivityBar/Xaml/Login/LoginWindow.xaml.cs
	NooSphere/ActivityDesk/Helper/Pdf/PDFConverter.cs
	NooSphere/ActivityTablet/App.xaml
	NooSphere/ActivityTablet/Proxy.cs
	NooSphere/ActivityTablet/Xaml/Tablet.xaml
	NooSphere/ActivityTablet/Xaml/Tablet.xaml.cs
	NooSphere/NooSphere.ActivitySystem/Base/Client/IActivityNetEvent.cs
	NooSphere/NooSphere.ActivitySystem/Base/Client/IComNetEvent.cs
	NooSphere/NooSphere.ActivitySystem/Base/Client/IDeviceNetEvent.cs
	NooSphere/NooSphere.ActivitySystem/Base/Client/IFileNetEvent.cs
	NooSphere/NooSphere.ActivitySystem/Base/Client/INetEventHandler.cs
	NooSphere/NooSphere.ActivitySystem/Base/Client/IUserNetEvent.cs
	NooSphere/NooSphere.ActivitySystem/Base/Client/NetEventHandler.cs
	NooSphere/NooSphere.ActivitySystem/Base/Controller/Configuration.cs
	NooSphere/NooSphere.ActivitySystem/Base/Controller/IActivityProxy.cs
	NooSphere/NooSphere.ActivitySystem/Base/EventTypeConverter.cs
	NooSphere/NooSphere.ActivitySystem/Base/Service/ActivityCloudConnector.cs
	NooSphere/NooSphere.ActivitySystem/Base/Service/ActivityManager.cs
	NooSphere/NooSphere.ActivitySystem/Base/Service/ActivityStore.cs
	NooSphere/NooSphere.ActivitySystem/Base/Service/CloudEvents.cs
	NooSphere/NooSphere.ActivitySystem/Base/Service/ConnectedClient.cs
	NooSphere/NooSphere.ActivitySystem/Base/Service/IActivityManager.cs
	NooSphere/NooSphere.ActivitySystem/Base/Service/ParticipantStore.cs
	NooSphere/NooSphere.ActivitySystem/Base/Service/Syncer.cs
	NooSphere/NooSphere.ActivitySystem/Context/ContextMonitor.cs
	NooSphere/NooSphere.ActivitySystem/Context/IO/PointerNode.cs
	NooSphere/NooSphere.ActivitySystem/Discovery/BroadcastService.cs
	NooSphere/NooSphere.ActivitySystem/Helpers/Rest.cs
	NooSphere/NooSphere.ActivitySystem/PubSub/Registry.cs
	NooSphere/NooSphere.ActivitySystem/PubSub/RestPublisher.cs
	NooSphere/NooSphere.ActivitySystem/PubSub/RestSubscriber.cs
	NooSphere/NooSphere.Platform.Windows/Hooks/MouseHook.cs
b6482ee
Soren Nielsen working monodroid f24ca77
Soren Nielsen fixed bug in resthelper fdaa1f2
Soren Nielsen Added support for distributed text messages 16d7fd9
@madebysoren madebysoren Updated SignalR package. fab780e
@madebysoren madebysoren Update connection procedure. 19ecbb5
@madebysoren madebysoren Use cloud. e329632
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment