ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,276 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

8276 Commits

Author SHA1 Message Date
Isaac Connor 80c948b61e Merge pull request #1751 from knnniggett/pp_files 
initial commit for packpack support
 2017-01-14 16:44:05 -05:00
Andrew Bauer 3ae7038e3b make the build script executable 2017-01-14 14:15:54 -06:00
Andrew Bauer 105e43fafd initial commit for packpack support 2017-01-14 14:14:41 -06:00
Isaac Connor 5df5698e7a Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-14 10:54:15 -05:00
Isaac Connor babe4f07fb Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-14 10:53:49 -05:00
Isaac Connor 27d764909f Merge branch 'update_do_debian_release' into storageareas 2017-01-14 10:53:11 -05:00
Isaac Connor d7f81393a8 fixes to detect and use environment variables for AUTHOR and debsign keys 2017-01-14 10:53:05 -05:00
Isaac Connor b8dcebadd5 remove iconnor references 2017-01-14 10:01:55 -05:00
Isaac Connor 01e75a746d Merge branch 'update_do_debian_release' into storageareas 2017-01-14 09:59:02 -05:00
Isaac Connor e3f073b275 update to add binary options, dput to ppa and use alternate fork. Also support newer distros and wheezy. 2017-01-14 09:58:36 -05:00
Isaac Connor 2ce4bad39b fix Event being undefined when called by path 2017-01-13 14:42:10 -05:00
Isaac Connor 21c1e1d26f add a call to av_interleaved_write_Frame to clear out the queues in the destructor 2017-01-13 14:37:18 -05:00
Isaac Connor ac32b001e9 use a real variable for the file handle so that it sticks around. 2017-01-12 13:05:39 -05:00
Isaac Connor c97ecc2a38 remove debug line 2017-01-12 13:04:44 -05:00
Isaac Connor a5cdfd2932 call loadMonitors at the beginning. Otherwise we may not know about a monitor while handling a message from it. 2017-01-12 13:03:53 -05:00
Isaac Connor 513cd68c20 remove the verified caching. It makes calling zmMemVerify useless. 2017-01-12 13:02:16 -05:00
Isaac Connor ed5c3c4ed4 remove debug stautement 2017-01-12 12:58:09 -05:00
Isaac Connor d9ce1a68c6 restore defaults 2017-01-12 12:56:55 -05:00
Isaac Connor e94a797a5e remove debug stautement 2017-01-12 12:56:20 -05:00
Isaac Connor 65f7350313 remove debug stautement 2017-01-12 12:55:27 -05:00
Isaac Connor 82eaacc624 switch quotes 2017-01-12 12:54:46 -05:00
Isaac Connor 42484f7680 switch quotes, load monitors at the beginnign 2017-01-12 12:54:40 -05:00
Isaac Connor 0197c550ae Use a real variable for file handle so that it sticks around 2017-01-12 12:54:14 -05:00
Isaac Connor 0f67d9847e remove caching of verified status of an mmap. 2017-01-12 12:53:57 -05:00
Kyle Johnson 0e7794f2a7 Merge pull request #1 from connortechnology/cookie_http_only 
set http_only flag in cookie settings
 2017-01-12 09:25:36 -07:00
Kyle Johnson a0958f9b70 Merge pull request #4 from connortechnology/regenerate_session 
On successful login, tell php to regenerate the session id
 2017-01-12 09:06:28 -07:00
Andrew Bauer c50cbc2b9e Merge pull request #1749 from jbehrends/1747-docker-apache-config-fix 
Fixed apache documentroot, and fixed permissions for "/" in the project's Dockerfile
 2017-01-12 07:58:15 -06:00
Josh Behrends 2104561eca Fixed apache documentroot, and fixed permissions for "/" 2017-01-11 19:49:29 -08:00
Andrew Bauer 2e730f0426 Merge pull request #1746 from connortechnology/fix_else 
fix else behaviour by adding braces
 2017-01-11 19:38:59 -06:00
Isaac Connor 251264ac92 bump ffmpeg version required to use codecpar 2017-01-11 14:31:30 -05:00
Isaac Connor 7f059b750f fix whitespacing causing a warning when compiling. In this case braces are not neccessary. 2017-01-11 14:25:46 -05:00
Isaac Connor 23b40da598 fix whitespacing causing a warning when compiling. In this case braces are not neccessary. 2017-01-11 14:25:12 -05:00
Isaac Connor 8653822bff cleanup av_packet_unref/free_packet by using our zm_av_packet_unref 2017-01-11 14:22:37 -05:00
Isaac Connor 87daba346b fix else behaviour by adding braces 2017-01-11 14:18:56 -05:00
Isaac Connor 0d5910644e whitespace and braces fixes. Also add some braces to fixup a compiler error about the else not doing what it should be. 2017-01-11 14:18:11 -05:00
Isaac Connor 16fdac3179 fix remSocketFile to remSockFile 2017-01-11 11:14:00 -05:00
Isaac Connor 2436e40f5d Merge branch 'master' into storageareas 2017-01-11 10:34:27 -05:00
Isaac Connor 5d03e9f50e Merge branch 'fix_1743_Edimax' into storageareas 2017-01-11 10:34:08 -05:00
Kyle Johnson 132249e96d Merge pull request #1744 from connortechnology/fix_1743_Edimax 
change regexp to handle quotes in the content-type line.
 2017-01-11 07:42:28 -07:00
Isaac Connor bc04cb2620 Merge pull request #1742 from knnniggett/controlcap_fix 
fix conditional logic in controlcap.js
 2017-01-11 09:13:43 -05:00
Isaac Connor c0e929f136 change regexp to handle quotes in the content-type line. This is needed for edimax cameras 2017-01-11 09:11:27 -05:00
Andy Bauer 7ef7a36f39 fix conditional logic in controlcap.js 2017-01-10 17:53:05 -06:00
Andrew Bauer 01743b1fd9 Merge pull request #1741 from connortechnology/control_fixes 
Control fixes
 2017-01-10 17:33:09 -06:00
Isaac Connor 7502b81064 zmMemVerify now checks valid, so don't need to do it again. 2017-01-10 15:32:38 -05:00
Isaac Connor 04f66917ae Merge branch 'fix_mmap_leak' into storageareas 2017-01-10 15:29:54 -05:00
Isaac Connor 7ddd5359d0 zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good 2017-01-10 15:09:30 -05:00
Isaac Connor a146d7bee1 add a test for valid in the shared data. zmc sets this to false when it closes properly 2017-01-10 15:08:49 -05:00
Isaac Connor faeb785961 zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good 2017-01-10 15:08:23 -05:00
Isaac Connor 4d84387807 Merge branch 'fix_mmap_leak' into work 2017-01-10 14:22:58 -05:00
Isaac Connor a66e9e45a2 merge a fix from storageareas that adds a test for the shared data being valid and reloads the monitors if it can't reconnect 2017-01-10 14:22:42 -05:00