From de5bf21d8ab418b9028361d96e10eaaa5859f790 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 17 Jan 2020 15:06:46 -0600 Subject: [PATCH 1/2] fix eslint --- web/skins/classic/views/js/filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js index 4444db954..a4d3a4bcd 100644 --- a/web/skins/classic/views/js/filter.js +++ b/web/skins/classic/views/js/filter.js @@ -253,7 +253,7 @@ function parseRows(rows) { term[2] = rowNum; inputTds.eq(2).children().eq(0).attr('name', 'filter'+stringFilter(term)); inputTds.eq(2).children().eq(0).attr('id', 'filter'+stringFilter(term)); - } // End for each term/row + } //End for each term/row history.replaceState(null, null, '?view=filter&' + $j('#contentForm').serialize()); } From 09929280899ad54a6037fd8f6fad4fe64acb4342 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 18 Jan 2020 11:00:00 -0600 Subject: [PATCH 2/2] merge rpm changelog from RPMFusion --- distros/redhat/zoneminder.spec | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index d083bb244..345139284 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -416,29 +416,20 @@ EOF %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload %changelog -* Sun Dec 08 2019 Isaac Connor - 1.33.15-1 -- Bump to 1.33.15 Development +* Sat Jan 18 2020 Andrew Bauer - 1.34.0-1 +- 1.34.0 Release -* Sun Aug 11 2019 Andrew Bauer - 1.33.14-1 -- Bump to 1.33.13 Development +* Tue Dec 17 2019 Leigh Scott - 1.32.3-5 +- Mass rebuild for x264 -* Sun Jul 07 2019 Andrew Bauer - 1.33.12-1 -- Bump to 1.33.12 Development +* Wed Aug 07 2019 Leigh Scott - 1.32.3-4 +- Rebuild for new ffmpeg version -* Sun Jun 23 2019 Andrew Bauer - 1.33.9-1 -- Bump to 1.33.9 Development +* Tue Mar 12 2019 Sérgio Basto - 1.32.3-3 +- Mass rebuild for x264 -* Tue Apr 30 2019 Andrew Bauer - 1.33.8-1 -- Bump to 1.33.8 Development - -* Sun Apr 07 2019 Andrew Bauer - 1.33.6-1 -- Bump to 1.33.6 Development - -* Sat Mar 30 2019 Andrew Bauer - 1.33.4-1 -- Bump to 1.33.4 Development - -* Tue Dec 11 2018 Andrew Bauer - 1.33.0-1 -- Bump to 1.33.0 Development +* Tue Mar 05 2019 RPM Fusion Release Engineering - 1.32.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Sat Dec 08 2018 Andrew Bauer - 1.32.3-1 - 1.32.3 Release