From 74df31f6347ad5a7579902e272ca443b8074e1f9 Mon Sep 17 00:00:00 2001 From: Denis <146707790+dnzbk@users.noreply.github.com> Date: Thu, 25 Apr 2024 11:14:36 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=C2=96ncrease=20develop=20version=20to=2024?= =?UTF-8?q?.1=20(#241)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- configure.ac | 2 +- nzbget.vcxproj | 8 ++++---- osx/NZBGet-Info.plist | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5a5d1da..cf63d660 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set_property(GLOBAL PROPERTY PACKAGE) set_property(GLOBAL PROPERTY LIBS) set_property(GLOBAL PROPERTY INCLUDES) -set(VERSION "24.0") +set(VERSION "24.1") set(PACKAGE "nzbget") set(PACKAGE_BUGREPORT "https://github.com/nzbgetcom/nzbget/issues") set(CMAKE_CXX_STANDARD 14) diff --git a/configure.ac b/configure.ac index 5966bc22..a91dfa8d 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.65) -AC_INIT(nzbget, 24.0, https://github.com/nzbgetcom/nzbget/issues) +AC_INIT(nzbget, 24.1, https://github.com/nzbgetcom/nzbget/issues) AC_CONFIG_AUX_DIR(posix) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([foreign subdir-objects]) diff --git a/nzbget.vcxproj b/nzbget.vcxproj index 51f103bc..f2944ba2 100755 --- a/nzbget.vcxproj +++ b/nzbget.vcxproj @@ -85,7 +85,7 @@ Disabled C:\vcpkg\installed\x86-windows-static\include;..\bin\Debug32;.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;.\lib\regex;%(AdditionalIncludeDirectories) - WIN32;PACKAGE="nzbget";VERSION="24.0";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) + WIN32;PACKAGE="nzbget";VERSION="24.1";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebug @@ -107,7 +107,7 @@ Disabled C:\vcpkg\installed\x64-windows-static\include;..\bin\Debug64;.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\regex;.\lib\par2;.\lib\yencode;.\windows\resources;%(AdditionalIncludeDirectories) - WIN32;PACKAGE="nzbget";VERSION="24.0";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) + WIN32;PACKAGE="nzbget";VERSION="24.1";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebug @@ -133,7 +133,7 @@ C:\vcpkg\installed\x86-windows-static\include;..\bin\Release32;.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;.\lib\regex;%(AdditionalIncludeDirectories) - WIN32;PACKAGE="nzbget";VERSION="24.0";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) + WIN32;PACKAGE="nzbget";VERSION="24.1";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) Sync MultiThreaded Use @@ -172,7 +172,7 @@ C:\vcpkg\installed\x64-windows-static\include;..\bin\Release64;.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;.\lib\regex;%(AdditionalIncludeDirectories) - WIN32;PACKAGE="nzbget";VERSION="24.0";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) + WIN32;PACKAGE="nzbget";VERSION="24.1";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) Sync MultiThreaded Use diff --git a/osx/NZBGet-Info.plist b/osx/NZBGet-Info.plist index fb284b5c..1dd438f3 100644 --- a/osx/NZBGet-Info.plist +++ b/osx/NZBGet-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 24.0 + 24.1 CFBundleDocumentTypes From 2a39a524788efe8bb6f0c6460fed6fdbffcbed0c Mon Sep 17 00:00:00 2001 From: parnic Date: Thu, 25 Apr 2024 22:52:06 -0500 Subject: [PATCH 2/3] Fix style when hosting in a subdir (#242) - Fixes the material icons not loading when nzbget is hosted under a subdirectory (e.g. when using a reverse proxy). Co-authored-by: NZBGet daemon user --- webui/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webui/style.css b/webui/style.css index 62ef8e18..2275387a 100644 --- a/webui/style.css +++ b/webui/style.css @@ -26,7 +26,7 @@ html { font-style: normal; font-weight: 100 700; src: local('material-icons'), - url(/lib/material-icons.woff2) format('woff2'), + url(lib/material-icons.woff2) format('woff2'), } .material-icon { From 3f8edcd7a081f2f6a8243c80ff45f3cb3d1c2fe7 Mon Sep 17 00:00:00 2001 From: dnzbk Date: Fri, 26 Apr 2024 11:48:56 +0300 Subject: [PATCH 3/3] revert to v24.0 --- CMakeLists.txt | 2 +- configure.ac | 2 +- nzbget.vcxproj | 8 ++++---- osx/NZBGet-Info.plist | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf63d660..f5a5d1da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set_property(GLOBAL PROPERTY PACKAGE) set_property(GLOBAL PROPERTY LIBS) set_property(GLOBAL PROPERTY INCLUDES) -set(VERSION "24.1") +set(VERSION "24.0") set(PACKAGE "nzbget") set(PACKAGE_BUGREPORT "https://github.com/nzbgetcom/nzbget/issues") set(CMAKE_CXX_STANDARD 14) diff --git a/configure.ac b/configure.ac index a91dfa8d..5966bc22 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.65) -AC_INIT(nzbget, 24.1, https://github.com/nzbgetcom/nzbget/issues) +AC_INIT(nzbget, 24.0, https://github.com/nzbgetcom/nzbget/issues) AC_CONFIG_AUX_DIR(posix) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([foreign subdir-objects]) diff --git a/nzbget.vcxproj b/nzbget.vcxproj index f2944ba2..51f103bc 100755 --- a/nzbget.vcxproj +++ b/nzbget.vcxproj @@ -85,7 +85,7 @@ Disabled C:\vcpkg\installed\x86-windows-static\include;..\bin\Debug32;.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;.\lib\regex;%(AdditionalIncludeDirectories) - WIN32;PACKAGE="nzbget";VERSION="24.1";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) + WIN32;PACKAGE="nzbget";VERSION="24.0";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebug @@ -107,7 +107,7 @@ Disabled C:\vcpkg\installed\x64-windows-static\include;..\bin\Debug64;.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\regex;.\lib\par2;.\lib\yencode;.\windows\resources;%(AdditionalIncludeDirectories) - WIN32;PACKAGE="nzbget";VERSION="24.1";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) + WIN32;PACKAGE="nzbget";VERSION="24.0";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebug @@ -133,7 +133,7 @@ C:\vcpkg\installed\x86-windows-static\include;..\bin\Release32;.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;.\lib\regex;%(AdditionalIncludeDirectories) - WIN32;PACKAGE="nzbget";VERSION="24.1";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) + WIN32;PACKAGE="nzbget";VERSION="24.0";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) Sync MultiThreaded Use @@ -172,7 +172,7 @@ C:\vcpkg\installed\x64-windows-static\include;..\bin\Release64;.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;.\lib\regex;%(AdditionalIncludeDirectories) - WIN32;PACKAGE="nzbget";VERSION="24.1";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) + WIN32;PACKAGE="nzbget";VERSION="24.0";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions) Sync MultiThreaded Use diff --git a/osx/NZBGet-Info.plist b/osx/NZBGet-Info.plist index 1dd438f3..fb284b5c 100644 --- a/osx/NZBGet-Info.plist +++ b/osx/NZBGet-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 24.1 + 24.0 CFBundleDocumentTypes