From d33a6203a7fff3e25d87804dcd91190f3e235dbb Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 16 Jan 2017 08:05:37 +0000 Subject: [PATCH 01/11] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b6ffbb171..c23f1a22a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,9 +3,9 @@ configuration: Release assembly_info: patch: true file: '**\AssemblyInfo.*' - assembly_version: '2.0.0' + assembly_version: '2.0.1' assembly_file_version: '{version}' - assembly_informational_version: '2.0.0' + assembly_informational_version: '2.0.1' before_build: - cmd: appveyor-retry nuget restore build: From 86df5f11b766e818e637cc8184546dd6fd96259d Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 17 Jan 2017 16:18:41 +0000 Subject: [PATCH 02/11] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 776438511..a1014914c 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ ____ [![Github All Releases](https://img.shields.io/github/downloads/tidusjar/Ombi/total.svg)](https://github.com/tidusjar/Ombi) [![Stories in Progress](https://badge.waffle.io/tidusjar/Ombi.svg?label=in progress&title=In Progress)](http://waffle.io/tidusjar/Ombi) +| Service | Master | Early Access | Dev | +|----------|:---------------------------:|:----------------------------:|:----------------------------:| +| AppVeyor | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/master?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/eap?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/eap) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/dev?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/dev) +| Travis | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/tidusjar/Ombi/Radarr/eap.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/tidusjar/Ombi/Radarr/dev.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) + # Features Here some of the features Ombi has: * All your users to Request Movies, TV Shows (Whole series, whole seaons or even single episodes!) and Albums From be206a9503c9e680a77d2b44f9be3fd244188dcd Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 18 Jan 2017 08:49:28 +0000 Subject: [PATCH 03/11] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a1014914c..9271392d8 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ ____ | Service | Master | Early Access | Dev | |----------|:---------------------------:|:----------------------------:|:----------------------------:| | AppVeyor | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/master?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/eap?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/eap) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/dev?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/dev) -| Travis | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/tidusjar/Ombi/Radarr/eap.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/tidusjar/Ombi/Radarr/dev.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) +| Travis | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/eap.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/dev.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) # Features Here some of the features Ombi has: @@ -87,3 +87,6 @@ If you feel like donating you can [here!](https://paypal.me/PlexRequestsNet) ## Stats [![Throughput Graph](https://graphs.waffle.io/tidusjar/PlexRequests.Net/throughput.svg)](https://waffle.io/tidusjar/PlexRequests.Net/metrics/throughput) +### Sponsors ### +- [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools + - [ReSharper](http://www.jetbrains.com/resharper/) From a8e68256d1cff941f5d8f1f5f5e55443f3fac3f5 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 18 Jan 2017 08:50:13 +0000 Subject: [PATCH 04/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9271392d8..49f72eab2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ ____ | Service | Master | Early Access | Dev | |----------|:---------------------------:|:----------------------------:|:----------------------------:| | AppVeyor | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/master?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/eap?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/eap) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/dev?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/dev) -| Travis | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/eap.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/dev.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) +| Travis | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/EAP.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/dev.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) # Features Here some of the features Ombi has: From e1f923a9cd5f30ded803937be15b31c91ec6c1cd Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 18 Jan 2017 08:59:29 +0000 Subject: [PATCH 05/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 49f72eab2..b86ad7f27 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ ____ | Service | Master | Early Access | Dev | |----------|:---------------------------:|:----------------------------:|:----------------------------:| | AppVeyor | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/master?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/eap?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/eap) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/dev?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/dev) -| Travis | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/EAP.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/dev.svg?maxAge=60&style=flat-square)](https://travis-ci.org/tidusjar/Ombi) +| Travis | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/master.svg)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/EAP.svg)](https://travis-ci.org/tidusjar/Ombi) | [![Travis](https://img.shields.io/travis/tidusjar/Ombi/dev.svg)](https://travis-ci.org/tidusjar/Ombi) # Features Here some of the features Ombi has: From cb871dc88196c4776367c833443c4d62bc3481b2 Mon Sep 17 00:00:00 2001 From: tdorsey Date: Fri, 20 Jan 2017 21:44:44 -0500 Subject: [PATCH 06/11] Fix typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 776438511..be5fcbf65 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Here some of the features Ombi has: * Sending newsletters [NEW] * Fault Queue for requests (Buffer requests if Sonar/Couchpotato/SickRage is offline) [NEW] -* Allow your users to report issues and manage them seperatly +* Allow your users to report issues and manage them separately * A landing page that will give you the availability of your Plex server and also add custom notification text to inform your users of downtime. * Allow your users to get notifications! * Secure authentication so you don't have to worry about those script kiddies From e34b1ee62af57844c080616f7f68911fa312d40c Mon Sep 17 00:00:00 2001 From: Jamie Date: Fri, 27 Jan 2017 23:28:14 +0000 Subject: [PATCH 07/11] Update .gitattributes --- .gitattributes | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index 4bf8b8c28..49cbe02c5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -62,7 +62,5 @@ #*.rtf diff=astextplain #*.RTF diff=astextplain - -PlexRequests.UI/Content/* linguist-vendored -PlexRequests.UI/Content/* linguist-vendored +Ombi.UI/Content/* linguist-vendored base.scss linguist-vendored=false From 7e26671dcaaa9b628564d6e27e0d14c09bb721f9 Mon Sep 17 00:00:00 2001 From: Haries Ramdhani Date: Sun, 29 Jan 2017 00:29:41 +0200 Subject: [PATCH 08/11] fixed typos --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9b91a5b82..cf11758f0 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Here some of the features Ombi has: * All your users to Request Movies, TV Shows (Whole series, whole seaons or even single episodes!) and Albums * Easily manage your requests -* User mangement system (supports plex.tv accounts and local accounts) [NEW] +* User management system (supports plex.tv accounts and local accounts) [NEW] * Sending newsletters [NEW] * Fault Queue for requests (Buffer requests if Sonar/Couchpotato/SickRage is offline) [NEW] @@ -29,7 +29,7 @@ Here some of the features Ombi has: * Secure authentication so you don't have to worry about those script kiddies * We check to see if the request is already in Plex, if it's already in Plex then why you requesting it?! * We have allowed the ability for a user to add a custom note on a request -* It automatically update the status of requests when they are available on Plex +* It automatically updates the status of requests when they are available on Plex * Slick, responsive and mobile friendly UI @@ -67,7 +67,7 @@ Search the existing requests to see if your suggestion has already been submitte [Ubuntu Guide!](http://www.htpcguides.com/install-plex-requests-net-ubuntu-14-x/) # FAQ -Do you have an issue or a question? if so check out our [FAQ!](https://github.com/tidusjar/Ombi/wiki/FAQ) +Do you have an issue or a question? if so check out our [FAQ](https://github.com/tidusjar/Ombi/wiki/FAQ)! # Docker @@ -77,12 +77,12 @@ Looking for a Docker Image? Well [rogueosb](https://github.com/rogueosb/) has cr We are looking for any contributions to the project! Just pick up a task, if you have any questions ask and i'll get straight on it! -Please feed free to submit a pull request! +Please feel free to submit a pull request! # Donation -If you feel like donating you can [here!](https://paypal.me/PlexRequestsNet) +If you feel like donating you can donate [here](https://paypal.me/PlexRequestsNet)! -### A massive thanks to everyone for all their help! +### A massive thanks to everyone for all their helps! ## Stats [![Throughput Graph](https://graphs.waffle.io/tidusjar/PlexRequests.Net/throughput.svg)](https://waffle.io/tidusjar/PlexRequests.Net/metrics/throughput) From ad1986e08c7e4e04951ac859a31e92aa97f94006 Mon Sep 17 00:00:00 2001 From: Jamie Date: Sun, 29 Jan 2017 22:58:50 +0000 Subject: [PATCH 09/11] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index cf11758f0..01f0d7ed5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# Ombi - +![](http://i.imgur.com/qQsN78U.png) ____ [![Gitter](https://badges.gitter.im/tidusjar/Ombi.svg)](https://gitter.im/tidusjar/Ombi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex) From e5835bf72065ea3c352ee827b0b9ca8d06a2493f Mon Sep 17 00:00:00 2001 From: "Jamie.Rees" Date: Mon, 30 Jan 2017 12:53:38 +0000 Subject: [PATCH 10/11] Fixed #985 --- .../Notification/NotificationEngine.cs | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/Ombi.Services/Notification/NotificationEngine.cs b/Ombi.Services/Notification/NotificationEngine.cs index 49340ca1a..2f51d7109 100644 --- a/Ombi.Services/Notification/NotificationEngine.cs +++ b/Ombi.Services/Notification/NotificationEngine.cs @@ -98,10 +98,31 @@ namespace Ombi.Services.Notification return; } - var localUser = - users.FirstOrDefault( x => - x.Username.Equals(user, StringComparison.CurrentCultureIgnoreCase) || - x.UserAlias.Equals(user, StringComparison.CurrentCultureIgnoreCase)); + UserHelperModel localUser = null; + //users.FirstOrDefault( x => + // x.Username.Equals(user, StringComparison.CurrentCultureIgnoreCase) || + // x.UserAlias.Equals(user, StringComparison.CurrentCultureIgnoreCase)); + + foreach (var userHelperModel in users) + { + if (!string.IsNullOrEmpty(userHelperModel.Username)) + { + if (userHelperModel.Username.Equals(user, StringComparison.CurrentCultureIgnoreCase)) + { + localUser = userHelperModel; + break; + } + } + if (!string.IsNullOrEmpty(userHelperModel.UserAlias)) + { + if (userHelperModel.UserAlias.Equals(user, StringComparison.CurrentCultureIgnoreCase)) + { + localUser = userHelperModel; + break; + } + } + } + // So if the request was from an alias, then we need to use the local user (since that contains the alias). // If we do not have a local user, then we should be using the Plex user if that user exists. From abaaafcf7ac90dd7b8443fd502c0d003967cbf22 Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 30 Jan 2017 19:15:07 +0000 Subject: [PATCH 11/11] Update appveyor.yml --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c23f1a22a..8444784af 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,11 @@ -version: 2.0.{build} +version: 2.1.{build} configuration: Release assembly_info: patch: true file: '**\AssemblyInfo.*' - assembly_version: '2.0.1' + assembly_version: '2.1.0' assembly_file_version: '{version}' - assembly_informational_version: '2.0.1' + assembly_informational_version: '2.1.0' before_build: - cmd: appveyor-retry nuget restore build: