Commit Graph

8596 Commits

Author SHA1 Message Date
Isaac Connor cb6d7c7c61 further allow NULL updates 2017-05-05 16:53:38 -04:00
Isaac Connor 1b0a03c723 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-05-05 16:52:38 -04:00
Isaac Connor 1cd01be0b0 blah 2017-05-05 16:52:30 -04:00
Isaac Connor fd90de5952 if no AuthHashGEneratedAt then generate one instead of outputting an error 2017-05-05 16:47:50 -04:00
Isaac Connor deb1cf653a fix dimensions of ptz box 2017-05-05 16:47:21 -04:00
Isaac Connor f66b606e34 use isset 2017-05-05 16:40:05 -04:00
Isaac Connor 92854f5cba more debug 2017-05-05 16:37:30 -04:00
Isaac Connor cb99d709c5 add debug 2017-05-05 16:37:12 -04:00
Isaac Connor 64193c3368 turn status ajax calls to gets instead of posts 2017-05-05 16:18:12 -04:00
Isaac Connor 1ff367373f use ZM_AUTH_HASH_SECRET for the key, not the secret 2017-05-05 16:15:34 -04:00
Isaac Connor a0e4e6537e prefer key based tokens over session 2017-05-05 16:11:40 -04:00
Isaac Connor 0982c9fdec add Debug lines 2017-05-05 16:00:52 -04:00
Isaac Connor 19b2de6d28 add a Download MP4 button 2017-05-05 15:13:25 -04:00
Isaac Connor a6a2339eea play with setting moov flags 2017-05-05 14:25:54 -04:00
Isaac Connor 355eb1beef when mouseover the thumbnail, stream the video 2017-05-05 14:25:25 -04:00
Isaac Connor 35b89b6ef0 When zms hits then end of an event, if in single event mode, reset the frame index to the beginning so it starts again 2017-05-05 14:04:57 -04:00
Isaac Connor 3b6cf74ed3 add auth_hash to ajax calls 2017-05-05 11:53:40 -04:00
Isaac Connor 2660c8316a add a test for if the analysis image doesn't exist, fall back to the capture image when streaming. 2017-05-05 09:04:07 -04:00
Isaac Connor e5c38be716 Cleanup, when the monitor is flipped horizontally, reverse the commands 2017-05-04 12:27:30 -04:00
Isaac Connor ad166ab49a Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-05-03 16:43:59 -04:00
Isaac Connor cccc3df700 Merge branch 'master' into storageareas 2017-05-03 16:43:44 -04:00
Isaac Connor 351fe1eb93 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2017-05-03 16:40:57 -04:00
Andrew Bauer 895f5cc7c4 Update CMakeLists.txt
install the other bootstrap.php file under lib/cake
2017-05-03 13:25:11 -05:00
Andrew Bauer 752959f3fc Update CMakeLists.txt
typo - remove extra "/"
2017-05-03 12:35:54 -05:00
Andrew Bauer ebe7c21984 Update rsync_xfer.sh 2017-05-02 13:44:34 -05:00
Andy Bauer fd8aa62927 bump 1.30.3 release 2017-05-02 13:25:56 -05:00
Isaac Connor 013dab0f47 must unblock after blocking in killuntildead 2017-04-29 14:52:47 -04:00
Isaac Connor 58d47de699 Merge pull request #1869 from jedelbo/1868-spell-remSocketFile-correctly
Fix spelling of remSocketFile
2017-04-29 07:46:12 -04:00
Joergen Edelbo fb5668c9ef Fix spelling of remSocketFile 2017-04-29 09:02:35 +02:00
Isaac Connor 1b0f5bda4c usleep for 20000 usecs. Testing on i7 says 17000 is average value it takes to startup 2017-04-28 14:19:16 -04:00
Isaac Connor 1253fb1723 update whitespacing/braces. Add a warning when dbFetchOne is used with a column that isn't in the returned row 2017-04-28 14:17:36 -04:00
Isaac Connor 9482114f95 add db connections to the header 2017-04-28 14:17:09 -04:00
Isaac Connor 151126e70c fix placing of KILL_DELAY constant and turn it to 1/10th of a second instead of 1/100/th 2017-04-28 11:43:36 -04:00
Isaac Connor 9b66368040 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-04-28 11:10:50 -04:00
Isaac Connor 20c699366e scale is a percentage, so use the rescale function 2017-04-28 11:10:43 -04:00
Isaac Connor df7161a4ea merge some stuff I did in vueip 2017-04-28 10:54:20 -04:00
Isaac Connor b166579f4b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-04-28 10:36:04 -04:00
Isaac Connor 6827e0412c white and google style 2017-04-28 10:34:48 -04:00
Isaac Connor d498e30e37 switch to quilt 2017-04-28 10:34:07 -04:00
Isaac Connor e9e913c043 fixup whitespace. Switch to useconds and sleep and sleep for less time when starting up and comment out the 5 second shutdown wait. 2017-04-28 10:32:05 -04:00
Isaac Connor 2344f533ba debuild has a problem with the debian dir being a link, so mv it instead 2017-04-27 12:18:27 -04:00
Isaac Connor 8fad889c82 Don't delete the docs anymore 2017-04-27 12:15:39 -04:00
Isaac Connor 48d9167c5d Don't apply patches. 2017-04-27 12:05:47 -04:00
Isaac Connor 2b0561b481 delete the old merge files 2017-04-27 12:05:13 -04:00
Isaac Connor 6a3531c2ef use the mootools shipped with zm 2017-04-27 12:01:55 -04:00
Isaac Connor 6e94e57f57 don't default the cgi-bin path to /zm 2017-04-27 11:56:46 -04:00
Isaac Connor 9dd251c1d5 direcoty shouldn't have the distro in it apparently 2017-04-27 11:52:24 -04:00
Isaac Connor ce00047175 try out quilt format again 2017-04-27 11:46:36 -04:00
Isaac Connor eac1ebfb5a bump up standards version 2017-04-27 11:46:07 -04:00
Isaac Connor 4121e4b061 put back the code that generates the .orig.tar.gz and deletes .git etc 2017-04-27 11:45:10 -04:00