github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 13:23:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #242 from tidusjar/dev

Browse source 
1.7.2
This commit is contained in:
Jamie 2016-05-25 09:55:31 +01:00
commit e419727757
13 changed files with 69 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PlexRequests.Services/Notification/EmailMessageNotification.cs
View file

@ -84,9 +84,6 @@ namespace PlexRequests.Services.Notification
case NotificationType.Test:
await EmailTest(model, emailSettings);
break;
default:
throw new ArgumentOutOfRangeException();
}
}

15
PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.css
View file

@ -14,6 +14,14 @@
.home {
padding-top: 4rem; } }
.navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus {
color: #fff; }
hr {
border-color: #777; }
.btn {
border-radius: 0.25rem !important; }
@ -219,7 +227,7 @@ label {
position: absolute;
right: 45px;
z-index: 3;
top: 13px;
top: 10px;
box-shadow: 0 0 0; }
.input-group-addon .btn-group .btn {
@ -238,9 +246,10 @@ label {
padding: 12px 8px; }
#updateAvailable {
background-color: #ffa400;
background-color: #df691a;
text-align: center;
font-size: 15px; }
font-size: 15px;
padding: 3px 0; }
.checkbox label {
display: inline-block;

2
PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.min.css vendored
View file

File diff suppressed because one or more lines are too long

15
PlexRequests.UI/Content/Themes/OriginalBootstrapCustom.scss
View file

@ -33,6 +33,16 @@ $i:
}
}
.navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus {
color: #fff;
}
hr {
border-color: #777;
}
.btn {
border-radius: .25rem $i;
}
@ -279,7 +289,7 @@ $border-radius: 10px;
position: absolute;
right: 45px;
z-index: 3;
top: 13px;
top: 10px;
box-shadow: 0 0 0;
}
@ -303,9 +313,10 @@ $border-radius: 10px;
}
#updateAvailable {
background-color: rgb(255, 164, 0);
background-color: #df691a;
text-align: center;
font-size: 15px;
padding: 3px 0;
}
.checkbox label {

18
PlexRequests.UI/Content/Themes/PlexBootstrapCustom.css
View file

@ -14,6 +14,17 @@
.home {
padding-top: 4rem; } }
.navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus {
color: #fff; }
hr {
border-color: #777; }
body.update-available {
margin-top: 80px; }
.btn {
border-radius: 0.25rem !important; }
@ -219,7 +230,7 @@ label {
position: absolute;
right: 45px;
z-index: 3;
top: 13px;
top: 10px;
box-shadow: 0 0 0; }
.input-group-addon .btn-group .btn {
@ -238,9 +249,10 @@ label {
padding: 12px 8px; }
#updateAvailable {
background-color: #ffa400;
background-color: #df691a;
text-align: center;
font-size: 15px; }
font-size: 15px;
padding: 3px 0; }
.checkbox label {
display: inline-block;

2
PlexRequests.UI/Content/Themes/PlexBootstrapCustom.min.css vendored
View file

File diff suppressed because one or more lines are too long

19
PlexRequests.UI/Content/Themes/PlexBootstrapCustom.scss
View file

@ -34,6 +34,20 @@ $i:
}
}
.navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus {
color: #fff;
}
hr {
border-color: #777;
}
body.update-available {
margin-top: 80px;
}
.btn {
border-radius: .25rem $i;
}
@ -280,7 +294,7 @@ $border-radius: 10px;
position: absolute;
right: 45px;
z-index: 3;
top: 13px;
top: 10px;
box-shadow: 0 0 0;
}
@ -304,9 +318,10 @@ $border-radius: 10px;
}
#updateAvailable {
background-color: rgb(255, 164, 0);
background-color: #df691a;
text-align: center;
font-size: 15px;
padding: 3px 0;
}
.checkbox label {

2
PlexRequests.UI/Modules/ApprovalModule.cs
View file

@ -50,7 +50,7 @@ namespace PlexRequests.UI.Modules
ISettingsService<SonarrSettings> sonarrSettings, ISickRageApi srApi, ISettingsService<SickRageSettings> srSettings,
ISettingsService<HeadphonesSettings> hpSettings, IHeadphonesApi hpApi, ISettingsService<PlexRequestSettings> pr) : base("approval", pr)
{
this.RequiresClaims(UserClaims.Admin, UserClaims.PowerUser);
this.RequiresClaims(UserClaims.Admin);
Service = service;
CpService = cpService;

2
PlexRequests.UI/PlexRequests.UI.csproj
View file

@ -499,7 +499,7 @@
<Content Include="Views\Admin\Headphones.cshtml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Views\Admin\SlackNotifications.cshtml">
<Content Include="Views\AdminNotifications\SlackNotifications.cshtml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Web.Debug.config">

6
PlexRequests.UI/Views/Admin/Authentication.cshtml
View file

@ -122,11 +122,10 @@
$('#requestToken').click(function (e) {
e.preventDefault();
var url = createBaseUrl(base, "admin/requestauth");
var $form = $("#mainForm");
$.ajax({
type: $form.prop("method"),
url: url,
url: "requestauth",
data: $form.serialize(),
dataType: "json",
success: function (response) {
@ -149,8 +148,7 @@
function loadUserList() {
$('#users').html("");
var url = "admin/getusers";
url = createBaseUrl(base, url);
var url = "getusers";
$.ajax({
type: "Get",
url: url,

0
PlexRequests.UI/Views/Admin/SlackNotifications.cshtml → PlexRequests.UI/Views/AdminNotifications/SlackNotifications.cshtml
View file

1
PlexRequests.UI/Views/Shared/_Layout.cshtml
View file

@ -97,6 +97,7 @@
var status = createBaseUrl(urlBase, '/admin/status');
$('#updateAvailable').html("<i class='fa fa-cloud-download' aria-hidden='true'></i> There is a new update available! Click <a style='color: white' href='" + status + "'>Here!</a>");
$('#updateAvailable').removeAttr("hidden");
$('body').addClass('update-available')
}
},
error: function (e) {

4
appveyor.yml
View file

@ -3,9 +3,9 @@ configuration: Release
assembly_info:
patch: true
file: '**\AssemblyInfo.*'
assembly_version: '1.7.1'
assembly_version: '1.7.2'
assembly_file_version: '{version}'
assembly_informational_version: '1.7.1'
assembly_informational_version: '1.7.2'
before_build:
- cmd: appveyor-retry nuget restore
build: