Merge pull request #245 from tidusjar/dev

1.7.3
Ombi-app · May 25, 2016 · 826b1d5 · 826b1d5
2 parents e419727 + e40fb88
commit 826b1d5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/PlexRequests.UI/Modules/AdminNotificationsModule.cs b/PlexRequests.UI/Modules/AdminNotificationsModule.cs
@@ -100,7 +100,7 @@ private Response TestSlackNotification()
         private Negotiator SlackNotifications()
         {
             var settings = SlackSettings.GetSettings();
-            return View["SlackNotifications", settings];
+            return View["Admin/SlackNotifications", settings];
         }
 
         private Response SaveSlackNotifications()

diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -451,9 +451,6 @@
     <Content Include="Views\Admin\Settings.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Views\Admin\_Sidebar.cshtml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Views\Login\Register.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -499,7 +496,10 @@
     <Content Include="Views\Admin\Headphones.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Views\AdminNotifications\SlackNotifications.cshtml">
+    <Content Include="Views\Admin\_Sidebar.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Views\Admin\SlackNotifications.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="Web.Debug.config">

diff --git a/...inNotifications/SlackNotifications.cshtml → ....UI/Views/Admin/SlackNotifications.cshtml b/...inNotifications/SlackNotifications.cshtml → ....UI/Views/Admin/SlackNotifications.cshtml
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,9 +3,9 @@ configuration: Release
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
-  assembly_version: '1.7.2'
+  assembly_version: '1.7.3'
   assembly_file_version: '{version}'
-  assembly_informational_version: '1.7.2' 
+  assembly_informational_version: '1.7.3' 
 before_build:
 - cmd: appveyor-retry nuget restore
 build: