Commit Graph

384 Commits

Author SHA1 Message Date
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
Arnout Engelen 42edad1e8c Tweaks to the ubuntu installation instructions (#2688)
* Tweaks to the ubuntu installation instructions

I recently walked a new user through the Ubuntu installation, and noticed some
things that were confusing to him that would be easy to fix.

* Use release names as well as numbers
2019-08-28 10:53:24 -04:00
Isaac Connor 84492f29b1
Fix token auth sessions (#2676)
* If token is present do token based auth and do not do anything with session

* update HostController.  Use config constants, don't use sessions

* Remove Session from the components list

* spacing

* Remove Session from App Components list.

* Move APIEnabled check to the api from auth.php

* Rework auth.  login using username and password only occurs on login action now.  Including auth.php should not touch the session.  auth_hash logins no longer touch the session.  replace userLogin with a function called validateUser which matches the semantics of validateToken.

* remove debugging

* Add session storage if stateful query param is on, but only for LEGACY_API_AUTH

* fix mUser to username, etc.

* shuffle lines

* use  instead of session when generating auth hash.

* Add docs regarding the use of cookies and stateful query param

* Only open/close session if we are clearing a session var

* Use zm_session_start instead of session_start

* Should use zm_session_start instead of session_start

* document that zm_session_start should be called previously to session_regenerate_id

* Don't actually write out the session when generating auth hashes.  Means they should never actually persist.

* More backticking of SQL

* add .. to fix #2686

* Use material icons for sort because they look nicer

* fix typo

* have to add authhash to session on login

* restore username&password login for all urls

* fix

* fixes
2019-08-20 09:46:53 -04:00
Tsaukpaetra c5d2aab80a Update faq.rst (#2680)
Add new entry for timezone-related issue
2019-08-08 08:47:23 -04:00
Andrew Bauer 78e49cd2cb
Update debian.rst
fixes #2679
2019-08-07 09:39:28 -05:00
CanOfSpam3 6231c64a7a simplify rtfm step (#2650)
save everyone some cruft and time
2019-07-01 18:06:10 -04:00
Pliable Pixels ddd02ec10d clean up of API, remove redundant sections 2019-05-19 07:29:27 -04:00
Pliable Pixels 036d47545f small API fixes 2019-05-18 19:35:13 -04:00
Pliable Pixels a07da01f0c reworked API document for new changes in 2.0 2019-05-15 13:57:51 -04:00
Steve Root 0d4651c2d6 Update url to donate page (#2586) 2019-04-23 10:58:28 -04:00
Alex Fornuto 41cadf3a00
Update Debian Instructions
When downloading the repository GPG key, `wget` does not require `sudo`. The root permissions required are provided by `sudo` after the pipe.
2019-04-18 18:51:06 -05:00
aktarus82 aaf988576f removing test.txt 2019-04-09 21:42:40 +02:00
aktarus82 8403bf92fc updated Debian installation guide 2019-04-09 16:20:54 +02:00
aktarus82 e16f0092cd Merge remote-tracking branch 'upstream/master' 2019-04-02 21:43:31 +02:00
Andrew Bauer 4e5ed68232 update redhat install guide 2019-03-30 08:36:45 -05:00
aktarus82 12fe7fd2aa first commit 2019-03-19 21:18:10 +01: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
Chris NeJame f7b31c89ef Fixes #2375 (#2376)
* updated docs to include instructions on how to find the loaded PHP config file

* Added note about verifying timezone change

* revert docs back to master branch's content

* added installation guide for Ubuntu 18.04

The only difference between Ubuntu 16.04 and 18.04 is the version of
PHP that comes installed, which changes the location of its config file

* reverting debian instructions to master
2019-02-12 17:56:40 -05:00
Isaac Connor c2b1b43cde fix typo 2019-01-16 11:19:14 -05:00
Isaac Connor 0e06bdd1f2 zmcuston.conf => zmcustom.conf 2019-01-14 11:41:44 -05:00
kobold81 208d8f28de update debian to 1.32.x (#2407)
Hello,

the ZM_PATH config has cost me several hours to fix. I would like to add this little snipped to help others avoid this pitfall.

Best regards
Marc
2019-01-11 12:14:42 -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
Andrew Bauer c128998c20
Update redhat.rst 2018-12-27 18:16:52 -06: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
Pliable Pixels ace1134df1
further reading 2018-11-01 14:40:31 -04:00
Pliable Pixels 86a086c216
server json api typo 2018-11-01 14:13:22 -04:00
Pliable Pixels 14c30eac76
typo 2018-11-01 14:08:09 -04:00
Pliable Pixels 536d9226e0
ptz - clarify this is meta-data 2018-11-01 14:07:53 -04:00
Pliable Pixels 46cd2fc3ff
relocate monitor_status to the right place 2018-11-01 14:04:51 -04:00
Pliable Pixels cd8d609e84
initial multi-server/storage changes 2018-11-01 14:00:09 -04:00
Pliable Pixels 2953ff4db4
header level fix 2018-11-01 13:40:07 -04:00
Pliable Pixels 37b2da59ce
added streaming interface docs 2018-11-01 13:30:08 -04:00
Chris Kampmeier a1937d9885 Fixes for a couple issues in the Ubuntu guide (#2285)
* Xenial needs the ppa:iconnor/zoneminder repo

Otherwise, trying to install the zoneminder package fails with an unmet
dependency on php-apc.

See https://forums.zoneminder.com/viewtopic.php?t=27638 for details.

* Add necessary modules before configuring Apache

When you add the zoneminder configuration before enabling mod_rewrite,
subsequent commands (like the one to enable mod_cgi) give you an error
like:

    AH00526: Syntax error on line 37 of /etc/apache2/conf-enabled/zoneminder.conf:
    Invalid command 'RewriteEngine', perhaps misspelled or defined by a module not included in the server configuration
2018-10-30 18:35:50 -04:00
Matt N 0d1f8aaf03
Document /api/monitors/daemonStatus/ 2018-10-28 17:15:39 -07:00
Pliable Pixels fc4a84011b added note on auth hash logins (#2237)
* added note on auth hash logins

* code inline escape fix
2018-10-06 15:38:30 -04:00
Isaac Connor 246f3755a2 Update docs regarding ppa for 1.32 and 1.32 not needing mysql config changes 2018-10-02 15:19:19 -04:00
Vitaly Saversky 18c2ec6e17 Misspelling and grammar (#2202)
* Misspelling and grammar

* Misspelling something
2018-09-20 12:14:57 -04:00
Pliable Pixels 0e2fdf4a1c
fixed path for login/logout api 2018-09-14 11:48:22 -04:00
Vitaly Saversky b778fd782c Misspelling - non-recordable (#2200) 2018-09-09 09:39:30 -04:00
Pliable Pixels d45ca8880a documentation for new login/logout APIs (#2163) 2018-07-17 13:24:47 -04:00
Howard 073dd34d65
fixed typo 2018-05-10 20:59:08 -07:00
Isaac Connor 5ebfae5f14 fix warnings in building docs by using anonymous links (double underscore at the end) 2018-04-30 09:51:26 -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
Andrew Bauer 93263c40b4
Remove mention of el6 from readthedocs 2018-04-22 07:30:28 -05:00
Isaac Connor 27736fb5d9 Merge ../ZoneMinder.master into storageareas 2018-03-15 11:04:41 -04:00
Andrew Bauer 0d9f5b73c8
Update dedicateddrive.rst 2018-03-06 20:18:48 -06:00
Andrew Bauer b981c058d3
Update dedicateddrive.rst 2018-03-06 20:14:28 -06:00
Andrew Bauer a380f1f1a4
fix typo in url 2018-03-06 20:11:57 -06:00
Andrew Bauer 2a589b5111
Update index.rst 2018-03-06 20:05:51 -06:00
Andrew Bauer 7e345db0aa add dedicated drive to readthedocs 2018-03-06 20:04:12 -06:00
Isaac Connor b4c13d56d6 Merge ../ZoneMinder.master into storageareas 2018-03-06 12:29:59 -05:00
Mike R 3dc157732a Issue 1963: Remove spaces from example api calls. 2018-03-03 00:58:35 -05:00
Isaac Connor 0077f2e17b
Update faq.rst
I see no reason to mention bits. No one cares about bits. Our base unit should be bytes.  Also, lets be consistent and use 1024 as the divisor when converting to Kb and Mb and Gb.
2018-02-28 11:06:28 -05:00
Andrew Bauer 7fed5fd596
spelling 2018-02-27 19:46:44 -06:00
Andrew Bauer 35c63ac0bc
Update packpack.rst 2018-02-27 17:43:36 -06:00
Andrew Bauer 5ac003d448
Update packpack.rst 2018-02-27 17:39:58 -06:00
Isaac Connor 3aa31fd524 Merge branch 'master' into storageareas 2018-02-23 10:23:35 -05:00
Andrew Bauer 11660b42d4
fix zoneminder github url 2018-02-20 18:40:50 -06:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -05:00
Andrew Bauer 9a8a72ba27
typo 2018-01-20 17:46:53 -06:00
Andrew Bauer 06c2c18135
fix url to display properly 2018-01-20 17:46:15 -06:00
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