Merge branch 'master' into dev-master

5 months ago · c62460d87c
parent 69929f1a8c f4d0bf1dae
commit c62460d87c
8 changed files with 38 additions and 1487 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/README.md
+++ b/README.md
@ -301,10 +301,10 @@ Here are some of the features Ombi has:
        </a>
    </td>
    <td align="center">
-        <a href="https://github.com/deepwather">
-            <img src="https://avatars.githubusercontent.com/u/12274612?v=4" width="50;" alt="deepwather"/>
+        <a href="https://github.com/phildups7">
+            <img src="https://avatars.githubusercontent.com/u/60622768?v=4" width="50;" alt="phildups7"/>
            <br />
-            <sub><b>Michael Reber</b></sub>
+            <sub><b>Phildups7</b></sub>
        </a>
    </td>
    <td align="center">
@ -616,8 +616,8 @@ Here are some of the features Ombi has:
        </a>
    </td>
    <td align="center">
-        <a href="https://github.com/camjac251">
-            <img src="https://avatars.githubusercontent.com/u/6313132?v=4" width="50;" alt="camjac251"/>
+        <a href="https://github.com/janderedev">
+            <img src="https://avatars.githubusercontent.com/u/26145882?v=4" width="50;" alt="janderedev"/>
            <br />
            <sub><b>Camjac251</b></sub>
        </a>
--- a/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj
+++ b/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj
@ -8,8 +8,8 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.18.0" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Include="AutoFixture" Version="4.17.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
    <PackageReference Include="Moq" Version="4.18.2" />
    <PackageReference Include="Moq.AutoMock" Version="3.4.0" />
    <PackageReference Include="Nunit" Version="3.13.3" />
--- a/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj
+++ b/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj
@ -11,9 +11,10 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.5" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj
+++ b/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj
@ -10,8 +10,8 @@
    <PackageReference Include="Nunit" Version="3.13.3" />
    <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.2" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <packagereference Include="Microsoft.NET.Test.Sdk" Version="17.6.2"></packagereference>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+    <packagereference Include="Microsoft.NET.Test.Sdk" Version="17.3.2"></packagereference>
    <PackageReference Include="Moq" Version="4.18.2" />
 	  <PackageReference Include="Moq.AutoMock" Version="3.4.0" />
  </ItemGroup>
--- a/src/Ombi/ClientApp/src/app/settings/plex/components/plex-server-dialog/plex-server-dialog.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/plex/components/plex-server-dialog/plex-server-dialog.component.html
@ -24,6 +24,7 @@
        <mat-error *ngIf="serverPortControl.hasError('pattern')">Must be a number.</mat-error>
      </mat-form-field>

+      <mat-slide-toggle id="ssl" class="col-md-2 col-5 mt-3" id="ssl" name="ssl" [(ngModel)]="this.data.server.ssl" [checked]="this.data.server.ssl">
      <mat-slide-toggle id="ssl" class="col-md-2 col-5 mt-3" id="ssl" name="ssl" [(ngModel)]="this.data.server.ssl" [checked]="this.data.server.ssl">
        SSL
      </mat-slide-toggle>
@ -74,6 +75,7 @@
    <div *ngIf="this.data.server.plexSelectedLibraries && this.data.server.plexSelectedLibraries.length > 0">
      <label>Please select the libraries for Ombi to monitor. If nothing is selected, Ombi will monitor all
        libraries.</label>
+        <div *ngFor="let lib of this.data.server.plexSelectedLibraries; let i = index">
        <div *ngFor="let lib of this.data.server.plexSelectedLibraries; let i = index">
          <div class="md-form-field">
              <div class="checkbox">
--- a/src/Ombi/wwwroot/translations/sk.json
+++ b/src/Ombi/wwwroot/translations/sk.json
@ -159,10 +159,9 @@
        "RequestedBy": "Vyžiadané od",
        "Status": "Stav",
        "RequestStatus": "Stav požiadavky",
-        "Watched": "Pozreté",
-        "WatchedTooltip": "Používateľ, ktorý zadal požiadavku, ju sledoval",
-        "WatchedProgressTooltip": "Zobrazuje, koľko krát používateľ, ktorý zadal požiadavku, ju sledoval",
-        "WatchedByUsersCount": "{{count}} používatelia si to pozreli.",
+        "Watched": "Watched",
+        "WatchedTooltip": "The user who made the request has watched it",
+        "WatchedByUsersCount": "{{count}} users have watched this.",
        "Denied": " Zamietnuté:",
        "TheatricalRelease": "Kino vydanie: {{date}}",
        "ReleaseDate": "Vydané: {{date}}",
--- a/tests/yarn.lock
+++ b/tests/yarn.lock
@ -503,10 +503,19 @@ cross-spawn@^7.0.0:
    shebang-command "^2.0.0"
    which "^2.0.1"

+<<<<<<< HEAD
 cypress-real-events@^1.13.0:
  version "1.13.0"
  resolved "https://registry.yarnpkg.com/cypress-real-events/-/cypress-real-events-1.13.0.tgz#6b7cd32dcac172db1493608f97a2576c7d0bd5af"
  integrity sha512-LoejtK+dyZ1jaT8wGT5oASTPfsNV8/ClRp99ruN60oPj8cBJYod80iJDyNwfPAu4GCxTXOhhAv9FO65Hpwt6Hg==
+=======
+cypress-real-events@^1.9.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/cypress-real-events/-/cypress-real-events-1.10.0.tgz#6827ae4667561471c2a86bb4be30061fa9b177b8"
+  integrity sha512-ALSdCiG+Rj3Sl6qooqTFeFGBxOIe8QJUcgIuJ6ZVBanTEijXRzqxqstMC2ZKfixqj1TyNjolyZU4zOoN/jtHpg==
+  dependencies:
+    prettier "^3.0.0"
+>>>>>>> master

 cypress-wait-until@^1.7.1:
  version "1.7.2"
@ -1258,6 +1267,14 @@ pify@^2.2.0:
  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==

+<<<<<<< HEAD
+=======
+prettier@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.2.tgz#78fcecd6d870551aa5547437cdae39d4701dca5b"
+  integrity sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==
+
+>>>>>>> master
 pretty-bytes@^5.6.0:
  version "5.6.0"
  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"