Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/Ombi-app/Ombi into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
tidusjar committed May 2, 2023
2 parents 0e5e0ad + a3b8b53 commit 226796d
Show file tree
Hide file tree
Showing 28 changed files with 444 additions and 385 deletions.
20 changes: 11 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## [4.37.1](https://github.com/Ombi-app/Ombi/compare/v4.37.0...v4.37.1) (2023-05-02)


### Bug Fixes

* Cron Validation ([#4842](https://github.com/Ombi-app/Ombi/issues/4842)) ([97cc42f](https://github.com/Ombi-app/Ombi/commit/97cc42ffa8672e7d0d0996b5fbda7f7fe699da2d))
* **discover:** :children_crossing: Improved the new Genre buttons, it now includes TV results ([b087d60](https://github.com/Ombi-app/Ombi/commit/b087d606ff36565208e564f8856903f2a4098db5))
* **lidarr:** Change monitor to Existing to properly add artist [#3597](https://github.com/Ombi-app/Ombi/issues/3597) ([506f607](https://github.com/Ombi-app/Ombi/commit/506f60773bf1031d0be51ccd34289b855a04ea40)), closes [/github.com/Lidarr/Lidarr/issues/3597#issuecomment-1530804055](https://github.com//github.com/Lidarr/Lidarr/issues/3597/issues/issuecomment-1530804055)



# [4.37.0](https://github.com/Ombi-app/Ombi/compare/v4.36.1...v4.37.0) (2023-04-24)


Expand Down Expand Up @@ -359,12 +370,3 @@



## [4.27.6](https://github.com/Ombi-app/Ombi/compare/v4.27.5...v4.27.6) (2022-10-01)


### Bug Fixes

* **notifications:** Fixed the error when sending multiple test notifications. Added more logging when Discord complains the message is invalid ([fc14780](https://github.com/Ombi-app/Ombi/commit/fc14780bd354483119ddcbb55a8c382e1890a783))



80 changes: 47 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -407,14 +407,21 @@ Here are some of the features Ombi has:
<sub><b>Abe Kline</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/aj3x">
<img src="https://avatars.githubusercontent.com/u/15078358?v=4" width="50;" alt="aj3x"/>
<br />
<sub><b>Alexander Russell</b></sub>
</a>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/XanderStrike">
<img src="https://avatars.githubusercontent.com/u/1565303?v=4" width="50;" alt="XanderStrike"/>
<br />
<sub><b>Alexander Standke</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/Alasano">
<img src="https://avatars.githubusercontent.com/u/14372930?v=4" width="50;" alt="Alasano"/>
Expand Down Expand Up @@ -449,15 +456,15 @@ Here are some of the features Ombi has:
<br />
<sub><b>Chris Lees</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/cdemi">
<img src="https://avatars.githubusercontent.com/u/8025435?v=4" width="50;" alt="cdemi"/>
<br />
<sub><b>Christopher Demicoli</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/Codehhh">
<img src="https://avatars.githubusercontent.com/u/12055335?v=4" width="50;" alt="Codehhh"/>
Expand Down Expand Up @@ -492,22 +499,29 @@ Here are some of the features Ombi has:
<br />
<sub><b>Devin Buhl</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/elisspace">
<img src="https://avatars.githubusercontent.com/u/18365129?v=4" width="50;" alt="elisspace"/>
<br />
<sub><b>Eli</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/Fish2">
<img src="https://avatars.githubusercontent.com/u/2311734?v=4" width="50;" alt="Fish2"/>
<br />
<sub><b>Fish2</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Grygon">
<img src="https://avatars.githubusercontent.com/u/647846?v=4" width="50;" alt="Grygon"/>
<br />
<sub><b>Grygon</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/ketsapiwiq">
<img src="https://avatars.githubusercontent.com/u/26697460?v=4" width="50;" alt="ketsapiwiq"/>
Expand All @@ -528,7 +542,8 @@ Here are some of the features Ombi has:
<br />
<sub><b>Igor Borges</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/ImgBotApp">
<img src="https://avatars.githubusercontent.com/u/31427850?v=4" width="50;" alt="ImgBotApp"/>
Expand All @@ -542,8 +557,7 @@ Here are some of the features Ombi has:
<br />
<sub><b>Jacob Pyke</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/jamesmacwhite">
<img src="https://avatars.githubusercontent.com/u/8067792?v=4" width="50;" alt="jamesmacwhite"/>
Expand Down Expand Up @@ -571,7 +585,8 @@ Here are some of the features Ombi has:
<br />
<sub><b>Jon Bloom</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/jonocairns">
<img src="https://avatars.githubusercontent.com/u/182836?v=4" width="50;" alt="jonocairns"/>
Expand All @@ -585,8 +600,7 @@ Here are some of the features Ombi has:
<br />
<sub><b>Kris Klosterman</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/kmlucy">
<img src="https://avatars.githubusercontent.com/u/13952475?v=4" width="50;" alt="kmlucy"/>
Expand Down Expand Up @@ -614,7 +628,8 @@ Here are some of the features Ombi has:
<br />
<sub><b>Lucane</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/devbymadde">
<img src="https://avatars.githubusercontent.com/u/6094593?v=4" width="50;" alt="devbymadde"/>
Expand All @@ -628,8 +643,7 @@ Here are some of the features Ombi has:
<br />
<sub><b>Marley</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/mattmattmatt">
<img src="https://avatars.githubusercontent.com/u/927830?v=4" width="50;" alt="mattmattmatt"/>
Expand Down Expand Up @@ -657,7 +671,8 @@ Here are some of the features Ombi has:
<br />
<sub><b>Miguel A Vico Moya</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/beast3334">
<img src="https://avatars.githubusercontent.com/u/20631046?v=4" width="50;" alt="beast3334"/>
Expand All @@ -671,8 +686,7 @@ Here are some of the features Ombi has:
<br />
<sub><b>Qiming Chen</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/rob1998">
<img src="https://avatars.githubusercontent.com/u/1560707?v=4" width="50;" alt="rob1998"/>
Expand Down Expand Up @@ -700,7 +714,8 @@ Here are some of the features Ombi has:
<br />
<sub><b>Shoghi</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/Teifun2">
<img src="https://avatars.githubusercontent.com/u/7461832?v=4" width="50;" alt="Teifun2"/>
Expand All @@ -714,8 +729,7 @@ Here are some of the features Ombi has:
<br />
<sub><b>Thomas Van Tilburg</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/Tim-Trott">
<img src="https://avatars.githubusercontent.com/u/8249434?v=4" width="50;" alt="Tim-Trott"/>
Expand Down Expand Up @@ -743,7 +757,8 @@ Here are some of the features Ombi has:
<br />
<sub><b>Travis Bybee</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/Xirg">
<img src="https://avatars.githubusercontent.com/u/6020502?v=4" width="50;" alt="Xirg"/>
Expand All @@ -757,8 +772,7 @@ Here are some of the features Ombi has:
<br />
<sub><b>Tim OBrien</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/x-limitless-x">
<img src="https://avatars.githubusercontent.com/u/17127926?v=4" width="50;" alt="x-limitless-x"/>
Expand Down Expand Up @@ -786,7 +800,8 @@ Here are some of the features Ombi has:
<br />
<sub><b>Dorian ALKOUM</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/echel0n">
<img src="https://avatars.githubusercontent.com/u/1128022?v=4" width="50;" alt="echel0n"/>
Expand All @@ -800,8 +815,7 @@ Here are some of the features Ombi has:
<br />
<sub><b>M4tta</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/maartenheebink">
<img src="https://avatars.githubusercontent.com/u/28894544?v=4" width="50;" alt="maartenheebink"/>
Expand All @@ -827,9 +841,10 @@ Here are some of the features Ombi has:
<a href="https://github.com/ryan-c44">
<img src="https://avatars.githubusercontent.com/u/54028283?v=4" width="50;" alt="ryan-c44"/>
<br />
<sub><b>ryan-c44</b></sub>
<sub><b>Ryan-c44</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/sir-marv">
<img src="https://avatars.githubusercontent.com/u/3598205?v=4" width="50;" alt="sir-marv"/>
Expand All @@ -843,8 +858,7 @@ Here are some of the features Ombi has:
<br />
<sub><b>Tdorsey</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/thegame3202">
<img src="https://avatars.githubusercontent.com/u/22148848?v=4" width="50;" alt="thegame3202"/>
Expand Down
4 changes: 2 additions & 2 deletions src/Ombi.Core/Senders/MusicSender.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private async Task<SenderResult> SendToLidarr(AlbumRequest model, LidarrSettings
addOptions = new Addoptions
{
monitored = true,
monitor = MonitorTypes.None,
monitor = MonitorTypes.Existing,
searchForMissingAlbums = false,
AlbumsToMonitor = new[] {model.ForeignAlbumId}
},
Expand Down Expand Up @@ -199,4 +199,4 @@ private async Task<SenderResult> SetupAlbum(AlbumRequest model, ArtistResult art
return new SenderResult { Message = "Could not set album to monitored", Sent = false, Success = false };
}
}
}
}
14 changes: 7 additions & 7 deletions src/Ombi.I18n/Resources/Texts.hu.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="NewAlbums" xml:space="preserve">
<value>New Albums</value>
<value>Új album</value>
</data>
<data name="NewMovies" xml:space="preserve">
<value>New Movies</value>
<value>Új film</value>
</data>
<data name="NewTV" xml:space="preserve">
<value>New TV</value>
<value>Új sorozat</value>
</data>
<data name="GenresLabel" xml:space="preserve">
<value>Műfaj:</value>
Expand All @@ -139,18 +139,18 @@
<value>Epizódok:</value>
</data>
<data name="PoweredBy" xml:space="preserve">
<value>Powered by</value>
<value>Biztosítja a(z)</value>
</data>
<data name="Unsubscribe" xml:space="preserve">
<value>Unsubscribe</value>
<value>Leiratkozás</value>
</data>
<data name="Album" xml:space="preserve">
<value>Album</value>
</data>
<data name="Movie" xml:space="preserve">
<value>Movie</value>
<value>Film</value>
</data>
<data name="TvShow" xml:space="preserve">
<value>TV Show</value>
<value>Sorozat</value>
</data>
</root>
4 changes: 2 additions & 2 deletions src/Ombi.I18n/Resources/Texts.nl.resx
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@
<value>Album</value>
</data>
<data name="Movie" xml:space="preserve">
<value>Movie</value>
<value>Film</value>
</data>
<data name="TvShow" xml:space="preserve">
<value>TV Show</value>
<value>TV-serie</value>
</data>
</root>
18 changes: 9 additions & 9 deletions src/Ombi.I18n/Resources/Texts.no.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,16 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="NewAlbums" xml:space="preserve">
<value>New Albums</value>
<value>Nye Album</value>
</data>
<data name="NewMovies" xml:space="preserve">
<value>New Movies</value>
<value>Nye filmer</value>
</data>
<data name="NewTV" xml:space="preserve">
<value>New TV</value>
<value>Nye TV-serier</value>
</data>
<data name="GenresLabel" xml:space="preserve">
<value>Genres:</value>
<value>Sjangere:</value>
</data>
<data name="AlbumTypeLabel" xml:space="preserve">
<value>Type:</value>
Expand All @@ -136,21 +136,21 @@
<value>Sesong:</value>
</data>
<data name="EpisodesLabel" xml:space="preserve">
<value>Episodes:</value>
<value>Episoder:</value>
</data>
<data name="PoweredBy" xml:space="preserve">
<value>Powered by</value>
<value>Drevet av</value>
</data>
<data name="Unsubscribe" xml:space="preserve">
<value>Unsubscribe</value>
<value>Avslutt abonnement</value>
</data>
<data name="Album" xml:space="preserve">
<value>Album</value>
</data>
<data name="Movie" xml:space="preserve">
<value>Movie</value>
<value>Film</value>
</data>
<data name="TvShow" xml:space="preserve">
<value>TV Show</value>
<value>TV-serie</value>
</data>
</root>
Loading

0 comments on commit 226796d

Please sign in to comment.