open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3389 Commits
64 Branches
180 Tags
341 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'fc9dcb1084'
${ noResults }
Commit Graph

1025 Commits (fc9dcb10843c9695ad524682f5734904a5495155)

Author SHA1 Message Date
Mark McDowall 27646310a1 Minor XML tweaks for Metadata
12 years ago
Mark McDowall 9a006fc702 Font-Awesomed System
12 years ago
Mark McDowall 8280561e11 User configurable RSS Sync Time
12 years ago
Mark McDowall 23f8f534fc TVDB numbering confusion fixed
12 years ago
Mark McDowall b2c4f0201c Better error message for import fails.
12 years ago
Mark McDowall a7a0a25029 Renamed AiredAfter to CustomStartDate
12 years ago
Mark McDowall 3061219367 EpisodeAiredAfter added to edit/editor
12 years ago
Mark McDowall 6c78187601 EpisodeAiredAfter added to AddSeries UI
12 years ago
Mark McDowall 713c4225c0 Added EpisodeAiredAfter to server side
12 years ago
Mark McDowall 760a40d61d Changed update URL
12 years ago
Mark McDowall 4cefc5323c Using TPL for feed downloading - more speed!
12 years ago
Mark McDowall f6952abf39 Newznab searching is better
12 years ago
Mark McDowall 23118871fd Added Recycle Bin to server side
12 years ago
Mark McDowall a7fd486b03 Change episode file quality
12 years ago
Mark McDowall d3ccd70470 Fixed broken tests... wtf was I doing?
12 years ago
Mark McDowall 4052db7502 Pneumatic added to client side
12 years ago
Mark McDowall 8b45714e59 Pneumatic wired up as download client
12 years ago
Mark McDowall 853f7689bc Pneumatic added to server side
12 years ago
Mark McDowall cc6011ec87 Organized tests for DiskScan and PostDownload
12 years ago
Mark McDowall 3cdd479bb4 Import video files from root of unsroted dir
12 years ago
Mark McDowall 39aa5065bb Merge branch 'release-group'
12 years ago
Mark McDowall 1ea27648e3 Newznab season and partial season searches
12 years ago
Mark McDowall bd44b2899a 3D bug with search history cleanup fixed
12 years ago
Mark McDowall c2a1df61f6 New: Max DB Size is now 512MB (was 256MB)
12 years ago
Mark McDowall 653a0864c3 Removed DM - Branched if required later.
12 years ago
Mark McDowall ad92ba1083 nzbs.org back to http only
12 years ago
Mark McDowall a48dbba015 Metadata won't be created when there no imported files
12 years ago
Mark McDowall 65df24988c Episodes will not be imported if disk space is low
12 years ago
Mark McDowall 67064ec495 Restrict nzbs based on release group, server side
12 years ago
Mark McDowall 0d40e2d43e Merge remote-tracking branch 'origin/master' into release-group
12 years ago
Mark McDowall 510d538c86 Added additional logging to metadata creation
12 years ago
Mark McDowall 6f3262c68a Release group is added to history and episodefile
12 years ago
Mark McDowall bee6914062 Allow scene name to be used for renaming
12 years ago
Mark McDowall 5053989332 Added plot back to episode... whoops.
12 years ago
markus101 ccfcea61b0 Fixed plot and rating for episodes
12 years ago
Mark McDowall d44c07b27b Fixed: History grid loads faster (lazy loaded)
12 years ago
Mark McDowall 4ca828db81 New: .strm files are now considered media files
12 years ago
Mark McDowall 8f1bf83f13 First aired is output properly
12 years ago
Mark McDowall 29b8d55355 Fixed up Genre
12 years ago
Mark McDowall 1b9c47da38 Cleaned up metadata output a bit
12 years ago
Mark McDowall c5e4b157f6 Fixed issue with episodeguide URL #ND-21
12 years ago
Mark McDowall 9d5c942cbf Force Refresh added to Series Editor
12 years ago
Mark McDowall 2982e79065 Empty directors and writers won't blowup
12 years ago
Mark McDowall c0b81a8971 Fixed broken tests
12 years ago
Mark McDowall 1d2cd49bde Metadata issues with renaming resolved
12 years ago
Mark McDowall f296f38742 Images in XML use the path to the image now.
12 years ago
Mark McDowall 56473244ab Logger blowing up unit tests
12 years ago
Mark McDowall 5c49ac6b29 Added metadata options to settings #ND-21
12 years ago
Mark McDowall 2e9cf66b57 Tweaks to XML and thumbs #ND-21
12 years ago
Mark McDowall b122f1135e Metadata will be called when needed #ND-21
12 years ago
Mark McDowall eee24aff1d Tests added
12 years ago
Mark McDowall b50e16a456 Metadata coming together for XBMC
13 years ago
Mark McDowall cc5b2c3e40 Initial commit for Metadata
13 years ago
Mark McDowall b7408b726a Added cleanup job for search history
13 years ago
Mark McDowall 4ea55444be Fixed: An issue with Episode Searches that had full season results
13 years ago
Mark McDowall 19ffd77754 Episode searches will be done in ascending order now.
13 years ago
Mark McDowall 3fdfa69b94 Updated tests for UpcomingProvider. #ND-45 fixed
13 years ago
Mark McDowall ac2f3399f0 New: Upcoming page is now broken down by day.
13 years ago
Mark McDowall edb0b3af86 SeasonSearchJob will do a partial search search and then individual searches, when it is still missing results (greater than 0, but all not found).
13 years ago
Mark McDowall 53ced94af9 Fixed: Issue with notifications when new episode filename did not contain the the quality.
13 years ago
Mark McDowall 92c6451bfc Initialze Newznab will delete any with a null/empty name or URL.
13 years ago
Mark McDowall d66f0eb052 Fixed: Recent startup issues for some users.
13 years ago
Mark McDowall 9ae7731aa3 Newznab Indexer should not cause everything to fail and we should get exceptions.
13 years ago
Mark McDowall 3468adf85c Removed extraneous dictionary, no dictception.
13 years ago
Mark McDowall 9048da1dd5 Rss feed paring will check for errors and give a better error if found.
13 years ago
Mark McDowall 7a80c81ffb New: Newznab providers will be rejected if they are not valid addresses.
13 years ago
Mark McDowall 20e99205f8 Fixed issue with tests.
13 years ago
Mark McDowall c59f1a537d Fixed: An issue with Season and Series searching crashing the JobProvider.
13 years ago
Mark McDowall f26ef627df New: Newznab will show indexer name and logo when possible.
13 years ago
Mark McDowall a16defc5f0 Newznab won't blow up if more than one indexer with the same URL is found during initialization.
13 years ago
Mark McDowall b930eb0993 Newznab providers will be compared based on url, not name.
13 years ago
Mark McDowall dec06e20d6 New: Nzbs.org removed, added as a default Newznab provider. (Please update your settings)
13 years ago
Mark McDowall 5aff4ab240 New: NzbInfoUrl added to history (link to NZB info at indexer) - Not supported for Womble's.
13 years ago
Mark McDowall b314ff5e82 Added NzbInfoUrl to indexers.
13 years ago
Mark McDowall ce0a6f8b86 NzbInfoUrl added to history and episode parse result, will be added to history item before being added to the DB.
13 years ago
Mark McDowall e8122685b2 SendEmail will catch any errors thrown in Send, so Notifications don't blow up. It will also log additional details.
13 years ago
Mark McDowall b626dc2435 SmtpProvider will throw on exceptions, instead of returning false.
13 years ago
Mark McDowall 2a8fab7ef9 Fixed: Episode Overview is trimmed down more to prevent being to large.
13 years ago
Mark McDowall a1fa6287c7 New: Basic stats on your library. View at: /System/Stats
13 years ago
Mark McDowall 6c0ff71cde Cleanup drop folder will treat moves as new downloads, so notifications will go out (otherwise the user gets nothing).
13 years ago
Mark McDowall 724e354eee Fixed bug with RSS Item TIitle.
13 years ago
Mark McDowall 5422350afd Unit tests for SearchHistory added.
13 years ago
Mark McDowall 38927e3ca1 Signalr errors will not be shown in the UI.
13 years ago
Mark McDowall 06df8a86b6 Forced downloads now have episode titles.
13 years ago
Mark McDowall cef7b6a8dc SearchResult Controller added.
13 years ago
Mark McDowall 4f005e45c0 Search Results grid added.
13 years ago
Mark McDowall c7f8f57f77 Episode searching now stores the results of the tests.
13 years ago
Mark McDowall 47a225c264 Fixed: Issue preventing some users from using Womble's Index.
13 years ago
Mark McDowall eb0c75061d Fixed: NzbClub nzb URL.
13 years ago
Mark McDowall ffaae13680 Fixed: Twitter download complete message grammar.
13 years ago
Mark McDowall aec59de6b6 Exceptions when checking SAB's queue are now caught.
13 years ago
Mark McDowall c0d1d2c502 Fix: Successful downloads that are not moved properly should be retried.
13 years ago
Mark McDowall 5650f891ee Added some additional logging around sizing.
13 years ago
Mark McDowall 733ebe3cfa Renamed misnamed Decision Engine files
13 years ago
Mark McDowall 4947252f93 New: AirTime will be shown in Series grid details.
13 years ago
Mark McDowall a947cd2743 New: Added NzbClub.com as an indexer, enabled by default
13 years ago
Mark McDowall 3a8f40511d New: Added NzbIndex.nl as an indexer, enabled by default
13 years ago
Mark McDowall 55cbc59887 Fixed: Search failure is more friendly.
13 years ago
Mark McDowall 89691f923b Fixed images for FST and Wombles.
13 years ago
Mark McDowall c5367624ea New: Added FileSharingTalk indexer.
13 years ago
Mark McDowall 82ddd34483 New: Womble's Index
13 years ago
Mark McDowall 399b50ec8e Truncating TvDb Overviews actually works. Stupid Recaps.
13 years ago
Mark McDowall c9fcde3bbb Fix: Email notification testing.
13 years ago
Mark McDowall d79fa1c2cd Fix: Episode Overview will be trimmed if it is too long.
13 years ago
kay.one 34054f2178 New: Added support for .M4V extensions.
13 years ago
Mark McDowall 74105974dd New: Added test button to SABnzbd.
13 years ago
Mark McDowall c8f1bccc50 Removed Progress Notification from BannerProvider.
13 years ago
Mark McDowall 861f6c1a0c Fixed broken tests.
13 years ago
Mark McDowall a00c20c1af Fixed spelling of enviroment provider (Environment). :)
13 years ago
Mark McDowall 5764059f1d New: Banner will be deleted when series is deleted.
13 years ago
Mark McDowall e8be045d12 Fix: Newzbin will no longer include Full DVD releases, or other non-standard formats.
13 years ago
Mark McDowall 64a913fb8e Fix: Newzbin custom parser will now reject full DVD reports.
13 years ago
kay.one 6d7e886e8c Minor CSS update
13 years ago
Mark McDowall 6375df058e Fix: NzbMatrix report age is now parsed properly.
13 years ago
Mark McDowall 4d918ff683 New: Added Network to Series Grid.
13 years ago
Mark McDowall 1f24e87421 Fix: Deleted files were always ignored when deleted, ignoring AutoIgnorePreviouslyDownloadedEpisodes setting.
13 years ago
Mark McDowall 03a7643b75 SignalR will now update quality in UI as well (when applicable)
13 years ago
kay.one c5df00cc87 Fixed: fixed an issue where season ignore check wasn't working correctly.
13 years ago
kay.one ada0a3bfbc updated indexer error logging
13 years ago
Mark McDowall 783f32a849 Fix: Newznab will now use the NZB download link properly.
13 years ago
kay.one 2303a02a06 Fixed: Fixed issue where NzbMatrix servers would die if series title started with 'the'
13 years ago
Mark McDowall ea65f5836c PendingMapping Editor added to Services.
13 years ago
Mark McDowall 01746a06e0 Fixed Series/Details Quality column.
13 years ago
kay.one 11db27f6ac Better check against internal server error exceptions during unit tests.
13 years ago
kay.one 3b18c9f621 Removed single episode rename button
13 years ago
Mark McDowall 0ff60bde92 Mass edit is now Series Editor.
13 years ago
Mark McDowall a12dcfd501 Deleting a series will now delete the coresponding seasons.
13 years ago
Mark McDowall 6116fdb032 Merge branch 'season-ignore'
13 years ago
kay.one 7e38afc838 Logging/Download notification tweaks.
13 years ago
kay.one e0f901dbe7 Fixed an issue where publish date could not be parsed for rss items.
13 years ago
Mark McDowall 219ea364a9 More unit tests for Plex notifications.
13 years ago
Mark McDowall 6e767eafab New: Added Plex to Notifications, allowing notifications and library updates.
13 years ago
Mark McDowall aac42d4882 More Season ignore work. Already ignored seasons will be ignored.
13 years ago
Mark McDowall 969f8ae5e2 SeasonProvider Added to handle ignoring of Seasons.
13 years ago
kay.one 9d126e54c9 New: Added support for limited retention. Reports older than the configured retention are skipped.
13 years ago
Mark McDowall d8957a85ef Small tweak in SignalR dependency injection.
13 years ago
Mark McDowall c739b3e132 Update clients when new episode is imported (ready).
13 years ago
Mark McDowall f19721912b SignalR added to provide realtime episode status updates. (Series/Details and Downloading only currently)
13 years ago
kay.one ac84d76ef9 New: When searching for episodes, newer reports are given priority over older reports of equal quality.
13 years ago
Mark McDowall 5bf56ffca3 Age parsing added to the indexers.
13 years ago
Mark McDowall 462eb53897 Retention check added to DecisionEngine.
13 years ago
kay.one 6851e2ae9d Fixed broken test
13 years ago
kay.one 890b8b1c2c updated analytics
13 years ago
kay.one e5fa098d66 deskmetrics doesn't report during dev.
13 years ago
kay.one 90e5e8eef3 deskmetrics doesn't report during dev.
13 years ago
kay.one 05df752cc8 Fix: Downgraded some log levels for less verbose logging
13 years ago
kay.one 83aa6330d1 Minor cleanups.
13 years ago
Mark McDowall 1abeef7239 Fix: Episode naming for files with multiple episodes.
13 years ago
kay.one 659b3dee55 Improved: Upcoming episodes page no longer shows series that aren't monitored.
13 years ago
kay.one 6df184b7cb New: All setting values are cached for better responsiveness.
13 years ago
Mark McDowall cc8f8bec06 Fixed bracket in logging message.
13 years ago
Mark McDowall 308fd11c83 Fix: Series Titles with apostrophes when searched on NzbMatrix will now return valid results.
13 years ago
Mark McDowall 2a6f02be17 Added additional logging to PostDownloadProvider.
13 years ago
kay.one 5ecbdd3e64 Package cleanup
13 years ago
Mark McDowall 7ae751371d Fix: Growl will now work for notifying on grab/download.
13 years ago
kay.one 5717b7f596 New: Rewrite of download decision engine.
13 years ago
Mark McDowall a168bdfa00 Merge branch 'overview-grid'
13 years ago
Mark McDowall 93355a4ae1 Upcoming grid NzbDroned. Bye Telerik Grid.
13 years ago
kay.one 26242d7dde Fixed rebase issues.
13 years ago
kay.one 174f765ec9 New: NzbDrone service to automatically report errors and episode parse issues.
13 years ago
kay.one 9fcb3a4573 Improved: Episodes that are in the future AND have no title will not be added to db (place holder episodes in TVDB)
13 years ago
kay.one 02a3b38210 Added service integration tests.
13 years ago
kay.one 65417bd8ec Fixed: Multipart episodes are now added to sab queue using single episode title only.
13 years ago
kay.one 44d6d20bd6 Deskmetrics will not report any data unless using the master branch.
13 years ago
Mark McDowall 249e6d7c4b Fixed DateTime parsing in SeriesProvider.CleanAirsTime, will now suppress failures because TheTvDb has random data.
13 years ago
Mark McDowall a96ff2519a New: Blackhole implemented, allowing clients other than SABnzbd to be used.
13 years ago
Mark McDowall d670e45001 DownloadClient added to the UI, it still will only download via Sabnzbd.
13 years ago
kay.one 2009693787 Fix: Indexers that are enabled but aren't configured correctly will be skipped during rss/search
13 years ago
kay.one feb4ef969e Fixed: Issue where daily episodes/full season releases would break sab queue check.
13 years ago
kay.one 68e1a0bc4d Fixed: Fixed issue where an unknown episode/item in the queue would crash CheckQueue.
13 years ago
Mark McDowall 2bf97fd76f Fix: Size will be displayed in best format when rejected (instead of bytes). It will also be displayed as info so it shows in the normal log.
13 years ago
kay.one 207ea607a7 Fixed spacing in episode search notification.
13 years ago
kay.one b58fe89ce4 analytics will not leak exceptions while in production.
13 years ago
Mark McDowall 1990f5ab8c Removed try/catch from CreateBackupZip.
13 years ago
Mark McDowall 8ce6e8a08e Cleaned up Backup.
13 years ago
Mark McDowall 93ee97123f System/Backup will backup Config.xml and NzbDrone.sdf to a zip file for the client to download.
13 years ago
kay.one 340f05aef4 Fixed broken tests, DeskMetrics now has a different id during dev and production.
13 years ago
kay.one 7a83a46d31 Added integration to deskmetrics
13 years ago
kay.one b225db9aaf Started to add support for deskmetrics
13 years ago
Mark McDowall 02cb12bdb8 BacklogSetting refactoring.
13 years ago
Mark McDowall 6772db7e69 EpisodesWithoutFiles returns Series.* instead of Series.Title only.
13 years ago
Mark McDowall 9eb022fdf4 BacklogStatus added to individually control which series are included in backlog searches. Applies to Backlog and RecentBacklog jobs. Editable in Series/MassEdit and Series Edit.
13 years ago
Mark McDowall fb17765d3a Fixed issues with searching and the results being filtered before the SearchProvider could properly handle them.
13 years ago
Mark McDowall 413991485f Spelling fixed.
13 years ago
Mark McDowall 197979ea3c QualityParseTest will accept bool IsProper as a parameter.
13 years ago
kay.one d6d1bbe3f5 Tweaked Progress notification.
13 years ago
kay.one 2875832db0 Made search notifications a bit more friendly ;)
13 years ago
kay.one ead5f37921 Directory write time is now calculated based on the most recent file write to any file inside of that directory.
13 years ago
kay.one 63bef2de31 Fixed more queue issue.
13 years ago
Mark McDowall baa0b8df67 Series Grid won't show series that haven't been completely added (LastInfoSync is null).
13 years ago
kay.one 5e3e071692 Added a duplicated item to Queue.txt, reformated existing json sample files.
13 years ago
Mark McDowall 03dc4a5602 Fixed typo.
13 years ago
Mark McDowall c0542449a4 Added additional logging to episode searching.
13 years ago
Mark McDowall d5e62bc70b Files will be tagged with Proper when append quality is enabled and episode is a proper.
13 years ago
kay.one 481a8ceb97 restored a change that wasn't needed after queue json fix.
13 years ago
Mark McDowall 7b14da9b17 Fixed GetQueue and GetHistory.
13 years ago
Mark McDowall e885fadc59 Added MassEdit for series editing.
13 years ago
kay.one b498c242af Fixed QueueEmpty.txt json file.
13 years ago
kay.one 0276fa12f0 Fixed an issue where a none-paused empty queue would throw.
13 years ago
kay.one 78268f3c58 Better parser logging.
13 years ago
kay.one 9d90f04b6e Added Linq post filtering to indexer searches.
13 years ago
kay.one 7483d5d3a5 Added sab queue check for multiepisodes.
13 years ago
kay.one 9acfb7330c Check sab queue now takes quality into consideration
13 years ago
Mark McDowall e7b8ae4520 Nzbs.org will search for individual episodes with less strict terms.
13 years ago
kay.one d967d4198c Duplicated root folders are now blocked.
13 years ago
kay.one 7c6d745c86 You can no longer add root folders that don't already exist.
13 years ago
kay.one 9406ca9cf5 Better exception data for feed errors.
13 years ago
Mark McDowall b4eed1a657 SabProvider now gets JSON instead of XML for history and queue.
13 years ago
Mark McDowall 26c4240a6b SabProvider can now get the entire Queue for additional processing.
13 years ago
Mark McDowall 34206fc308 Renamed to skipHistory to make it more clear.
13 years ago
Mark McDowall 20c1639ada Added pre-search check for EpisodeSearch to see if an upgrade is possible, before attempting.
13 years ago
Mark McDowall d1262f1ced No longer checking history when doing a manual search.
13 years ago
kay.one 4da2e1cb72 Episode auto-ignore is now done in realtime rather than using a job.
13 years ago
Mark McDowall 218059e08d Added the ability to auto-ignore episodes for files that are deleted, good for people that delete after watching. Option is not exposed in the UI and is disabled by default (obviously).
13 years ago
kay.one 8f4f863631 Turning off tagging folder for now, to stop messing people's series folders
13 years ago
Mark McDowall 11b6720cd1 Backlog searching will be disabled by default. Option is available in Settings/Misc
13 years ago
Mark McDowall 3e9593ba3b SabProvider will use Series.Title instead of the series Path, it is first cleaned by MediaFileProvide.CleanName().
13 years ago
Mark McDowall 7ff53e5ac2 Season 1, Episode 0 will not be automatically ignored (usually a pilot), with test.
13 years ago
Mark McDowall dfbb222c6c Changed the second .xvid to .divx.
13 years ago
Mark McDowall f2984d9430 ts and ogm files will now be scanned.
13 years ago
kay.one e8e0e8e5dc Adding series with a ID of 0 is now blocked.
13 years ago
Mark McDowall ad4afbcb6d DailySeries now use the JSON API instead of the CSV file.
13 years ago
Mark McDowall afb8305c00 SceneMapping will use the JSON API instead of CSV file now.
13 years ago
Mark McDowall 5f0c03d69d Bug: Fixed ND-9, no longer strip out * from SABnzbd categories, * is Default.
13 years ago
Mark McDowall b52585d62a XbmcProvider will use the HTTP API when updating the library for Eden clients (EventServer was failing).
13 years ago
kay.one 721bb51886 logging updates.
13 years ago
kay.one 7ec89056af Auto adding of episodes is now disabled. (we should make it more conservative if we want to bring it back)
13 years ago
Mark McDowall a3f2ef6ec6 Added some logging and error handling to XbmcProvider.
13 years ago
Mark McDowall 62da0568c0 AfterRename will now call AfterRename for each external notifier instead of OnRename.... C+P Fail.
13 years ago
Mark McDowall e734bb6ecb ExternalNotification now has AfterRename, to notify (XBMC) after all episodes have been renamed.
13 years ago
Mark McDowall 348397e442 Fixed method call.
13 years ago
Mark McDowall 62a24ef900 Increased XBMC JSON API timeout to 10 seconds.
13 years ago
Mark McDowall 3dce784672 XbmcProvider uses Json.net for reading/writing JSON.
13 years ago
Mark McDowall b8559ccec3 Added hidden option to allow updating of XBMC even if video is playing.
13 years ago
Mark McDowall e4985cbd66 Moved try/catch for failed refresh episode info to job.
13 years ago
Mark McDowall ffde7c0987 Log indexer name when failing to process feed.
13 years ago
Mark McDowall 6bd0b8a39e Added additional logging when updating episode info.
13 years ago
Mark McDowall 2cc066ccf2 GetActivePlayers will now work with Eden and Dharma.
13 years ago
Mark McDowall 86c5e73f81 DailySeries.CSV now has series name along with series Id.
13 years ago
Mark McDowall 77bf257132 GetEpisodesByParseResult will log a warning when an episode is daily, but series isn't.
13 years ago
Mark McDowall 50e91c0043 Replaced get and post with ajax to prevent XSRF.
13 years ago
kay.one ab29a114d1 newzbing now uses HTTPS.
13 years ago
Mark McDowall 1c06ee2a01 PathEquals is used for MoveEpisodeFile.
13 years ago
kay.one 98e8f4361e Better logging for auto adding new episodes.
13 years ago
Mark McDowall 1c99541731 Do not rename episodeFiles if the source and destination are the same (file is already named correctly).
13 years ago
Mark McDowall 2856c3dca3 Added more logging DiskScanProvider.CleanUp.
13 years ago
kay.one bfe4de7a08 Fixed some issue around path normalization.
13 years ago
kay.one e269494ff8 ParseSeriesName will now return normalized version of the title if it doesn't match any predefined
13 years ago
Mark McDowall 58abb6fbc2 SearchForSeries won't fail if an apostrophe is used in the search term (Let's PetaPoco handle building the query, as it should).
13 years ago
kay.one 6f9aaa1145 Merge branch 'markus' into kay.one
13 years ago