Commit Graph

254 Commits

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