Commit Graph

255 Commits

Author SHA1 Message Date
Andrew Bauer 8dc6910bbd
Remove reference to zm 1.29, update description of isaac's ppa 2018-01-20 17:34:37 -06:00
Brian Gallimore 9df7349e8e
Update packpack.rst
added path to git clone command.  (I'm following install guide for first time and that step didn't work without the path)
2018-01-17 19:57:45 -06:00
Isaac Connor 489d3ba6ed Merge ../ZoneMinder.master into storageareas 2017-11-21 12:23:17 -05:00
Steve Gilvarry d83b9ce622 Fixes #1983 (#1989)
Fair point here we put a command it should run, but I have added assistance with this part of the install is not zoneminder specific
2017-09-28 18:03:39 -04:00
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
jethornton 431ec3ea75 Update faq.rst (#1970)
The memory math is confusing and incorrect. Original posted added a 5th camera but did not update the final memory size or explain how they arrived at that value.
2017-08-21 11:25:44 -04:00
Andrew Bauer dc1aa2b670 Update redhat.rst 2017-08-19 21:41:19 -05:00
Andrew Bauer 7d0531ccdd Update packpack.rst 2017-08-19 21:37:04 -05:00
Andrew Bauer e749866101 Update packpack.rst 2017-08-19 21:17:06 -05:00
Andrew Bauer 54f780e2d3 Update redhat.rst 2017-08-19 13:15:11 -05:00
Andrew Bauer 4ccca556e1 Update packpack.rst 2017-08-19 12:52:21 -05:00
Andrew Bauer 52accd7ff5 Update packpack.rst 2017-08-19 12:50:07 -05:00
Andrew Bauer 9172a1bc42 Update packpack.rst 2017-08-19 12:48:57 -05:00
Andrew Bauer e473806fff Update packpack.rst 2017-08-19 12:47:41 -05:00
Andrew Bauer 8bf395465f Update packpack.rst 2017-08-19 12:46:38 -05:00
Andrew Bauer 65f03ce613 Update packpack.rst 2017-08-19 12:46:00 -05:00
Andrew Bauer 7ed53f766e Update packpack.rst 2017-08-19 12:45:39 -05:00
Andrew Bauer 7a1208daaa Update packpack.rst 2017-08-19 12:43:28 -05:00
Andrew Bauer 4adad745d0 Update packpack.rst
fix bullets
2017-08-19 12:42:44 -05:00
Andy Bauer dafe125ed5 initial commit to add packpack build instructions 2017-08-19 12:39:54 -05:00
Isaac Connor 49464d381a Merge branch 'master' into storageareas 2017-08-14 10:44:40 -04:00
Andrew Bauer edd66dd0cf Update redhat.rst 2017-08-11 12:41:12 -05:00
Andrew Bauer 0936dc79bc Update redhat.rst 2017-08-11 12:37:44 -05:00
Andrew Bauer 4aa15702e7 Update redhat.rst 2017-08-11 12:33:39 -05:00
Andrew Bauer 3a7ad58c25 Update redhat.rst 2017-08-11 08:55:57 -05:00
Andrew Bauer 4187da2d5a Update redhat.rst 2017-08-11 08:45:34 -05:00
Andrew Bauer ae8873c2cc Update redhat.rst 2017-08-11 08:44:02 -05:00
Andrew Bauer 565612b86b Update redhat.rst 2017-08-11 07:55:29 -05:00
Andrew Bauer 64cf80ccf4 Update redhat.rst 2017-08-11 07:52:25 -05:00
Andrew Bauer 4941e6715c Update redhat.rst 2017-08-11 07:49:59 -05:00
Andrew Bauer 27796ab720 Update redhat.rst 2017-08-10 20:57:26 -05:00
Andrew Bauer 0a5188d79f Update redhat.rst 2017-08-10 20:55:22 -05:00
Isaac Connor 148d7066f9 Merge branch 'master' into storageareas 2017-07-11 16:15:02 -04:00
Joe Alamo 0faeef58c0 Update filterevents.rst (#1944)
State where filters are actually saved
2017-07-10 17:16:01 -04:00
Isaac Connor c926f733ea There should be a blank line here 2017-06-28 16:13:33 -04:00
Isaac Connor 76f63686cb Merge branch 'fix_event_viewing' into storageareas 2017-06-22 09:24:31 -04:00
Martin Owens 6cc6055bd3 Fix spelling mistake in link 2017-06-17 21:50:41 -04:00
Isaac Connor b45da97416 need a blank line 2017-06-05 13:11:09 -04:00
Isaac Connor 9a317725c0 remove extra space 2017-06-05 13:10:16 -04:00
Isaac Connor ed6a2f3636 Merge pull request #1755 from connortechnology/update_do_debian_release
Update do debian release
2017-05-10 09:06:17 -04:00
Isaac Connor de24ba7120 Merge pull request #1779 from vajonam/1778-add-subtituteTags-for-exec
add the ability to add substitued tags to the commandline
2017-05-10 09:00:36 -04:00
Isaac Connor a5f71a917e Merge branch 'master' into update_do_debian_release 2017-05-10 08:59:09 -04:00
Andrew Bauer e6c60737e9 Merge pull request #1756 from SteveGilvarry/zmf_goodbye
Remove zmf
2017-05-10 07:07:22 -05:00
Andrew Bauer 3870ca1ec0 Update redhat.rst
typo
2017-04-26 09:48:15 -05:00
Isaac Connor b2fc959a50 Merge branch 'master' into update_do_debian_release 2017-04-24 17:01:56 -04:00
Isaac Connor 3dff8a5da5 update doc references to do_debian_package.sh 2017-04-24 17:01:24 -04:00
Joshua Ruehlig 6779bd74b0 Update multiserver.rst
No longer needed since https://github.com/ZoneMinder/ZoneMinder/pull/1470
2017-04-21 10:44:37 -07:00
Joshua Ruehlig 0728b935c0 Update ubuntu.rst
I'm not a linux/ubuntu guy, but I am 90% sure this is correct =P
2017-04-21 10:43:16 -07:00
Andrew Bauer 48e2c5f6ec Update redhat.rst 2017-04-14 12:40:32 -05:00
Andrew Bauer 8555b07f95 Update redhat.rst
update rpm building instructions to reflect latest changes
2017-04-01 08:26:27 -05:00
Andrew Bauer a40de3b588 Update redhat.rst
better way to create a tarball from a local git repo
2017-04-01 08:20:34 -05:00
Manojav Sridhar ca303da030 added documentation for feature that allows %tags% to passed as command line args to the exec command in addtion to the event path 2017-02-15 09:38:19 -05:00
Andrew Bauer e680941568 add motion zone preset disclaimer 2017-02-10 08:30:13 -06:00
SteveGilvarry 2f3ebd80da Remove zmf, die..die..die 2017-01-16 13:20:05 -08: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
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
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
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
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
Pliable Pixels 859a55e1ef updated documentation to include runstates 2016-04-13 12:54:22 -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
Andrew Bauer d412e8dc5c Update redhat.rst 2016-03-25 07:54:37 -05:00
Luke Cousins 0e54831072 Swapping back to vi as default editor 2016-03-24 15:15:58 +00:00
Luke Cousins 2ede18a614 Minor improvements to documentation 2016-03-21 22:47:45 +00:00
Jon Burgess b11f3bce53 Assume this was meant to be Asterisk, not Astericks. 2016-03-19 15:25:17 +00:00
Andrew Bauer fe46785e94 Update redhat.rst 2016-03-15 07:33:40 -05:00
Andrew Bauer 68a5e78efc Update redhat.rst 2016-03-15 07:30:31 -05:00
Andrew Bauer dcdb879637 Update redhat.rst 2016-03-15 07:24:15 -05:00
Andrew Bauer 4581379d45 Update redhat.rst
minor edits
2016-03-15 07:21:34 -05:00
Andy Bauer b7259b973a first formatting pass 2016-02-28 12:54:21 -06:00
Andy Bauer 35d013136f add redhat instructions to readthe docs 2016-02-28 12:27:04 -06:00
Andrew Bauer c138914edd Merge pull request #1251 from tikismoke/patch-1
Update gettingstarted.rst
2016-02-26 07:03:36 -06:00