Commit Graph

3215 Commits

Author SHA1 Message Date
Kfir Itzhak dce1cbf0ce Add header file checks for vlc/vlc.h 2013-12-21 06:47:12 +02:00
Edward Barnard aa6380c4bd Might now build with autotools. 2013-12-19 23:15:16 +00:00
Edward Barnard 3e2647782d Better error handling 2013-12-19 23:10:45 +00:00
Edward Barnard f4d72752a8 Check for frame differences as libvlc provides frames at a constant 15fps even if they are duplicates 2013-12-19 23:02:21 +00:00
Edward Barnard e4a16ee57c All colourspaces now working 2013-12-19 21:51:39 +00:00
Edward Barnard c25011e781 Fix seemingly random lockup. 2013-12-19 21:51:39 +00:00
Edward Barnard 3201e5a431 Adds web ui support for libvlc camera. 2013-12-19 21:51:39 +00:00
Edward Barnard 3321506b45 Working libvlc camera implementation. 2013-12-19 21:51:39 +00:00
Andy Bauer 283091a88e Disables non-POSIX warning when using gnu wildcard 2013-12-19 14:10:22 -06:00
Isaac Connor 7251a8e1ae fixes to $Config changes, also exit if no EVENT_PATH 2013-12-19 13:41:55 -05:00
Isaac Connor 4d9234089c fix ZM_URL to $Config{ZM_URL} 2013-12-19 13:01:52 -05:00
Isaac Connor 462108583b fix ZM_EVENT_PATH 2013-12-19 12:55:14 -05:00
Isaac Connor 0556187a0f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-12-17 14:27:11 -05:00
Kyle Johnson 312d787617 Merge pull request #275 from ZoneMinder/274
Move embedded jquery. (issue #274)
2013-12-17 10:46:23 -08:00
Kyle Johnson cad33ddb96 Removed embedded jquery, instead include by <script>. Fixes #274 2013-12-17 13:41:55 -05:00
Kyle Johnson 1a744ebed6 Added jquery 1.4.2.min.js to the classic skin's js dir 2013-12-17 13:41:36 -05:00
Isaac Connor 7064141161 check for mysql existence first. 2013-12-17 13:13:45 -05:00
Isaac Connor 42642937e4 fix ZM_VERSION 2013-12-17 13:05:58 -05:00
Isaac Connor 53985dcab0 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-12-17 12:07:51 -05:00
Isaac Connor 9e7d729ca8 use the full path for ZM_VERSION 2013-12-17 12:06:14 -05:00
Isaac Connor 2ced76c20d do this one too 2013-12-17 11:24:33 -05:00
Isaac Connor 1d338ed879 more 2013-12-16 16:36:12 -05:00
Isaac Connor 48a6dcf5ce Change COnfig from using the subroutine symbol table to just using a global hash 2013-12-16 16:32:02 -05:00
Andrew Bauer 43b8990d73 Update zoneminder.el6.spec
Bump revision and changelog
2013-12-16 14:46:28 -06:00
Andrew Bauer 2ca23bf07a Update zoneminder.cmake.el6.spec
Bump revision and changelog
2013-12-16 14:45:50 -06:00
Andrew Bauer 0f14db811d Update zoneminder.f19.spec
Bump revision and changelog
2013-12-16 14:45:11 -06:00
Andrew Bauer 3ce3df8645 Update zoneminder.cmake.f19.spec
Bump revision and changelog
2013-12-16 14:44:22 -06:00
Andrew Bauer 570606f01f Update zoneminder.cmake.f19.spec
Bugfix. Perl path had x86_64 hardcoded.  Use macro instead.
2013-12-16 14:43:33 -06:00
Andrew Bauer 49e4d1089a Update zoneminder.cmake.el6.spec
Bugfix. Perl path was hardcoded to x86_64. Use macro instead.
2013-12-16 14:42:22 -06:00
Kyle Johnson 263f3a6e02 Merge pull request #269 from knnniggett/zmupdate_1.26.5
Automatically grab all sql scripts in the db subfolder
2013-12-16 07:42:36 -08:00
Andrew Bauer e68fd9db91 Automatically grab all sql scripts in the db subfolder 2013-12-14 09:45:18 -06:00
Andrew Bauer 8d2dac67b3 Update zoneminder.in 2013-12-14 09:14:44 -06:00
Andrew Bauer b0b471eb5b Update zm.in 2013-12-14 09:13:49 -06:00
Andrew Bauer cd43496a7d Update zm.in
Don't think this is needed.  This may contribute to the corrupt Config table issue
2013-12-14 09:05:15 -06:00
Andrew Bauer 8265eb98dc Add reference to zm_update-1.26.5.sql in Makefile.am 2013-12-13 18:51:39 -06:00
Kyle Johnson 0667795acf Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-12-13 13:54:42 -05:00
Isaac Connor 6a047a947a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-12-13 13:46:11 -05:00
Isaac Connor 73dbe81064 update to 1.26.5 2013-12-13 13:45:55 -05:00
Kyle Johnson dc0d305811 Bump version to 1.26.5 2013-12-13 13:39:23 -05:00
Kyle Johnson c3c3cfbfb9 Merge pull request #264 from ZoneMinder/improvezmpkg
Use proper DBI parameter passing in zmpkg.pl to improve security
2013-12-13 10:34:48 -08:00
Kyle Johnson f39f2fab66 Merge pull request #241 from ZoneMinder/alarmrefblendoption
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
Kyle Johnson 45ad839f96 Merge pull request #259 from ebarnard/rtsp-fix
Regression:  Fix RTSP decoding errors in 1.26.4 fixes #221
2013-12-13 10:12:50 -08:00
Kfir Itzhak ca3a7c1732 Merge pull request #268 from Phhere/patch-3
Improve detection for WansView cameras
2013-12-11 15:21:10 -08:00
Philipp Rehs 529c124a9c Detection Support for WansView Cams
Support for detection of Wansview Cams which are connected by lan
2013-12-11 11:29:30 +01:00
Kfir Itzhak e9f4479171 Added support for UYVY capture palette (required for some Bluecherry cards) 2013-12-10 15:13:48 +02:00
Edward Barnard c630174868 Adds support for h264 cameras that fail to set m bit for end of fragmented frames. 2013-12-07 11:21:10 +00:00
Isaac Connor 2775752a41 use proper DBI parameter passing to improve security
remark out call to zmupdate.pl -f
2013-12-06 16:46:21 -05:00
Kfir Itzhak 5a256eb96f Merge pull request #256 from Phhere/patch-1
Fix checkJsonError messages
2013-12-04 04:58:39 -08:00
Edward Barnard 9a06ec51c6 Save a couple of cpu cycles. 2013-12-02 15:37:26 +00:00
Kfir Itzhak 219ada85c0 Merge pull request #257 from Phhere/patch-2
Network Detection Support for Wansview
2013-12-01 16:04:56 -08:00