From 90127597690f98e95bb3bfb59a6cd0315f64e14b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 22 Jul 2016 01:59:21 -0400 Subject: 3.0.5990 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index a452789cf..c122e6db7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5986")] +[assembly: AssemblyVersion("3.0.5990")] -- cgit v1.2.3 From 821d6731113d63dd340b8b7f45e6c1698e005393 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 22 Jul 2016 16:47:35 -0400 Subject: fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index c122e6db7..660e04d02 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5990")] +[assembly: AssemblyVersion("3.1.73")] -- cgit v1.2.3 From f71e88f748fe3aba928d8a845286f3b89278075c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 22 Jul 2016 16:48:46 -0400 Subject: 3.0.5991 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 660e04d02..108a16bf4 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.73")] +[assembly: AssemblyVersion("3.0.5991")] -- cgit v1.2.3 From d661f690f58cd05be86843d2c7c8a2984c66c2f6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 23 Jul 2016 16:12:52 -0400 Subject: fix merge conflicts --- MediaBrowser.Api/Dlna/DlnaService.cs | 4 +--- SharedVersion.cs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'SharedVersion.cs') diff --git a/MediaBrowser.Api/Dlna/DlnaService.cs b/MediaBrowser.Api/Dlna/DlnaService.cs index 92ef8722e..dd4b59b92 100644 --- a/MediaBrowser.Api/Dlna/DlnaService.cs +++ b/MediaBrowser.Api/Dlna/DlnaService.cs @@ -34,8 +34,6 @@ namespace MediaBrowser.Api.Dlna [Route("/Dlna/Profiles/{Id}", "POST", Summary = "Updates a profile")] public class UpdateProfile : DeviceProfile, IReturnVoid { - [ApiMember(Name = "Id", Description = "Profile Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] - public string Id { get; set; } } [Route("/Dlna/Profiles", "POST", Summary = "Creates a profile")] @@ -89,4 +87,4 @@ namespace MediaBrowser.Api.Dlna _dlnaManager.CreateProfile(request); } } -} +} \ No newline at end of file diff --git a/SharedVersion.cs b/SharedVersion.cs index 108a16bf4..17087a098 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5991")] +[assembly: AssemblyVersion("3.1.75")] -- cgit v1.2.3 From 677709f420b5f62046ba1aecb47418735596c07e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 23 Jul 2016 16:13:49 -0400 Subject: 3.0.6000 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 17087a098..651eaf438 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.75")] +[assembly: AssemblyVersion("3.0.6000")] -- cgit v1.2.3 From b3db8fdb0d718a7e4378bb901fbfb7329b8124af Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 27 Jul 2016 15:31:19 -0400 Subject: fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 651eaf438..3b18c027e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6000")] +[assembly: AssemblyVersion("3.1.80")] -- cgit v1.2.3 From 7d520784700d057defaa0155dcc9c577b6c549a0 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 27 Jul 2016 15:33:53 -0400 Subject: 3.0.6010 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 3b18c027e..d81f6c71c 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.80")] +[assembly: AssemblyVersion("3.0.6010")] -- cgit v1.2.3 From 100236f416e1917d57913f117b7f0c4ee9069d0b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 29 Jul 2016 11:59:37 -0400 Subject: fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index d81f6c71c..7f78e641a 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6010")] +[assembly: AssemblyVersion("3.1.81")] -- cgit v1.2.3 From 4be3ee433bf3d3d2a500a5b41b11407fb58b2445 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 29 Jul 2016 12:01:11 -0400 Subject: 3.0.6020 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 7f78e641a..d5d322353 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.81")] +[assembly: AssemblyVersion("3.0.6020")] -- cgit v1.2.3 From 0c3b7a33c29956aafe54f7e956199c0671f92eff Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Aug 2016 00:47:50 -0400 Subject: fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index d5d322353..d852537b2 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6020")] +[assembly: AssemblyVersion("3.1.89")] -- cgit v1.2.3 From c7798fcd4807279e08ce773ad16732b09a411b4d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Aug 2016 00:55:45 -0400 Subject: 3.0.6030 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index d852537b2..7ffbc0f47 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.89")] +[assembly: AssemblyVersion("3.0.6030")] -- cgit v1.2.3 From 295d47a4878f6981125e12dd6e15d1472b73a476 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Aug 2016 01:03:05 -0400 Subject: fix version --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 7ffbc0f47..d852537b2 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6030")] +[assembly: AssemblyVersion("3.1.89")] -- cgit v1.2.3 From 8cca5dfb03d126b87b007e4699b061433991d3ae Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 5 Aug 2016 02:13:19 -0400 Subject: fix merge conflict --- SharedVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index d852537b2..8de20ebed 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.89")] +[assembly: AssemblyVersion("3.1.*")] +//[assembly: AssemblyVersion("3.1.80")] -- cgit v1.2.3 From bfe746d4e08e9b5d8422856000f0479853df64e4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 5 Aug 2016 02:14:13 -0400 Subject: 3.1.90 --- SharedVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 8de20ebed..07028185d 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.1.*")] -//[assembly: AssemblyVersion("3.1.80")] +//[assembly: AssemblyVersion("3.1.*")] +[assembly: AssemblyVersion("3.1.90")] -- cgit v1.2.3 From 7f0d4c72109e4e647f6388dc2286891e749db268 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 6 Aug 2016 00:50:24 -0400 Subject: 3.1.91 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 07028185d..e35552d6a 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.90")] +[assembly: AssemblyVersion("3.1.91")] -- cgit v1.2.3 From a571ee38ceafc0a1f30ded3f5bd2c6aba1d940da Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 6 Aug 2016 10:11:47 -0400 Subject: 3.1.92 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index e35552d6a..ac12faf1c 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.91")] +[assembly: AssemblyVersion("3.1.92")] -- cgit v1.2.3 From 1640bcb28904bccb0c31a00377a9399925cf327d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 6 Aug 2016 17:11:43 -0400 Subject: 3.1.93 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index ac12faf1c..ed6157b18 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.92")] +[assembly: AssemblyVersion("3.1.93")] -- cgit v1.2.3 From dd013bf622759e3ca13a1236d3f016dc5051ce47 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 02:40:05 -0400 Subject: 3.1.94 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index ed6157b18..9596e1d73 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.93")] +[assembly: AssemblyVersion("3.1.94")] -- cgit v1.2.3 From 2eeae1c5500e01b319da4075ac62d0d2def022ad Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 16:17:46 -0400 Subject: 3.1.95 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 9596e1d73..f10a80534 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.94")] +[assembly: AssemblyVersion("3.1.95")] -- cgit v1.2.3 From 55630d54cc897031ba743824e0c42b481dfe4833 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 17:17:40 -0400 Subject: restore version --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index f10a80534..7ffbc0f47 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.95")] +[assembly: AssemblyVersion("3.0.6030")] -- cgit v1.2.3 From 90858d44d078174760a9ba2548d82c03a024301d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 18:34:28 -0400 Subject: 3.0.6040 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 7ffbc0f47..255be1dff 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6030")] +[assembly: AssemblyVersion("3.0.6040")] -- cgit v1.2.3 From 1d14c98ec8fbbccfd53a9fda726c241feb0c35b3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 7 Aug 2016 20:01:50 -0400 Subject: 3.0.6050 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 255be1dff..9b3db6668 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6040")] +[assembly: AssemblyVersion("3.0.6050")] -- cgit v1.2.3 From 9935397d12020c5a52afe9f8f390b5581bef5d03 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Aug 2016 14:23:12 -0400 Subject: fix merge conflict --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 9b3db6668..6dfb8bc40 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6050")] +[assembly: AssemblyVersion("3.1.97")] -- cgit v1.2.3 From 2ce8b8207765a5fb60e089ece9af2e32fc9d3311 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Aug 2016 14:24:11 -0400 Subject: 3.0.6060 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 6dfb8bc40..a81b44de7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.97")] +[assembly: AssemblyVersion("3.0.6060")] -- cgit v1.2.3 From c1e8d85bca08a6bd08d3234d249b3d72f80c772d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 16 Aug 2016 00:12:12 -0400 Subject: update local sync --- MediaBrowser.Api/Sync/SyncService.cs | 2 +- SharedVersion.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'SharedVersion.cs') diff --git a/MediaBrowser.Api/Sync/SyncService.cs b/MediaBrowser.Api/Sync/SyncService.cs index a15ce216f..4f6aced57 100644 --- a/MediaBrowser.Api/Sync/SyncService.cs +++ b/MediaBrowser.Api/Sync/SyncService.cs @@ -66,7 +66,7 @@ namespace MediaBrowser.Api.Sync public string Id { get; set; } } - [Route("/Sync/{TargetId}/Items", "DELETE", Summary = "Cancels items from a sync target")] + [Route("/Sync/Items/Cancel", "POST", Summary = "Cancels items from a sync target")] public class CancelItems : IReturnVoid { [ApiMember(Name = "TargetId", Description = "TargetId", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "Items")] diff --git a/SharedVersion.cs b/SharedVersion.cs index a81b44de7..ded2038b0 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6060")] +[assembly: AssemblyVersion("3.1.*")] +//[assembly: AssemblyVersion("3.0.6060")] -- cgit v1.2.3