+
+
+
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts
index e5e341aa8..09b86a31e 100644
--- a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts
+++ b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from "@angular/core";
-import { ICustomizationSettings, IEmailNotificationSettings, IUser } from "../interfaces";
+import { ICheckbox, ICustomizationSettings, IEmailNotificationSettings,IUser } from "../interfaces";
import { IdentityService, NotificationService, SettingsService } from "../services";
@Component({
@@ -16,6 +16,11 @@ export class UserManagementComponent implements OnInit {
public order: string = "u.userName";
public reverse = false;
+ public showBulkEdit = false;
+ public availableClaims: ICheckbox[];
+ public bulkMovieLimit?: number;
+ public bulkEpisodeLimit?: number;
+
constructor(private readonly identityService: IdentityService,
private readonly settingsService: SettingsService,
private readonly notificationService: NotificationService) { }
@@ -26,6 +31,7 @@ export class UserManagementComponent implements OnInit {
this.users = x;
});
+ this.identityService.getAllAvailableClaims().subscribe(x => this.availableClaims = x);
this.settingsService.getCustomization().subscribe(x => this.customizationSettings = x);
this.settingsService.getEmailNotificationSettings().subscribe(x => this.emailSettings = x);
}
@@ -49,6 +55,43 @@ export class UserManagementComponent implements OnInit {
user.checked = this.checkAll;
});
}
+
+ public hasChecked(): boolean {
+ return this.users.some(x => {
+ return x.checked;
+ });
+ }
+
+ public bulkUpdate() {
+ const anyRoles = this.availableClaims.some(x => {
+ return x.enabled;
+ });
+
+ this.users.forEach(x => {
+ if(!x.checked) {
+ return;
+ }
+ if(anyRoles) {
+ x.claims = this.availableClaims;
+ }
+ if(this.bulkEpisodeLimit && this.bulkEpisodeLimit > 0) {
+ x.episodeRequestLimit = this.bulkEpisodeLimit;
+ }
+ if(this.bulkMovieLimit && this.bulkMovieLimit > 0) {
+ x.movieRequestLimit = this.bulkMovieLimit;
+ }
+ this.identityService.updateUser(x).subscribe(y => {
+ if(!y.successful) {
+ this.notificationService.error(`Could not update user ${x.userName}. Reason ${y.errors[0]}`);
+ }
+ });
+ });
+
+ this.notificationService.success(`Updated users`);
+ this.showBulkEdit = false;
+ this.bulkMovieLimit = undefined;
+ this.bulkEpisodeLimit = undefined;
+ }
public setOrder(value: string) {
if (this.order === value) {
diff --git a/src/Ombi/ClientApp/app/usermanagement/usermanagement.module.ts b/src/Ombi/ClientApp/app/usermanagement/usermanagement.module.ts
index fd8004ec9..40dba285d 100644
--- a/src/Ombi/ClientApp/app/usermanagement/usermanagement.module.ts
+++ b/src/Ombi/ClientApp/app/usermanagement/usermanagement.module.ts
@@ -2,7 +2,7 @@
import { NgModule } from "@angular/core";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { RouterModule, Routes } from "@angular/router";
-import { ConfirmationService, ConfirmDialogModule, MultiSelectModule, TooltipModule } from "primeng/primeng";
+import { ConfirmationService, ConfirmDialogModule, MultiSelectModule, SidebarModule, TooltipModule } from "primeng/primeng";
import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
@@ -37,6 +37,7 @@ const routes: Routes = [
ConfirmDialogModule,
TooltipModule,
OrderModule,
+ SidebarModule,
],
declarations: [
UserManagementComponent,
diff --git a/src/Ombi/ClientApp/styles/base.scss b/src/Ombi/ClientApp/styles/base.scss
index b53392c19..cf15cb561 100644
--- a/src/Ombi/ClientApp/styles/base.scss
+++ b/src/Ombi/ClientApp/styles/base.scss
@@ -411,15 +411,6 @@ $border-radius: 10px;
line-height: 13px;
}
-.small-checkbox label {
- display: inline-block;
- cursor: pointer;
- position: relative;
- padding-left: 25px;
- margin-right: 15px;
- font-size: 13px;
- margin-bottom: 10px;
-}
.radio label {
display: inline-block;
@@ -456,6 +447,15 @@ $border-radius: 10px;
line-height: 13px;
}
+.small-checkbox label {
+ display: inline-block;
+ cursor: pointer;
+ position: relative;
+ padding-left: 25px;
+ margin-right: 15px;
+ font-size: 13px;
+ margin-bottom: 10px;
+}
.small-checkbox label:before {
diff --git a/src/Ombi/Controllers/IdentityController.cs b/src/Ombi/Controllers/IdentityController.cs
index 58ba1b7c1..7c5730e0c 100644
--- a/src/Ombi/Controllers/IdentityController.cs
+++ b/src/Ombi/Controllers/IdentityController.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
-
+using System.Web;
using AutoMapper;
using Hangfire;
using Microsoft.AspNetCore.Authorization;
@@ -472,8 +472,16 @@ namespace Ombi.Controllers
// Get the roles
var userRoles = await UserManager.GetRolesAsync(user);
+ // Am I modifying myself?
+ var modifyingSelf = user.UserName.Equals(User.Identity.Name, StringComparison.CurrentCultureIgnoreCase);
+
foreach (var role in userRoles)
{
+ if (modifyingSelf && role.Equals(OmbiRoles.Admin))
+ {
+ // We do not want to remove the admin role from yourself, this must be an accident
+ continue;
+ }
await UserManager.RemoveFromRoleAsync(user, role);
}
@@ -613,25 +621,54 @@ namespace Ombi.Controllers
return defaultMessage;
}
- // We have the user
- var token = await UserManager.GeneratePasswordResetTokenAsync(user);
- // We now need to email the user with this token
- var emailSettings = await EmailSettings.GetSettingsAsync();
+
var customizationSettings = await CustomizationSettings.GetSettingsAsync();
var appName = (string.IsNullOrEmpty(customizationSettings.ApplicationName)
? "Ombi"
: customizationSettings.ApplicationName);
+ var emailSettings = await EmailSettings.GetSettingsAsync();
+
customizationSettings.AddToUrl("/token?token=");
var url = customizationSettings.ApplicationUrl;
- await EmailProvider.SendAdHoc(new NotificationMessage
+ if (user.UserType == UserType.PlexUser)
+ {
+ await EmailProvider.SendAdHoc(new NotificationMessage
+ {
+ To = user.Email,
+ Subject = $"{appName} Password Reset",
+ Message =
+ $"You recently made a request to reset your {appName} account. Please click the link below to complete the process.
" +
+ $" Reset "
+ }, emailSettings);
+ }
+ else if (user.UserType == UserType.EmbyUser && user.IsEmbyConnect)
{
- To = user.Email,
- Subject = $"{appName} Password Reset",
- Message = $"You recently made a request to reset your {appName} account. Please click the link below to complete the process.
" +
- $" Reset "
- }, emailSettings);
+ await EmailProvider.SendAdHoc(new NotificationMessage
+ {
+ To = user.Email,
+ Subject = $"{appName} Password Reset",
+ Message =
+ $"You recently made a request to reset your {appName} account.
" +
+ $"To reset your password you need to go to Emby.Media and then click on your Username > Edit Profile > Email and Password"
+ }, emailSettings);
+ }
+ else
+ {
+ // We have the user
+ var token = await UserManager.GeneratePasswordResetTokenAsync(user);
+ var encodedToken = WebUtility.UrlEncode(token);
+
+ await EmailProvider.SendAdHoc(new NotificationMessage
+ {
+ To = user.Email,
+ Subject = $"{appName} Password Reset",
+ Message =
+ $"You recently made a request to reset your {appName} account. Please click the link below to complete the process.
" +
+ $" Reset "
+ }, emailSettings);
+ }
return defaultMessage;
}
diff --git a/src/Ombi/Controllers/IssuesController.cs b/src/Ombi/Controllers/IssuesController.cs
index 7828be6e4..0b338e8b9 100644
--- a/src/Ombi/Controllers/IssuesController.cs
+++ b/src/Ombi/Controllers/IssuesController.cs
@@ -136,14 +136,17 @@ namespace Ombi.Controllers
var notificationModel = new NotificationOptions
{
- RequestId = 0,
+ RequestId = i.RequestId ?? 0,
DateTime = DateTime.Now,
NotificationType = NotificationType.Issue,
RequestType = i.RequestType,
Recipient = string.Empty,
- AdditionalInformation = $"{i.Subject} | {i.Description}"
+ AdditionalInformation = $"{i.Subject} | {i.Description}",
+ UserId = i.UserReportedId
};
+ AddIssueNotificationSubstitutes(notificationModel, i, User.Identity.Name);
+
BackgroundJob.Enqueue(() => _notification.Publish(notificationModel));
return i.Id;
@@ -190,22 +193,56 @@ namespace Ombi.Controllers
[HttpPost("comments")]
public async Task AddComment([FromBody] NewIssueCommentViewModel comment)
{
- var userId = await _userManager.Users.Where(x => User.Identity.Name == x.UserName).Select(x => x.Id)
+ var user = await _userManager.Users.Where(x => User.Identity.Name == x.UserName)
.FirstOrDefaultAsync();
+ var issue = await _issues.GetAll().Include(x => x.UserReported).FirstOrDefaultAsync(x => x.Id == comment.IssueId);
+ if (issue == null)
+ {
+ return null;
+ }
var newComment = new IssueComments
{
Comment = comment.Comment,
Date = DateTime.UtcNow,
- UserId = userId,
+ UserId = user.Id,
IssuesId = comment.IssueId,
};
+
+ var notificationModel = new NotificationOptions
+ {
+ RequestId = issue.RequestId ?? 0,
+ DateTime = DateTime.Now,
+ NotificationType = NotificationType.IssueComment,
+ RequestType = issue.RequestType,
+ UserId = user.Id
+ };
+
+ var isAdmin = await _userManager.IsInRoleAsync(user, OmbiRoles.Admin);
+ AddIssueNotificationSubstitutes(notificationModel, issue, issue.UserReported.UserAlias);
+ notificationModel.Substitutes.Add("NewIssueComment", comment.Comment);
+ notificationModel.Substitutes.Add("AdminComment", isAdmin.ToString());
+
+ if (isAdmin)
+ {
+ // Send to user
+ notificationModel.Recipient = issue.UserReported.Email;
+ }
+ else
+ {
+ notificationModel.Recipient = user.Email;
+ }
+
+ BackgroundJob.Enqueue(() => _notification.Publish(notificationModel));
+
return await _issueComments.Add(newComment);
}
[HttpPost("status")]
public async Task UpdateStatus([FromBody] IssueStateViewModel model)
{
- var issue = await _issues.Find(model.IssueId);
+ var user = await _userManager.Users.Where(x => User.Identity.Name == x.UserName)
+ .FirstOrDefaultAsync();
+ var issue = await _issues.GetAll().Include(x => x.UserReported).FirstOrDefaultAsync(x => x.Id == model.IssueId);
if (issue == null)
{
return false;
@@ -214,20 +251,38 @@ namespace Ombi.Controllers
issue.Status = model.Status;
await _issues.SaveChangesAsync();
- var notificationModel = new NotificationOptions
+ if (issue.Status == IssueStatus.Resolved)
{
- RequestId = 0,
- DateTime = DateTime.Now,
- NotificationType = NotificationType.Issue,
- RequestType = issue.RequestType,
- Recipient = !string.IsNullOrEmpty(issue.UserReported?.Email) ? issue.UserReported.Email : string.Empty,
- AdditionalInformation = $"{issue.Subject} | {issue.Description}"
- };
+ var notificationModel = new NotificationOptions
+ {
+ RequestId = 0,
+ DateTime = DateTime.Now,
+ NotificationType = NotificationType.IssueResolved,
+ RequestType = issue.RequestType,
+ Recipient = !string.IsNullOrEmpty(issue.UserReported?.Email)
+ ? issue.UserReported.Email
+ : string.Empty,
+ AdditionalInformation = $"{issue.Subject} | {issue.Description}",
+ UserId = user.Id,
+
+ };
+ AddIssueNotificationSubstitutes(notificationModel, issue, issue.UserReported?.UserAlias ?? string.Empty);
- BackgroundJob.Enqueue(() => _notification.Publish(notificationModel));
+ BackgroundJob.Enqueue(() => _notification.Publish(notificationModel));
+ }
return true;
}
+
+ private static void AddIssueNotificationSubstitutes(NotificationOptions notificationModel, Issues issue, string issueReportedUsername)
+ {
+ notificationModel.Substitutes.Add("Title", issue.Title);
+ notificationModel.Substitutes.Add("IssueDescription", issue.Description);
+ notificationModel.Substitutes.Add("IssueCategory", issue.IssueCategory?.Value);
+ notificationModel.Substitutes.Add("IssueStatus", issue.Status.ToString());
+ notificationModel.Substitutes.Add("IssueSubject", issue.Subject);
+ notificationModel.Substitutes.Add("IssueUser", issueReportedUsername);
+ }
}
}
\ No newline at end of file
diff --git a/src/Ombi/Controllers/LoggingController.cs b/src/Ombi/Controllers/LoggingController.cs
index a61b6c144..c6879da39 100644
--- a/src/Ombi/Controllers/LoggingController.cs
+++ b/src/Ombi/Controllers/LoggingController.cs
@@ -17,7 +17,7 @@ namespace Ombi.Controllers
}
private ILogger Logger { get; }
- private const string Message = "Exception: {0} at {1}. Stacktrade {2}";
+ private const string Message = "Exception: {0} at {1}. Stacktrace {2}";
[HttpPost]
public IActionResult Log([FromBody]UiLoggingModel l)
diff --git a/src/Ombi/Controllers/MobileController.cs b/src/Ombi/Controllers/MobileController.cs
new file mode 100644
index 000000000..95703351c
--- /dev/null
+++ b/src/Ombi/Controllers/MobileController.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Ombi.Attributes;
+using Ombi.Core.Authentication;
+using Ombi.Helpers;
+using Ombi.Models;
+using Ombi.Store.Entities;
+using Ombi.Store.Repository;
+
+namespace Ombi.Controllers
+{
+ [ApiV1]
+ [Authorize]
+ [Produces("application/json")]
+ public class MobileController : Controller
+ {
+ public MobileController(IRepository notification, OmbiUserManager user)
+ {
+ _notification = notification;
+ _userManager = user;
+ }
+
+ private readonly IRepository _notification;
+ private readonly OmbiUserManager _userManager;
+
+ [HttpPost("Notification")]
+ [ApiExplorerSettings(IgnoreApi = true)]
+ public async Task AddNotitficationId([FromBody] NotificationIdBody body)
+ {
+ if (body?.PlayerId.HasValue() ?? false)
+ {
+ var user = await _userManager.Users.FirstOrDefaultAsync(x => x.UserName == User.Identity.Name);
+ // Check if we already have this notification id
+ var alreadyExists = await _notification.GetAll().AnyAsync(x => x.PlayerId == body.PlayerId && x.UserId == user.Id);
+
+ if (alreadyExists)
+ {
+ return Ok();
+ }
+
+ // let's add it
+ await _notification.Add(new NotificationUserId
+ {
+ PlayerId = body.PlayerId,
+ UserId = user.Id,
+ AddedAt = DateTime.Now,
+ });
+ return Ok();
+ }
+ return BadRequest();
+ }
+
+ [HttpGet("Notification")]
+ [ApiExplorerSettings(IgnoreApi = true)]
+ [Admin]
+ public IEnumerable GetRegisteredMobileUsers()
+ {
+ var users = _userManager.Users.Include(x => x.NotificationUserIds).Where(x => x.NotificationUserIds.Any());
+
+ var vm = new List();
+
+ foreach (var u in users)
+ {
+ vm.Add(new MobileUsersViewModel
+ {
+ Username = u.UserAlias,
+ Devices = u.NotificationUserIds.Count
+ });
+ }
+ return vm;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Ombi/Controllers/SettingsController.cs b/src/Ombi/Controllers/SettingsController.cs
index d1522e361..c68a648c8 100644
--- a/src/Ombi/Controllers/SettingsController.cs
+++ b/src/Ombi/Controllers/SettingsController.cs
@@ -765,6 +765,40 @@ namespace Ombi.Controllers
return model;
}
+ ///
+ /// Saves the Mobile notification settings.
+ ///
+ /// The model.
+ ///
+ [HttpPost("notifications/mobile")]
+ public async Task MobileNotificationSettings([FromBody] MobileNotificationsViewModel model)
+ {
+ // Save the email settings
+ var settings = Mapper.Map(model);
+ var result = await Save(settings);
+
+ // Save the templates
+ await TemplateRepository.UpdateRange(model.NotificationTemplates);
+
+ return result;
+ }
+
+ ///
+ /// Gets the Mobile Notification Settings.
+ ///
+ ///
+ [HttpGet("notifications/mobile")]
+ public async Task MobileNotificationSettings()
+ {
+ var settings = await Get();
+ var model = Mapper.Map(settings);
+
+ // Lookup to see if we have any templates saved
+ model.NotificationTemplates = await BuildTemplates(NotificationAgent.Mobile);
+
+ return model;
+ }
+
private async Task> BuildTemplates(NotificationAgent agent)
{
var templates = await TemplateRepository.GetAllTemplates(agent);
diff --git a/src/Ombi/Models/MobileUsersViewModel.cs b/src/Ombi/Models/MobileUsersViewModel.cs
new file mode 100644
index 000000000..e7d99569f
--- /dev/null
+++ b/src/Ombi/Models/MobileUsersViewModel.cs
@@ -0,0 +1,8 @@
+namespace Ombi.Models
+{
+ public class MobileUsersViewModel
+ {
+ public string Username { get; set; }
+ public int Devices { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Ombi/Models/NotificationIdBody.cs b/src/Ombi/Models/NotificationIdBody.cs
new file mode 100644
index 000000000..cb50d3180
--- /dev/null
+++ b/src/Ombi/Models/NotificationIdBody.cs
@@ -0,0 +1,7 @@
+namespace Ombi.Models
+{
+ public class NotificationIdBody
+ {
+ public string PlayerId { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Ombi/Program.cs b/src/Ombi/Program.cs
index f3f9c8b7e..943301a4d 100644
--- a/src/Ombi/Program.cs
+++ b/src/Ombi/Program.cs
@@ -28,6 +28,12 @@ namespace Ombi
{
host = o.Host;
storagePath = o.StoragePath;
+ }).WithNotParsed(err =>
+ {
+ foreach (var e in err)
+ {
+ Console.WriteLine(e);
+ }
});
Console.WriteLine(HelpOutput(result));
@@ -46,7 +52,7 @@ namespace Ombi
url = new ApplicationConfiguration
{
Type = ConfigurationTypes.Url,
- Value = "http://*"
+ Value = "http://*:5000"
};
ctx.ApplicationConfigurations.Add(url);
@@ -87,13 +93,13 @@ namespace Ombi
public class Options
{
- [Option('h', "host", Required = false, HelpText =
+ [Option("host", Required = false, HelpText =
"Set to a semicolon-separated (;) list of URL prefixes to which the server should respond. For example, http://localhost:123." +
" Use \"*\" to indicate that the server should listen for requests on any IP address or hostname using the specified port and protocol (for example, http://*:5000). " +
"The protocol (http:// or https://) must be included with each URL. Supported formats vary between servers.", Default = "http://*:5000")]
public string Host { get; set; }
-
- [Option('s', "storage", Required = false, HelpText = "Storage path, where we save the logs and database")]
+
+ [Option("storage", Required = false, HelpText = "Storage path, where we save the logs and database")]
public string StoragePath { get; set; }
}
diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs
index f66754a0e..d92650d85 100644
--- a/src/Ombi/Startup.cs
+++ b/src/Ombi/Startup.cs
@@ -57,7 +57,6 @@ namespace Ombi
config = new LoggerConfiguration()
.MinimumLevel.Debug()
.WriteTo.RollingFile(Path.Combine(env.ContentRootPath, "Logs", "log-{Date}.txt"))
- .WriteTo.SQLite("Ombi.db", "Logs", LogEventLevel.Debug)
.CreateLogger();
}
else
@@ -65,7 +64,6 @@ namespace Ombi
config = new LoggerConfiguration()
.MinimumLevel.Debug()
.WriteTo.RollingFile(Path.Combine(StoragePath.StoragePath, "Logs", "log-{Date}.txt"))
- .WriteTo.SQLite(Path.Combine(StoragePath.StoragePath, "Ombi.db"), "Logs", LogEventLevel.Debug)
.CreateLogger();
}
Log.Logger = config;
diff --git a/src/Ombi/appsettings.Development.json b/src/Ombi/appsettings.Development.json
index fa8ce71a9..6fa76219e 100644
--- a/src/Ombi/appsettings.Development.json
+++ b/src/Ombi/appsettings.Development.json
@@ -2,9 +2,9 @@
"Logging": {
"IncludeScopes": false,
"LogLevel": {
- "Default": "Debug",
- "System": "Information",
- "Microsoft": "Information"
+ "Default": "Trace",
+ "System": "Trace",
+ "Microsoft": "Warning"
}
}
}
diff --git a/src/Ombi/appsettings.json b/src/Ombi/appsettings.json
index e2534496b..ed9a1b88a 100644
--- a/src/Ombi/appsettings.json
+++ b/src/Ombi/appsettings.json
@@ -4,7 +4,8 @@
"LogLevel": {
"Default": "Debug",
"System": "Debug",
- "Microsoft": "None"
+ "Microsoft": "None",
+ "Hangfire": "None"
}
},
"ApplicationSettings": {
diff --git a/src/Ombi/gulpfile.js b/src/Ombi/gulpfile.js
index 5db74ca9e..ae7472871 100644
--- a/src/Ombi/gulpfile.js
+++ b/src/Ombi/gulpfile.js
@@ -5,6 +5,7 @@ const run = require('gulp-run');
const runSequence = require('run-sequence');
const del = require('del');
const path = require('path');
+const fs = require('fs');
const outputDir = './wwwroot/dist';
@@ -23,26 +24,56 @@ function getEnvOptions() {
}
}
-gulp.task('vendor', function () {
- return run('webpack --config webpack.config.vendor.ts' + getEnvOptions()).exec();
+
+function webpack(vendor) {
+ return run(`webpack --config webpack.config${vendor ? '.vendor' : ''}.ts${getEnvOptions()}`).exec();
+}
+
+gulp.task('vendor', () => {
+ let build = false;
+ const vendorPath = path.join(outputDir, "vendor.js");
+ const vendorExists = fs.existsSync(vendorPath);
+ if (vendorExists) {
+ const vendorStat = fs.statSync(vendorPath);
+ const packageStat = fs.statSync("package.json");
+ const vendorConfigStat = fs.statSync("webpack.config.vendor.ts");
+ if (packageStat.mtime > vendorStat.mtime) {
+ build = true;
+ }
+ if (vendorConfigStat.mtime > vendorStat.mtime) {
+ build = true;
+ }
+ } else {
+ build = true;
+ }
+ if (build) {
+ return webpack(true);
+ }
});
-gulp.task('main', function () {
- return run('webpack --config webpack.config.ts' + getEnvOptions()).exec();
+
+gulp.task('vendor_force', () => {
+ return webpack(true);
+})
+
+gulp.task('main', () => {
+ return webpack()
});
-gulp.task('prod_var', function () {
+gulp.task('prod_var', () => {
global.prod = true;
})
-gulp.task('analyse_var', function () {
+gulp.task('analyse_var', () => {
global.analyse = true;
})
-gulp.task('clean', function() {
- del.sync(outputDir, { force: true });
+gulp.task('clean', () => {
+ del.sync(outputDir, { force: true });
});
+
+gulp.task('lint', () => run("npm run lint").exec());
gulp.task('build', callback => runSequence('vendor', 'main', callback));
gulp.task('analyse', callback => runSequence('analyse_var', 'build'));
gulp.task('full', callback => runSequence('clean', 'build'));
diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json
index 0d3f3805e..160916bfa 100644
--- a/src/Ombi/wwwroot/translations/en.json
+++ b/src/Ombi/wwwroot/translations/en.json
@@ -21,6 +21,7 @@
"Request": "Request",
"Denied":"Denied",
"Approve":"Approve",
+ "PartlyAvailable": "Partly Available",
"Errors": {
"Validation": "Please check your entered values"
}
@@ -86,6 +87,21 @@
"NowPlayingMovies": "Now Playing Movies",
"HomePage": "Home Page",
"Trailer": "Trailer"
+ },
+ "TvShows": {
+ "Popular":"Popular",
+ "Trending":"Trending",
+ "MostWatched":"Most Watched",
+ "MostAnticipated":"Most Anticipated",
+ "Results":"Results",
+ "AirDate":"Air Date:",
+ "AllSeasons":"All Seasons",
+ "FirstSeason":"First Season",
+ "LatestSeason":"Latest Season",
+ "Select":"Select ...",
+ "SubmitRequest":"Submit Request",
+ "Season":"Season: {{seasonNumber}}",
+ "SelectAllInSeason":"Select All in Season {{seasonNumber}}"
}
},
"Requests": {
@@ -113,7 +129,8 @@
"AirDate":"AirDate",
"GridStatus":"Status",
"ReportIssue":"Report Issue",
- "Filter":"Filter"
+ "Filter":"Filter",
+ "SeasonNumberHeading":"Season: {seasonNumber}"
},
"Issues":{
"Title":"Issues",