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

180 Commits

Author SHA1 Message Date
Isaac Connor 7ab6818fa0 Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize 2017-01-25 17:14:30 -05:00
Pliable Pixels 0f3642adf4 added uncompressed xml 2017-01-15 21:40:25 -05:00
Pliable Pixels d5d9a3a8e9 reminder message for website used to draw XML source images 2017-01-15 17:35:34 -05:00
Pliable Pixels 9bf83a409b fixed image type 2017-01-15 17:35:12 -05:00
Isaac Connor 84183c819c Merge branch 'master' into storageareas 2017-01-03 09:53:09 -05:00
Andrew Bauer b063d8d6aa Merge pull request #1728 from connortechnology/path_zms_message 
Path zms message
 2017-01-02 08:54:32 -06:00
Isaac Connor da1d801935 Merge branch 'path_zms_message' of github.com:ConnorTechnology/ZoneMinder into path_zms_message 2017-01-02 09:32:43 -05:00
Isaac Connor c27d0270dc Merge branch 'knnniggett-zmMemDetach' into storageareas 2016-12-20 15:40:14 -05:00
Andrew Bauer 02dac96cd9 more rst formatting changes 
make the note about using ffmpeg over remote->rtsp in bold
 2016-12-20 11:33:14 -06:00
Andrew Bauer 454894e3e8 fix rst formatting 
It is amazing how seemingly small changes in whitespace significantly affect the formatting
 2016-12-20 11:30:19 -06:00
Andy Bauer a20da2aa71 modify ffmpeg documentation, add a note to libvlc source type 2016-12-20 08:47:02 -06:00
Andy Bauer c25dd50a21 add Remote Protocol and Remote Method to the documentation 2016-12-20 08:30:21 -06:00
Andy Bauer 09937e87f7 mention 32 bit color depth and make it preferred 2016-12-20 08:16:10 -06:00
Isaac Connor 38c31be720 typo fix pluging -> plugin 2016-12-19 22:02:44 -05:00
Isaac Connor 4e89298183 fix another typo and stop recommending that people use ZM_OPT_FAST_DELETE 2016-12-19 22:01:45 -05:00
Isaac Connor 8b726996f7 FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant. 2016-12-19 21:36:39 -05:00
Isaac Connor 4b3ac63a68 merge master, deprecate qqq() 2016-11-08 11:30:44 -05:00
Kyle Johnson ae1abe99ab Merge pull request #1668 from zestysoft/Memory-Map-FAQ-Additional-Details 
Add additional details to increasing mapped memory.
 2016-11-04 11:24:15 -06:00
Ian b813b51f2b Revert "Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details" 
This reverts commit aa74660aa4, reversing
changes made to 749a90f199.
 2016-11-04 07:15:21 -07:00
Ian 1f8e497ab9 Fix FilteredPixels Mode description 
The FilteredPixels mode description incorrectly states that
AlarmedPixel analysis happens twice.
 2016-11-03 23:24:31 -07:00
Ian aa74660aa4 Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details 2016-11-03 23:08:05 -07:00
Ian 749a90f199 Add additional details to increasing mapped memory. 
Other distro’s do not use /run/shm as the memory mapped path, so added
information to cover this case.

Also filtered the output of df to focus our attention on the only mount
points that matter here.
 2016-11-03 22:43:07 -07:00
Ian 60794fab1e Change CREATE_ANALYSIS_IMAGES Help text 
The existing help text didn’t fully explain how blobs play a part in
this functionality.
 2016-11-03 15:58:16 -07:00
Don Law 28b18066a9 Fix name of OPT_USE_AUTH option in getting started guide. 2016-08-29 20:34:54 -04:00
Isaac Connor 872adc1c62 Merge pull request #1578 from erelson/patch-2 
Minor API doc error fixes
 2016-08-15 10:02:57 -04:00
Andrew Bauer 3a804a0d0c Update definemonitor.rst 2016-08-06 16:34:00 -05:00
Eric Relson b822deeb8c Minor API doc error fixes 2016-08-02 10:08:08 -07:00
Steve Gilvarry 24aeb91ef2 Merge pull request #1558 from onlyjob/spellcheck 
spellcheck/codespell
 2016-07-30 00:35:10 +10:00
Pliable Pixels dc916bba2c case typo 2016-07-23 08:04:46 -04:00
Pliable Pixels 45a62dc8d8 Added example of configs API edit 2016-07-23 08:03:15 -04:00
Dmitry Smirnov f1acc52913 spellcheck/codespell 2016-07-14 00:30:39 +10:00
Steve Gilvarry 5811ba7eda Swap to apt-get for debian 2016-07-05 23:10:03 +10:00
Steve Gilvarry 3a40f39d83 Fix 14.04 php.ini location and some more formatting issues 2016-07-05 07:52:37 +10:00
Steve Gilvarry 219289ee20 Consistency changes 2016-07-05 07:15:01 +10:00
Steve Gilvarry b2d1d688cc Updates to Ubuntu and Debian install guides 2016-07-03 20:21:13 +10:00
Isaac Connor 586eab25e6 Merge branch 'fix_issue_1460' of https://github.com/mattdurant/ZoneMinder into merge_1607 2016-09-01 10:25:00 -04:00
Isaac Connor eafe3d7748 Merge branch 'master' into storageareas 2016-08-17 10:31:55 -04:00
Isaac Connor 2451768295 Merge branch 'master' into storageareas 2016-08-08 18:08:46 -04:00
Isaac Connor 208337635a Merge branch 'master' into storageareas 2016-08-01 19:30:01 -04:00
Isaac Connor a30610fbda Merge branch 'master' into storageareas 2016-07-12 10:31:10 -04:00
Isaac Connor 7ff7684da6 add back deban install docs 2016-07-12 10:31:05 -04:00
Isaac Connor 8fabeb78d3 Merge branch 'fix_zone_edit' into storageareas 2016-05-24 15:55:49 -04:00
arjunrc e0c5b2a78f added consoleEvents API 2016-05-19 15:15:48 -04:00
arjunrc 13feb96811 added alarm apis 2016-05-19 15:06:41 -04:00
Isaac Connor 7e1a80658b Merge branch 'master' into storageareas 2016-04-17 09:30:33 -04:00
Pliable Pixels 859a55e1ef updated documentation to include runstates 2016-04-13 12:54:22 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor ea49dc20d1 Merge branch 'master' into storageareas 2016-03-30 10:58:07 -04:00
Andrew Bauer d412e8dc5c Update redhat.rst 2016-03-25 07:54:37 -05:00