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

8560 Commits

Author SHA1 Message Date
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
Isaac Connor d2ff6701f4 test 2017-01-10 13:53:02 -05:00
Isaac Connor b3c5f4622f revert knnniggett's zmMemDetach changes 2017-01-10 12:56:19 -05:00
Isaac Connor 3074263e06 Merge branch 'control_fixes' into storageareas 2017-01-10 12:54:46 -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
Isaac Connor d8b8d78576 Fix storagearea lookup. Default to ZM_EVENTS_DIR 2017-01-09 16:35:58 -05:00
Isaac Connor 03fd964518 fix parsing StorageID 2017-01-09 14:59:14 -05:00
Isaac Connor 7ef0c2c9d3 fix deleting filters. We don't need to set fid anymore 2017-01-09 14:58:55 -05:00
Isaac Connor cc724a5542 add a question mark to delete confirmation 2017-01-09 14:53:13 -05: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
Isaac Connor 8ae02b9ac0 use a FrameType enum instead of string comparisons 2017-01-08 16:53:29 -05:00
Isaac Connor 8f3e40d7af add a const array of char * strings for the frame types so that we can make better use of the FrameType enum for more efficient code 2017-01-08 16:53:15 -05:00
Isaac Connor 9748b9346e bump required version to 3.1 so that we can use a simple statement to turn on c++11 features 2017-01-08 16:52:16 -05:00
Isaac Connor 99e823ef33 Merge branch 'zmtelemetry_improvements' into storageareas 2017-01-08 11:04:59 -05:00