Commit Graph

169 Commits

Author SHA1 Message Date
Pliable Pixels 795f380817
options API doc 2019-10-25 09:04:53 -04:00
Pliable Pixels d8bd0a04db
path option no longer exists 2019-10-25 09:04:47 -04:00
Pliable Pixels ab7e4b9a7b
sync options with current options, remove path 2019-10-25 08:54:51 -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
Pliable Pixels f5d0039ce7
reference detailed monitor options in getting started 2019-10-24 16:45:51 -04:00
Pliable Pixels 5241d8f858
make reference to options logging more visible 2019-10-24 16:36:24 -04:00
Pliable Pixels 958cedbbab
fifo typo 2019-10-24 15:07:04 -04:00
Pliable Pixels f116adb50f
fifo note 2019-10-24 15:06:03 -04:00
Pliable Pixels 2c3d72935b
reworked logging 2019-10-24 15:05:45 -04:00
Pliable Pixels d8a47d436e
remove extra verbose docs 2019-10-24 14:06:36 -04:00
Pliable Pixels 5443d4482a
put theme change at end 2019-10-24 14:00:01 -04:00
Pliable Pixels 30730c80d3
understanding console should be above themes 2019-10-24 13:59:37 -04:00
Pliable Pixels 9837c72bc6
path to TZ setting 2019-10-24 13:58:32 -04:00
Pliable Pixels 363474f613
fix up getting started screen 2019-10-24 13:57:09 -04:00
Pliable Pixels a30902e3d3
fixme 2019-10-24 13:21:04 -04:00
Pliable Pixels f97ea0a2a0
change audit report description based on what isaac said 2019-10-24 13:14:52 -04:00
Pliable Pixels 2ba8bb2737
updated documents for "understanding console" 2019-10-24 12:01:04 -04:00
Pliable Pixels b90bff475d
add mention of timezone 2019-10-24 11:10:04 -04:00
Pliable Pixels e1e6fa3bb1
fix authentication doc 2019-10-24 11:00:31 -04:00
Pliable Pixels f06a6977c0
python note, since we are in the Perl section 2019-10-24 10:27:07 -04:00
Pliable Pixels 1e50cc8034
add brief blurb on ES 2019-10-24 10:23:11 -04:00
Pliable Pixels 849b1bb42a
add ES to component diagram as optional 2019-10-24 10:17:03 -04:00
Isaac Connor 1e6abd7bbc enhance description of zmaudit, zmfilter 2019-10-23 14:45:25 -04:00
Isaac Connor 4f8c4e8abd Update schematic to remove zmf 2019-10-23 12:21:06 -04:00
Isaac Connor 9fdfb5944e Update schematic to remove zmf 2019-10-23 12:20:18 -04:00
Isaac Connor 4ceebcbfc2 remove zmf which no longer exists and add documentation for Event.pm, Filter.pm and the Control directory. Fixes #2732 2019-10-23 12:04:18 -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 14381cc4da rough in storage documentation 2019-09-24 10:12:28 -04:00
Isaac Connor 8aecf89466 documentation updates: add missing filter substitutions, rough in storage areas documentation 2019-09-24 10:12:08 -04:00
Steve Root 0d4651c2d6 Update url to donate page (#2586) 2019-04-23 10:58:28 -04:00
Isaac Connor f557df9fc9 remove extra affect 2019-02-17 17:34:38 -05:00
j-marz bd7ce6ba13 fixed more more typo in options_logging userguide (#2526) 2019-02-17 11:32:10 -05:00
Andrew Bauer 3258d8e590 remove ZM_DIR_IMAGES (#2374) 2018-12-29 09:52:58 -05:00
Andrew Bauer 35f89962e2 mention exclude alarm frame feature in preclusive 2018-12-28 12:40:17 -06:00
Andrew Bauer b8335b3e2a
Update definezone.rst 2018-12-28 09:49:05 -06:00
Jonathan Meredith 6e7ecf4e89
Fix spelling mistake
Changed his to this
2018-12-27 22:20:24 -05: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
rafidashab 4a56a405b7 Fix typos in README file (#2301)
* Fix typos in README file

* Improve clarity in introduction doc

* Improved word selection

* Revision of the README file

* Finish editing introduction documentation
2018-11-12 09:18:13 -05:00
Aktarus 1844a7eb29 Update definemonitor.rst (#2299) 2018-11-09 07:59:06 -05:00
Vitaly Saversky 18c2ec6e17 Misspelling and grammar (#2202)
* Misspelling and grammar

* Misspelling something
2018-09-20 12:14:57 -04:00
Vitaly Saversky b778fd782c Misspelling - non-recordable (#2200) 2018-09-09 09:39:30 -04:00
Howard 073dd34d65
fixed typo 2018-05-10 20:59:08 -07: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 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 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
Andrew Bauer e6c60737e9 Merge pull request #1756 from SteveGilvarry/zmf_goodbye
Remove zmf
2017-05-10 07:07:22 -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 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
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
Don Law 28b18066a9 Fix name of OPT_USE_AUTH option in getting started guide. 2016-08-29 20:34:54 -04:00
Andrew Bauer 3a804a0d0c Update definemonitor.rst 2016-08-06 16:34:00 -05:00
Steve Gilvarry b2d1d688cc Updates to Ubuntu and Debian install guides 2016-07-03 20:21:13 +10: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 c138914edd Merge pull request #1251 from tikismoke/patch-1
Update gettingstarted.rst
2016-02-26 07:03:36 -06:00
SteveGilvarry d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
SteveGilvarry 4837585601 Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
Conflicts:
	src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
Dmitry Smirnov 0f63f4357d sphinx: fix warning "Title underline too short".
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 21:06:21 +11:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
tikismoke f7bc8c7f0d Update gettingstarted.rst
Correct MODECT by NODECT if using zmTrigger
2016-01-26 20:14:49 +01:00
Isaac Connor bcb18b927b mention that you must set ZM_SERVER_NAME in /etc/zm/zm.conf 2015-12-21 13:05:56 -05:00
Isaac Connor 70cac99e17 fix claim that live view must be done on host server 2015-12-21 13:03:52 -05:00
Isaac Connor dfd7986c01 Merge branch 'master' into multi-server
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
arjunrc 6ccf36bc77 updated mobile app info 2015-12-20 14:55:48 -05:00
SteveGilvarry b78deb192b Add some documentation on Multi-Server 2015-12-19 20:51:19 +11:00
Andrew Bauer 78cf7f1cf5 Merge pull request #1044 from schrorg/privacy-zone-docs
Add Documentation for Privacy zones
2015-08-29 08:16:25 -05:00
Robin Daermann e822265512 Add Documentation for Privacy zones 2015-08-29 10:06:56 +02:00
Pliable Pixels d014a34b9a added note about potential Perl and PHP time translation conflict with filters 2015-08-28 15:55:16 -04: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 cee933225f formatting 2015-08-23 18:41:13 -04:00
Pliable Pixels 6045acc2ac content update 2015-08-23 16:51:37 -04:00
Pliable Pixels 65c5d41f7c content update 2015-08-23 16:41:29 -04:00
Pliable Pixels 7f23f47aea added deprecation notice 2015-08-23 16:21:05 -04:00
Pliable Pixels 7253e837f3 content update 2015-08-23 16:15:23 -04:00
Pliable Pixels 16ff2093a1 comtent update 2015-08-23 15:58:40 -04:00
Pliable Pixels 52d5aa0c70 comtent update 2015-08-23 15:19:51 -04:00
Pliable Pixels 81d6b0f023 comtent update 2015-08-23 15:16:56 -04:00
Pliable Pixels 5716b0e1ee merged content into camera control 2015-08-23 14:20:58 -04:00
Pliable Pixels 25e7702de7 Merged control camera and controlling monitors into one document - they both talk about PTZ 2015-08-23 14:19:54 -04:00
Pliable Pixels e7e2c92b95 images for define monitor doc 2015-08-23 14:13:44 -04:00
Pliable Pixels 0dcf38abc3 content 2015-08-23 14:13:11 -04:00