diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..930429ee4 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,22 @@ +# Auto detect text files and perform LF normalization +* text eol=lf + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/Logo/64.png b/Logo/64.png index 8ef72896e..e69f8c7f2 100644 Binary files a/Logo/64.png and b/Logo/64.png differ diff --git a/Logo/twitter.banner.fw.png b/Logo/twitter.banner.fw.png index 83c839d77..1a59f5626 100644 Binary files a/Logo/twitter.banner.fw.png and b/Logo/twitter.banner.fw.png differ diff --git a/Logo/twitter.fw.png b/Logo/twitter.fw.png index c722627ce..bae6aaa2e 100644 Binary files a/Logo/twitter.fw.png and b/Logo/twitter.fw.png differ diff --git a/Logo/twitter.wall.fw.png b/Logo/twitter.wall.fw.png index 2c26ea0c3..2aab2f8f4 100644 Binary files a/Logo/twitter.wall.fw.png and b/Logo/twitter.wall.fw.png differ diff --git a/debian/copyright b/debian/copyright index cf281685c..ba00a43b6 100755 --- a/debian/copyright +++ b/debian/copyright @@ -1,24 +1,24 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: nzbdrone -Source: https://github.com/NzbDrone/NzbDrone - -Files: * -Copyright: 2010-2013 NzbDrone - -License: GPL-3.0+ - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: nzbdrone +Source: https://github.com/NzbDrone/NzbDrone + +Files: * +Copyright: 2010-2013 NzbDrone + +License: GPL-3.0+ + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/install b/debian/install index 106b06a9b..1810b9185 100755 --- a/debian/install +++ b/debian/install @@ -1 +1 @@ -nzbdrone_bin/* opt/NzbDrone +nzbdrone_bin/* opt/NzbDrone diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe index c296edf17..809940471 100644 Binary files a/src/.nuget/NuGet.exe and b/src/.nuget/NuGet.exe differ diff --git a/src/Libraries/Interop.NetFwTypeLib.dll b/src/Libraries/Interop.NetFwTypeLib.dll index 7eae191e5..97af3156d 100644 Binary files a/src/Libraries/Interop.NetFwTypeLib.dll and b/src/Libraries/Interop.NetFwTypeLib.dll differ diff --git a/src/Libraries/Manifest Tool/mt.exe b/src/Libraries/Manifest Tool/mt.exe index a8bf42088..547cf3f39 100644 Binary files a/src/Libraries/Manifest Tool/mt.exe and b/src/Libraries/Manifest Tool/mt.exe differ diff --git a/src/Libraries/Sqlite/System.Data.SQLite.dll b/src/Libraries/Sqlite/System.Data.SQLite.dll index 3bea57696..7d48349b0 100644 Binary files a/src/Libraries/Sqlite/System.Data.SQLite.dll and b/src/Libraries/Sqlite/System.Data.SQLite.dll differ diff --git a/src/Libraries/Sqlite/sqlite3.dll b/src/Libraries/Sqlite/sqlite3.dll index 2d241c4ec..33dd99852 100644 Binary files a/src/Libraries/Sqlite/sqlite3.dll and b/src/Libraries/Sqlite/sqlite3.dll differ diff --git a/src/NzbDrone.Core.Test/Files/Media/H264_sample.mp4 b/src/NzbDrone.Core.Test/Files/Media/H264_sample.mp4 index 35bc6b353..c9d74ad9b 100644 Binary files a/src/NzbDrone.Core.Test/Files/Media/H264_sample.mp4 and b/src/NzbDrone.Core.Test/Files/Media/H264_sample.mp4 differ diff --git a/src/NzbDrone.Core.Test/Files/TestArchive.zip b/src/NzbDrone.Core.Test/Files/TestArchive.zip index 05043ba49..9264491ef 100644 Binary files a/src/NzbDrone.Core.Test/Files/TestArchive.zip and b/src/NzbDrone.Core.Test/Files/TestArchive.zip differ diff --git a/src/NzbDrone.Core.Test/TvTests/RefreshEpisodeServiceFixture.cs b/src/NzbDrone.Core.Test/TvTests/RefreshEpisodeServiceFixture.cs index bb89e1a8c..ad65afdbd 100644 Binary files a/src/NzbDrone.Core.Test/TvTests/RefreshEpisodeServiceFixture.cs and b/src/NzbDrone.Core.Test/TvTests/RefreshEpisodeServiceFixture.cs differ diff --git a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/AddSeriesFixture.cs b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/AddSeriesFixture.cs index ab33ff072..36b7163bf 100644 Binary files a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/AddSeriesFixture.cs and b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/AddSeriesFixture.cs differ diff --git a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateSeriesFixture.cs b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateSeriesFixture.cs index 5d507967e..49b1fb4e4 100644 Binary files a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateSeriesFixture.cs and b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateSeriesFixture.cs differ diff --git a/src/NzbDrone.Core/MediaInfo.dll b/src/NzbDrone.Core/MediaInfo.dll index 177857717..8a17e7d19 100644 Binary files a/src/NzbDrone.Core/MediaInfo.dll and b/src/NzbDrone.Core/MediaInfo.dll differ diff --git a/src/UI/Content/FontAwesome/FontAwesome.otf b/src/UI/Content/FontAwesome/FontAwesome.otf index 70125459f..8d40fd1b4 100644 Binary files a/src/UI/Content/FontAwesome/FontAwesome.otf and b/src/UI/Content/FontAwesome/FontAwesome.otf differ diff --git a/src/UI/Content/FontAwesome/fontawesome-webfont.ttf b/src/UI/Content/FontAwesome/fontawesome-webfont.ttf index d36592469..ff88be998 100644 Binary files a/src/UI/Content/FontAwesome/fontawesome-webfont.ttf and b/src/UI/Content/FontAwesome/fontawesome-webfont.ttf differ diff --git a/src/UI/Content/Images/404.png b/src/UI/Content/Images/404.png index 2d6af058a..e881d15fc 100644 Binary files a/src/UI/Content/Images/404.png and b/src/UI/Content/Images/404.png differ diff --git a/src/UI/Content/Images/black_linen_v2.png b/src/UI/Content/Images/black_linen_v2.png index d125b4b8a..f4f438a70 100644 Binary files a/src/UI/Content/Images/black_linen_v2.png and b/src/UI/Content/Images/black_linen_v2.png differ diff --git a/src/UI/Content/Images/logo.png b/src/UI/Content/Images/logo.png index 7916facc4..522d8679e 100644 Binary files a/src/UI/Content/Images/logo.png and b/src/UI/Content/Images/logo.png differ diff --git a/src/UI/Content/Images/pattern.png b/src/UI/Content/Images/pattern.png index 2cff01c76..4aa25eeca 100644 Binary files a/src/UI/Content/Images/pattern.png and b/src/UI/Content/Images/pattern.png differ diff --git a/src/UI/Content/Images/touch/114.png b/src/UI/Content/Images/touch/114.png index 0b7f064c8..cdb019f80 100644 Binary files a/src/UI/Content/Images/touch/114.png and b/src/UI/Content/Images/touch/114.png differ diff --git a/src/UI/Content/Images/touch/144.png b/src/UI/Content/Images/touch/144.png index a411a72f8..b2e55153f 100644 Binary files a/src/UI/Content/Images/touch/144.png and b/src/UI/Content/Images/touch/144.png differ diff --git a/src/UI/Content/Images/touch/57.png b/src/UI/Content/Images/touch/57.png index fd482077f..956e9ed12 100644 Binary files a/src/UI/Content/Images/touch/57.png and b/src/UI/Content/Images/touch/57.png differ diff --git a/src/UI/Content/Images/touch/72.png b/src/UI/Content/Images/touch/72.png index 1d27c4434..3dec70ac1 100644 Binary files a/src/UI/Content/Images/touch/72.png and b/src/UI/Content/Images/touch/72.png differ diff --git a/src/UI/Content/fonts/opensans-light.ttf b/src/UI/Content/fonts/opensans-light.ttf index 0d381897d..316dcf431 100644 Binary files a/src/UI/Content/fonts/opensans-light.ttf and b/src/UI/Content/fonts/opensans-light.ttf differ diff --git a/src/UI/Content/fonts/opensans-regular.ttf b/src/UI/Content/fonts/opensans-regular.ttf index db433349b..79a43850d 100644 Binary files a/src/UI/Content/fonts/opensans-regular.ttf and b/src/UI/Content/fonts/opensans-regular.ttf differ diff --git a/src/UI/Content/fonts/opensans-semibold.eot b/src/UI/Content/fonts/opensans-semibold.eot index 55d28c378..05925a3ff 100644 Binary files a/src/UI/Content/fonts/opensans-semibold.eot and b/src/UI/Content/fonts/opensans-semibold.eot differ diff --git a/src/UI/Content/fonts/opensans-semibold.ttf b/src/UI/Content/fonts/opensans-semibold.ttf index 1a7679e39..fc60fa28c 100644 Binary files a/src/UI/Content/fonts/opensans-semibold.ttf and b/src/UI/Content/fonts/opensans-semibold.ttf differ