18c2ec6e17
Misspelling and grammar ( #2202 )
...
* Misspelling and grammar
* Misspelling something
2018-09-20 12:14:57 -04:00
b778fd782c
Misspelling - non-recordable ( #2200 )
2018-09-09 09:39:30 -04:00
073dd34d65
fixed typo
2018-05-10 20:59:08 -07:00
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
148d7066f9
Merge branch 'master' into storageareas
2017-07-11 16:15:02 -04:00
0faeef58c0
Update filterevents.rst ( #1944 )
...
State where filters are actually saved
2017-07-10 17:16:01 -04:00
c926f733ea
There should be a blank line here
2017-06-28 16:13:33 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
6cc6055bd3
Fix spelling mistake in link
2017-06-17 21:50:41 -04:00
b45da97416
need a blank line
2017-06-05 13:11:09 -04:00
9a317725c0
remove extra space
2017-06-05 13:10:16 -04:00
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
e6c60737e9
Merge pull request #1756 from SteveGilvarry/zmf_goodbye
...
Remove zmf
2017-05-10 07:07:22 -05:00
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
e680941568
add motion zone preset disclaimer
2017-02-10 08:30:13 -06:00
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
0f3642adf4
added uncompressed xml
2017-01-15 21:40:25 -05:00
d5d9a3a8e9
reminder message for website used to draw XML source images
2017-01-15 17:35:34 -05:00
9bf83a409b
fixed image type
2017-01-15 17:35:12 -05:00
02dac96cd9
more rst formatting changes
...
make the note about using ffmpeg over remote->rtsp in bold
2016-12-20 11:33:14 -06:00
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
a20da2aa71
modify ffmpeg documentation, add a note to libvlc source type
2016-12-20 08:47:02 -06:00
c25dd50a21
add Remote Protocol and Remote Method to the documentation
2016-12-20 08:30:21 -06:00
09937e87f7
mention 32 bit color depth and make it preferred
2016-12-20 08:16:10 -06:00
1f8e497ab9
Fix FilteredPixels Mode description
...
The FilteredPixels mode description incorrectly states that
AlarmedPixel analysis happens twice.
2016-11-03 23:24:31 -07:00
28b18066a9
Fix name of OPT_USE_AUTH option in getting started guide.
2016-08-29 20:34:54 -04:00
3a804a0d0c
Update definemonitor.rst
2016-08-06 16:34:00 -05:00
b2d1d688cc
Updates to Ubuntu and Debian install guides
2016-07-03 20:21:13 +10:00
859a55e1ef
updated documentation to include runstates
2016-04-13 12:54:22 -04:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
c138914edd
Merge pull request #1251 from tikismoke/patch-1
...
Update gettingstarted.rst
2016-02-26 07:03:36 -06:00
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
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
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
5bcc414038
codespell: misc. spelling corrections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
f7bc8c7f0d
Update gettingstarted.rst
...
Correct MODECT by NODECT if using zmTrigger
2016-01-26 20:14:49 +01:00
bcb18b927b
mention that you must set ZM_SERVER_NAME in /etc/zm/zm.conf
2015-12-21 13:05:56 -05:00
70cac99e17
fix claim that live view must be done on host server
2015-12-21 13:03:52 -05:00
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
6ccf36bc77
updated mobile app info
2015-12-20 14:55:48 -05:00
b78deb192b
Add some documentation on Multi-Server
2015-12-19 20:51:19 +11:00
78cf7f1cf5
Merge pull request #1044 from schrorg/privacy-zone-docs
...
Add Documentation for Privacy zones
2015-08-29 08:16:25 -05:00
e822265512
Add Documentation for Privacy zones
2015-08-29 10:06:56 +02:00
d014a34b9a
added note about potential Perl and PHP time translation conflict with filters
2015-08-28 15:55:16 -04:00
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
cee933225f
formatting
2015-08-23 18:41:13 -04:00
6045acc2ac
content update
2015-08-23 16:51:37 -04:00
65c5d41f7c
content update
2015-08-23 16:41:29 -04:00
7f23f47aea
added deprecation notice
2015-08-23 16:21:05 -04:00
7253e837f3
content update
2015-08-23 16:15:23 -04:00
Vitaly Saversky
Howard
Andrew Bauer
Isaac Connor
Joe Alamo
Martin Owens
Isaac Connor
Manojav Sridhar
Andrew Bauer
SteveGilvarry
Pliable Pixels
Andrew Bauer
Ian
Don Law
Dmitry Smirnov
tikismoke
Isaac Connor
SteveGilvarry
Robin Daermann