Commit Graph

27 Commits

Author SHA1 Message Date
Isaac Connor 5f317b3651 Merge pull request #3373 from havardAasen/minor_fixes
Update man-pages and typos.
2021-10-19 14:55:59 -04:00
Pliable Pixels 723e973e88
resolves https://github.com/ZoneMinder/zoneminder/pull/2743#discussion_r339030265 2019-10-25 13:53:07 -04:00
Pliable Pixels d8cd6d1942
fixup definemonitors 2019-10-24 16:57:55 -04:00
Pliable Pixels ef216deaaa
covert links to pretty text 2019-10-24 16:53:16 -04:00
Pliable Pixels 7eeb80dd0a
make fps warnings more prominent 2019-10-24 16:51:36 -04:00
Isaac Connor b6c22139d6 update links in docs. Remove build examples using configure as it has been deprecated for a long time. 2019-10-18 18:16:59 -04:00
Isaac Connor 392fa04918 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-29 10:45:37 -05:00
Isaac Connor 45a9f9158d spelling mistakes 2018-11-29 10:45:30 -05:00
Elmar Pruesse 9c1578e14e Add description for Stream Replay Image Buffer (#2325)
* Add description for Stream Replay Image Buffer

I hope this is even correct.

* Update definemonitor.rst
2018-11-27 21:49:58 -05:00
Aktarus 1844a7eb29 Update definemonitor.rst (#2299) 2018-11-09 07:59:06 -05:00
Vitaly Saversky b778fd782c Misspelling - non-recordable (#2200) 2018-09-09 09:39:30 -04:00
Andrew Bauer 86b2f6a12e New Monitor Type - Website (#2065)
* implement website monitor

* don't check certain fields when using website monitor

* continue to fix javascript errors for website monitors

* check $monitor, not $new_monitor here

* add website monitor documentation

was somehow left out of the initial commit

* fix corruption of functions.php

* add missing comma

* remove errors by testing for existence of key.  If it's a new monitor, then none of the keys will be valid

* If the monitor type is WebSite, then default Status to Running.

* put back start function that got lost in merge.  Don't start StreamCmd's if it's a WebSite

* Add midding comma

* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite

* Don't show control or any of the status fields for WebSite type monitors

* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -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
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
Andrew Bauer 3a804a0d0c Update definemonitor.rst 2016-08-06 16:34:00 -05:00
SteveGilvarry b78deb192b Add some documentation on Multi-Server 2015-12-19 20:51:19 +11:00
Andrew Bauer b798dfadbc Merge branch '1013-document-migration' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-1013-document-migration
Conflicts:
	docs/userguide/filterevents.rst
2015-08-24 09:48:40 -05:00
Pliable Pixels 0dcf38abc3 content 2015-08-23 14:13:11 -04:00
tikismoke f9347501f9 update doc
make it more readable on readthedoc
2015-08-22 19:31:54 +02:00
SteveGilvarry 9795967298 Initial attempt to migrate wiki to readthedocs 2014-07-13 22:25:30 +10:00