diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 2236cc395..7697affd4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,9 +1,6 @@
---
-name: Bug report
+name: "\U0001F41B Bug report"
about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
---
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..82f01f053
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+ - name: Wiki
+ url: https://github.com/tidusjar/Ombi/wiki
+ about: The Ombi wiki 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
+ - name: Feature suggestions
+ url: https://ombifeatures.featureupvote.com
+ about: Share your suggestions or ideas to make Ombi better!
diff --git a/README.md b/README.md
index 2ed6275a3..fdb90a5fc 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,16 @@ ____
[![Patreon](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://patreon.com/tidusjar/Ombi)
[![Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://paypal.me/PlexRequestsNet)
+# Feature Requests
+Feature requests are handled on Feature Upvote.
+
+Search the existing requests to see if your suggestion has already been submitted.
+(If a similar request exists, please vote, or add additional comments to the request)
+
+#### [![Feature Requests](https://cloud.githubusercontent.com/assets/390379/10127973/045b3a96-6560-11e5-9b20-31a2032956b2.png)](https://features.ombi.io)
___
+
[![Twitter](https://img.shields.io/twitter/follow/tidusjar.svg?style=social)](https://twitter.com/intent/follow?screen_name=tidusjar)
Follow me developing Ombi!
@@ -57,8 +65,9 @@ Here are some of the features Ombi V3 has:
We integrate with the following applications:
* Plex Media Server
* Emby
-* Sonarr
-* Radarr
+* Jellyfin
+* Sonarr V2 and V3
+* Radarr V2
* Lidarr
* DogNzb
* Couch Potato
@@ -66,48 +75,45 @@ We integrate with the following applications:
### Notifications
Supported notifications:
+* Mobile
* SMTP Notifications (Email)
* Discord
-* Gotify
* Slack
* Pushbullet
* Pushover
* Mattermost
* Telegram
+* Gotify
+* Twilio
* Webhook
-### The difference between Version 3 and 2
+### The difference between Version 4 and 3
Over the last year, we focused on the main functions on Ombi, a complete rewrite while making it better, faster and more stable.
We have already done most of the work, but some features are still be missing in this first version.
-We are planning to bring back these features in V3 but for now you can find a list below with a quick comparison of features between v2 and v3.
+We are planning to bring back these features in V3 but for now you can find a list below with a quick comparison of features between v4 and v3.
-| Service | Version 3 | Version 2 |
+| Service | Version 4 (Beta) | Version 3 (Stable)|
|----------|:----------:|:----------:|
-| Multiple Plex/Emby Servers| Yes | No |
-| Emby & Plex support | Yes | Yes |
-| Mono dependency | No | Yes |
-| Notifications support | Yes| Yes |
-| Landing page | Yes (brand new) | Yes |
+| Multiple Plex/Emby/Jellyfin Servers | Yes | Yes |
+| Emby/Jellyfin & Plex support | Yes | Yes |
+| Mono dependency | No | No |
+| Plex OAuth support | Yes | Yes |
| Login page | Yes (brand new) | Yes |
-| Custom Notification Messages | Yes | No |
+| Discovery page | Yes (brand new) | No |
+| Request a movie collection | Yes (brand new) | No |
+| Auto Delete Available Requests | Yes (brand new) | No |
+| Report issues | Yes | Yes |
+| Notifications support | Yes | Yes |
+| Custom Notification Messages | Yes | Yes |
| Sending newsletters | Yes | Yes |
| Send a Mass Email | Yes | Yes |
| SickRage | Yes | Yes |
| CouchPotato | Yes | Yes |
-| DogNzb | Yes | No |
-| Issues | Yes | Yes |
+| DogNzb | Yes | Yes |
| Headphones | No | Yes |
-| Lidarr | Yes | No |
-
-# Feature Requests
-Feature requests are handled on Feature Upvote.
-
-Search the existing requests to see if your suggestion has already been submitted.
-(If a similar request exists, please vote, or add additional comments to the request)
-
-#### [![Feature Requests](https://cloud.githubusercontent.com/assets/390379/10127973/045b3a96-6560-11e5-9b20-31a2032956b2.png)](https://features.ombi.io)
+| Lidarr | Yes | Yes |
# Preview
diff --git a/src/Ombi.Store/Migrations/OmbiMySql/20200218230644_MobileDevices.cs b/src/Ombi.Store/Migrations/OmbiMySql/20200218230644_MobileDevices.cs
index ce2c2ebd2..ae533b901 100644
--- a/src/Ombi.Store/Migrations/OmbiMySql/20200218230644_MobileDevices.cs
+++ b/src/Ombi.Store/Migrations/OmbiMySql/20200218230644_MobileDevices.cs
@@ -11,7 +11,7 @@ namespace Ombi.Store.Migrations.OmbiMySql
migrationBuilder.Sql(@"CREATE TABLE `MobileDevices` (
`Id` int NOT NULL AUTO_INCREMENT,
`Token` longtext CHARACTER SET utf8mb4 NULL,
- `UserId` varchar(255) COLLATE utf8mb4_bin NOT NULL,
+ `UserId` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
`AddedAt` datetime(6) NOT NULL,
CONSTRAINT `PK_MobileDevices` PRIMARY KEY (`Id`),
CONSTRAINT `FK_MobileDevices_AspNetUsers_UserId` FOREIGN KEY (`UserId`) REFERENCES `AspNetUsers` (`Id`) ON DELETE RESTRICT
diff --git a/src/Ombi.Store/Migrations/OmbiMySql/20200731151314_RemoveEmbyConnectionid.cs b/src/Ombi.Store/Migrations/OmbiMySql/20200731151314_RemoveEmbyConnectionid.cs
index 35fd4fa8a..c216b5eae 100644
--- a/src/Ombi.Store/Migrations/OmbiMySql/20200731151314_RemoveEmbyConnectionid.cs
+++ b/src/Ombi.Store/Migrations/OmbiMySql/20200731151314_RemoveEmbyConnectionid.cs
@@ -6,10 +6,10 @@ namespace Ombi.Store.Migrations.OmbiMySql
{
protected override void Up(MigrationBuilder migrationBuilder)
{
+ migrationBuilder.Sql("UPDATE AspNetUsers SET UserType = 4 WHERE EmbyConnectUserId IS NOT NULL");
migrationBuilder.DropColumn(
name: "EmbyConnectUserId",
table: "AspNetUsers");
- migrationBuilder.Sql("UPDATE AspNetUsers SET UserType = 4 WHERE EmbyConnectUserId IS NOT NULL");
}
protected override void Down(MigrationBuilder migrationBuilder)
diff --git a/src/Ombi/ClientApp/src/app/app.component.ts b/src/Ombi/ClientApp/src/app/app.component.ts
index 14899f56c..abf47b1bf 100644
--- a/src/Ombi/ClientApp/src/app/app.component.ts
+++ b/src/Ombi/ClientApp/src/app/app.component.ts
@@ -83,6 +83,12 @@ export class AppComponent implements OnInit {
this.applicationName = this.customizationSettings.applicationName;
this.document.getElementsByTagName('title')[0].innerText = this.applicationName;
}
+ if (this.customizationSettings && this.customizationSettings.customCss) {
+ var dom = this.document.getElementsByTagName('head')[0];
+ var css = document.createElement("style");
+ css.innerHTML = this.customizationSettings.customCss;
+ dom.appendChild(css);
+ }
if (this.customizationSettings.useCustomPage) {
this.customPageService.getCustomPage().subscribe(c => {
diff --git a/src/Ombi/ClientApp/src/app/login/login.component.html b/src/Ombi/ClientApp/src/app/login/login.component.html
index 8b0972115..f2627b3f8 100644
--- a/src/Ombi/ClientApp/src/app/login/login.component.html
+++ b/src/Ombi/ClientApp/src/app/login/login.component.html
@@ -24,7 +24,7 @@
{{'Login.RememberMe' | translate}}
-
+