Commit Graph

8316 Commits

Author SHA1 Message Date
Isaac Connor 8f51331472 fix timeline view by using view=image instead of direct path 2017-04-07 13:20:04 -04:00
Isaac Connor 94ddfc4053 Fix 2017-04-07 11:58:27 -04:00
Isaac Connor 5c3a582252 The signal we should be blocking is SIGCHLD not SIGINT 2017-04-06 21:21:28 -04:00
Isaac Connor 6a9819e16b whitespace, comments 2017-04-05 16:10:21 -04:00
Isaac Connor 2b9a0f96d3 remove   and break over multiple lines 2017-04-05 16:10:06 -04:00
Isaac Connor d611840750 whitespace, handle NaN in limitArea 2017-04-05 16:09:40 -04:00
Isaac Connor c5ff45922f fix zone edit height 2017-04-05 16:09:06 -04:00
Isaac Connor a689fcff88 Fix use Time::HiRes 2017-04-05 16:08:47 -04:00
Isaac Connor 452e9571ee add a different size warning 2017-04-05 16:08:29 -04:00
Isaac Connor 15e69fc817 fix . to -> 2017-04-05 10:39:38 -04:00
Isaac Connor 1dbf599f10 add a cast to get rid of build warning 2017-04-05 10:36:44 -04:00
Isaac Connor 7815f1c539 introduce a redirect flag global variable to allow us to redirect. Which allows to redirect on successful login so we don't get repost popups 2017-04-05 10:05:21 -04:00
Isaac Connor 372fde7a8a fix typos in LIBSWRESAMPLE_H 2017-04-04 15:28:48 -04:00
Isaac Connor 1f3eecbd6c change how opkt.pts/dts are calculated by using the diff since the last input packet instead of the diff since the beginning of stream. This should allow us to handle input pts/dts wrapping. 2017-04-04 15:15:37 -04:00
Isaac Connor e70c7fa1ef whitespace and comments 2017-03-31 23:34:58 -04:00
Isaac Connor 08766b7546 decrease wait time in order to achieve greater throughput. flush after every print so that we don't buffer the whole file 2017-03-31 14:33:00 -04:00
Isaac Connor c944870526 sleep 100usec 2017-03-31 13:49:44 -04:00
Isaac Connor 58d119d9ed Merge branch 'fix_1762' into storageareas 2017-03-31 13:38:59 -04:00
Isaac Connor d3b6792a6a block signals around checking for a process to die 2017-03-31 12:25:48 -04:00
Isaac Connor 514c83d3e9 whitespace and add a test for ->Triggers being an array 2017-03-31 12:01:37 -04:00
Isaac Connor d1a60dedc8 Fix the overzealous use of escapeshellcmd that breaks restarting monitors 2017-03-31 11:59:55 -04:00
Isaac Connor 30455feef7 code style 2017-03-31 11:12:52 -04:00
Isaac Connor 9c495b07dd code style, whitespace, comments 2017-03-31 11:12:42 -04:00
Isaac Connor 26dfe45ec6 delete the videostore on camera delete so that the .mp4 gets written to disk 2017-03-31 11:06:15 -04:00
Andrew Bauer 7068efd581 rpmspecfile - modify tarball handling 2017-03-30 18:31:58 -05:00
Andrew Bauer 9a2c31d2c0 bump rpmspecfile to 1.30.2 release 2017-03-30 18:20:41 -05:00
Andrew Bauer 3405a540a4 Merge pull request #1843 from connortechnology/fix_1842
Test for Controllable as well as ControlId
2017-03-30 13:43:06 -05:00
Isaac Connor f2dcd18297 Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into storageareas 2017-03-30 13:46:30 -04:00
Kfir Itzhak 5f6332f313 Fixed the assembly in hwcaps_detect() to compile with -fpic & -fPIC and added SSE4.1, SSE4.2 and AVX detection 2017-03-30 20:35:31 +03:00
Isaac Connor 56476a7774 uppercase SQL 2017-03-30 13:05:10 -04:00
Isaac Connor 1d146b112a remark out some code that detects when the pts is < last_pts. The rest isn't implemented yet so it's bogus 2017-03-30 13:04:54 -04:00
Isaac Connor 4f2dcdacb4 update, remove styles and fix the sql for limiting monitors 2017-03-30 13:04:16 -04:00
Isaac Connor dd4550406f remove styles from montagereview and stick them in a view-specific css 2017-03-30 13:03:46 -04:00
Isaac Connor 7e3b27a130 Test for Controllable as well as ControlId 2017-03-30 10:49:02 -04:00
Isaac Connor b2db0888ae add a warning if csrf_check returns false 2017-03-30 10:46:13 -04:00
Isaac Connor 5ea77f0781 Make zones a link to zones_overview 2017-03-30 10:45:55 -04:00
Isaac Connor 538658403c Merge pull request #1822 from knnniggett/csrf
Implement CSRF Mitigation
2017-03-30 10:39:55 -04:00
Isaac Connor 8b7acb68a3 fix password and add debug 2017-03-29 20:07:58 -04:00
Andrew Bauer e46f64125e Update zoneminder.tmpfiles.in
With cakephp debug mode off, we must ensure cake's tmp folders are created
2017-03-29 13:28:15 -05:00
Isaac Connor fe223e3b29 remove a warning when adding users when not logged in (could happen if OPT_AUTH isn't turned on yet 2017-03-29 10:38:29 -04:00
Isaac Connor a0c030413a Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-29 10:19:10 -04:00
Isaac Connor 35067211e0 more the csrf to before actions.php 2017-03-29 10:19:00 -04:00
Isaac Connor 8bb9ba7bea Add more debugging 2017-03-29 09:59:58 -04:00
Isaac Connor a6261b5497 allow filters to act on unfinished events. 2017-03-29 09:39:20 -04:00
Andrew Bauer 96b14bd646 Merge pull request #1836 from connortechnology/fix_x10
fix inserting x10 record with missing comma
2017-03-29 08:01:28 -05:00
Andrew Bauer fe5fe63254 Update zoneminder.service.in
This was a typo. Quotes are not needed.
2017-03-29 07:53:15 -05:00
Isaac Connor 8c2e8defab Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2017-03-28 20:52:36 -04:00
Isaac Connor 3cd9e46df9 Merge branch 'knnniggett-csrf' into storageareas 2017-03-28 20:44:38 -04:00
Isaac Connor d006ebfc3c Merge branch 'csrf' of https://github.com/knnniggett/ZoneMinder into knnniggett-csrf 2017-03-28 20:10:59 -04:00
Isaac Connor 74eed2ac29 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-28 20:06:12 -04:00