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

6642 Commits

Author SHA1 Message Date
Andrew Bauer 418995df84 rpm specfile changes 
need to put this back in to maintain compatibility with packpack
 2017-01-15 09:59:17 -06:00
Andrew Bauer b3ee97ad11 Merge pull request #1753 from jbehrends/docker_apache_fix 
Docker - Fixed broken cgi-bin path in apache site conf.
 2017-01-14 20:38:33 -06:00
Josh Behrends 41f5ee5032 Fixed broken cgi-bin path 2017-01-14 16:35:46 -08:00
Andy Bauer 08d4d0c5c2 packpack - auto retrieve zmrepo rpm 2017-01-14 16:35:56 -06:00
Andy Bauer 7d91b4cdc7 minor changes to packpack patch 2017-01-14 16:24:55 -06:00
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 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 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 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
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 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 87daba346b fix else behaviour by adding braces 2017-01-11 14:18:56 -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 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
Isaac Connor d2ff6701f4 test 2017-01-10 13:53:02 -05:00
Isaac Connor 55403219d8 fix regexp for direction in control command. Also log if the regexp doesn't match 2017-01-10 12:35:38 -05:00
Isaac Connor fea5fa1b59 fix xtell should be -1 for move left 2017-01-10 12:35:02 -05:00
Isaac Connor 66cdcd95fa Merge branch 'master' into fix_mmap_leak 2017-01-10 08:47:46 -05:00
Andrew Bauer 03d71695e0 Merge pull request #1727 from StefanLindblom/1726-monitor-preset-qihan 
Add MonitorPreset for Qihan IP cameras via RTSP
 2017-01-10 07:36:59 -06:00
Stefan Lindblom 40d3da3521 Merge branch '1726-monitor-preset-qihan' of https://github.com/StefanLindblom/ZoneMinder into 1726-monitor-preset-qihan 2017-01-10 12:06:48 +01:00
Stefan Lindblom fa416ef889 Add MonitorPreset for Qihan IP cameras via RTSP 2017-01-10 12:02:47 +01:00
Andrew Bauer 06fd760a2a rpm specfile- use %{_localstatedir} macro 2017-01-09 09:07:05 -06:00
Andrew Bauer dc6b2ed114 clean up unnessary requires 2017-01-08 18:17:28 -06:00
Andrew Bauer 6b7e3a1b61 rpm specfile changes 2017-01-08 17:37:03 -06:00
Andrew Bauer 0d7e1bcbc5 add php as a dependency only when we aren't using nginx 2017-01-04 10:49:22 -06:00
Andrew Bauer 8ea4bdca1d explicity set index.php as the only directoryindex 2017-01-04 10:45:36 -06:00
Andy Bauer 7e7ef46420 rpm packaging - remove rundir from tmpfiles.d 2017-01-03 16:42:12 -06:00
Andy Bauer b4f537c5d3 rpm build tweaks based on rpmfusion feedback 2017-01-03 13:12:12 -06:00
Isaac Connor 2a1ec2beb1 Merge pull request #1719 from knnniggett/hikvisionptz 
Add HikVision ptz control sciprt
 2017-01-03 08:59:56 -05:00
Isaac Connor b4bddee337 Merge branch 'master' into improve_filter 2017-01-03 08:49:56 -05:00
Andrew Bauer cce87dd202 Merge pull request #1729 from connortechnology/fix_events_list 
Fix events list
 2017-01-02 20:36:21 -06:00