Commit Graph

185 Commits

Author SHA1 Message Date
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