Merge branch 'develop' into develop-test2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -27,7 +27,7 @@ If applicable, a snippet of the logs that seems relevant to the bug if present.
  - OS: [e.g. iOS]
 
 **Ombi Version (please complete the following information):**
- - Version [e.g. 3.0.1158]
+ - Version [e.g. 4.0.958]
 - Media Server [e.g. Plex]
 - Database Type: SQLite (Please change if using MySQL)
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Wiki
+  - name: Docs
-    url: https://github.com/tidusjar/Ombi/wiki
+    url: https://docs.ombi.app/
-    about: The Ombi wiki should help guide you through installation and setup as well as help resolve common problems and answer frequently asked questions
+    about: The Ombi documentation should help guide you through installation and setup as well as help resolve common problems and answer frequently asked questions
   - name: Reddit support
     url: https://www.reddit.com/r/Ombi
     about: Ask questions about Ombi

CHANGELOG.md

@@ -661,7 +661,7 @@
 
 - Added capture of anonymous analytical data. [tidusjar]
 
-- Added {AvailableDate} as a Notification Variable, this is the date the request was marked as available. See here: https://github.com/tidusjar/Ombi/wiki/Notification-Template-Variables. [tidusjar]
+- Added {AvailableDate} as a Notification Variable, this is the date the request was marked as available. See here: https://docs.ombi.app/info/notification-template-variables/. [tidusjar]
 
 - Added the ability to search movies via the movie db with a different language! [tidusjar]
 

README.md

@@ -18,7 +18,7 @@ Don't worry, it's grandma friendly, and more importantly; has wife approval cert
 | Service  | Stable         | Develop          
 |----------|:---------------------------:|:----------------------------:|
 | Build Status | [![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://dev.azure.com/tidusjar/Ombi/_apis/build/status/Ombi%20CI?repoName=Ombi-app%2FOmbi&branchName=develop)](https://dev.azure.com/tidusjar/Ombi/_build/latest?definitionId=18&repoName=Ombi-app%2FOmbi&branchName=develop) | [![Build Status](https://dev.azure.com/tidusjar/Ombi/_apis/build/status/Ombi%20CI?branchName=feature%2Fv4)](https://dev.azure.com/tidusjar/Ombi/_build/latest?definitionId=18&branchName=feature%2Fv4)
-| Download |[![Download](http://i.imgur.com/odToka3.png)](https://github.com/tidusjar/Ombi/releases)            |      [![Download](http://i.imgur.com/odToka3.png)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/develop/artifacts)       | [![Download](http://i.imgur.com/odToka3.png)](https://github.com/ombi-app/ombi/releases)       | 
+| Download |[![Download](http://i.imgur.com/odToka3.png)](https://github.com/Ombi-app/Ombi/releases)            |      [![Download](http://i.imgur.com/odToka3.png)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/develop/artifacts)       | [![Download](http://i.imgur.com/odToka3.png)](https://github.com/ombi-app/ombi/releases)       | 
 
 # Feature Requests
 Feature requests are handled on Feature Upvote.
@@ -63,7 +63,7 @@ Here are some of the features Ombi has:
 # Installation
 
 [Installation Guide](https://docs.ombi.app/installation/)  
-[Here for Reverse Proxy Config Examples](https://docs.ombi.app/settings/reverse-proxy/)  
+[Here for Reverse Proxy Config Examples](https://docs.ombi.app/info/reverse-proxy/)  
 
 # Contributors
 

src/Ombi.Helpers/PlexHelper.cs

@@ -42,7 +42,7 @@ namespace Ombi.Helpers
             //com.plexapp.agents.themoviedb://390043?lang=en
             //com.plexapp.agents.imdb://tt2543164?lang=en
             //plex://movie/5e1632df2d4d84003e48e54e
-            // https://github.com/tidusjar/Ombi/issues/3277
+            // https://github.com/Ombi-app/Ombi/issues/3277
             if (string.IsNullOrEmpty(guid))
             {
                 return new ProviderId();

src/Ombi.Notifications.Templates/Templates/BasicTemplate.html

@@ -166,7 +166,7 @@
                     <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
                         <tr>
                             <td class="content-block powered-by" style="font-family: sans-serif; vertical-align: top; padding-top: 10px; padding-bottom: 10px; font-size: 12px; color: #999999; text-align: center;" valign="top" align="center">
-                                Powered by <a href="https://github.com/tidusjar/Ombi" style="color: #999999;  font-size: 12px; text-align: center; text-decoration: underline;">Ombi</a> {@DATENOW}
+                                Powered by <a href="https://github.com/Ombi-app/Ombi" style="color: #999999;  font-size: 12px; text-align: center; text-decoration: underline;">Ombi</a> {@DATENOW}
                             </td>
                         </tr>
                     </table>

src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 <html>
 
 <head>
@@ -453,7 +453,7 @@
                                 <tbody>
                                     <tr>
                                         <td class="content-block powered-by" valign="top" align="center" style="font-family: sans-serif; vertical-align: top; padding-bottom: 10px; padding-top: 10px; color: #999999; font-size: 12px; text-align: center;">
-                                            Powered by <a href="https://github.com/tidusjar/Ombi" style="font-weight: 400; font-size: 12px; text-align: center; text-decoration: none; color: #ff761b;">Ombi</a>
+                                            Powered by <a href="https://github.com/Ombi-app/Ombi" style="font-weight: 400; font-size: 12px; text-align: center; text-decoration: none; color: #ff761b;">Ombi</a>
                                         </td>
                                     </tr>
                                 </tbody>

src/Ombi/ClientApp/src/app/settings/about/about.component.html

@@ -1,4 +1,4 @@
-<settings-menu></settings-menu>
+<settings-menu></settings-menu>
 <div *ngIf="about" class="small-middle-container">
   <legend>About</legend>
 <div class="row">
@@ -47,8 +47,8 @@
 
     <div class="mat-row">
       <div class="mat-cell">Wiki</div>
-      <div class="mat-cell"> <a href="https://github.com/Ombi-app/Ombi/wiki"
+      <div class="mat-cell"> <a href="https://docs.ombi.app"
-          target="_blank">https://github.com/Ombi-app/Ombi/wiki</a></div>
+          target="_blank">https://docs.ombi.app</a></div>
     </div>
 
     <div class="mat-row">

src/Ombi/ClientApp/src/app/settings/update/update.component.html

@@ -1,6 +1,6 @@
-
+
 <settings-menu></settings-menu>
-<wiki [path]="'https://github.com/Ombi-app/Ombi/wiki/Update-Settings'"></wiki>
+<wiki [path]="'https://docs.ombi.app/guides/updating/'"></wiki>
 <div *ngIf="form" class="small-middle-container">
     <fieldset>
         <legend>Update Settings</legend>