ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,198 Commits
32 Branches
93 Tags
158 MiB
Commit Graph

11198 Commits (86b2f6a12ed57a8e49b2427e9841c59bc6cd45f0)

Author SHA1 Message Date
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 426b3cf9d4
Update startpackpack.sh 2018-04-24 12:43:45 -05:00
Andy Bauer 678503b992 fix ftbs on el7 2018-04-24 12:16:19 -05:00
Isaac Connor 5255898900 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-23 11:38:30 -04:00
Isaac Connor a68ed3a305 watchfeed => watch. Fixes #2086 2018-04-23 11:38:25 -04:00
Andrew Bauer 0a24f8550a
Update path to zmtriggers.sql 
ZM_PATH_DATA is not configured as a make macro. Use @PKGDATADIR@ instead.
 2018-04-23 08:59:31 -05:00
Andrew Bauer 600b66e27c
Update zoneminder.spec 2018-04-23 07:41:36 -05:00
Andrew Bauer 93263c40b4
Remove mention of el6 from readthedocs 2018-04-22 07:30:28 -05:00
Andy Bauer 02f8493b39 rpm packaging - remove support for sysvinit aka el6 2018-04-22 07:25:06 -05:00
Andy Bauer f13d174ea5 remove support for el6 from the buildsystem 2018-04-21 21:49:04 -05:00
Andrew Bauer 35dcedb2ad
fix ftbs on el7 
adds compiler support for PRIu64
 2018-04-21 20:55:21 -05:00
Andrew Bauer 4f7e0fedad
Update startpackpack.sh 2018-04-21 18:50:46 -05:00
Andrew Bauer db293944c3
Update startpackpack.sh 2018-04-21 18:49:35 -05:00
Isaac Connor 860450307f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-21 10:36:01 -04:00
Isaac Connor 662215d125 Merge ../ZoneMinder.connortechnology 2018-04-21 10:35:49 -04:00
Isaac Connor 3560c0d610 fix displayed tbale header twice 2018-04-21 10:35:36 -04:00
Andrew Bauer 97b66340ac
add dnsutils and traceroute packages to travis 2018-04-21 08:41:12 -05:00
Andy Bauer 287eb330eb add network connectivity checks to zmrepo 2018-04-21 08:37:27 -05:00
Andrew Bauer 519c36ae7d
Update startpackpack.sh 2018-04-20 21:24:49 -05:00
Andrew Bauer 779e77ac29
Update startpackpack.sh 2018-04-20 21:12:15 -05:00
Andrew Bauer 782d237b2d
Update startpackpack.sh 2018-04-20 21:10:24 -05:00
Andrew Bauer 8a61fb2532
redirect standard error when we mount zmrepo 2018-04-20 20:15:50 -05:00
Isaac Connor 578df0c5cc update submodules 2018-04-20 16:18:58 -04:00
Isaac Connor c65255a067 Merge ../ZoneMinder.connortechnology 2018-04-20 15:56:42 -04:00
Isaac Connor a868bb70ed Better debug when fail to attach images 2018-04-20 15:56:14 -04:00
Isaac Connor fac3cde1e7 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-20 15:23:23 -04:00
Isaac Connor 3ea39ad417 whitespace 2018-04-20 15:22:45 -04:00
Isaac Connor 1d4e79feb1 Update filters a bit, using Event as an object to get the Path, etc 2018-04-20 15:22:31 -04:00
Isaac Connor 5a93458441 add StartTime to Filters 2018-04-20 15:22:12 -04:00
Isaac Connor 8b165c34b0 Handle event and frame no found earlier 2018-04-20 14:25:54 -04:00
Isaac Connor 781438d4c5 specify E.* in query because otherwise it uses M.Id for Id 2018-04-20 14:25:38 -04:00
Isaac Connor fedc4d4cb1 spacing 2018-04-20 14:24:56 -04:00
Isaac Connor ac775f13f6 always return an array from find_all 2018-04-20 14:23:27 -04:00
Isaac Connor 9de3c44702 Add find_one and caching 2018-04-20 14:23:04 -04:00
Isaac Connor 07e7ab1547 fix spacing 2018-04-20 14:21:41 -04:00
Isaac Connor 970830aee3 tidy up 2018-04-20 13:10:38 -04:00
Isaac Connor c9e18fa24f Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-20 08:54:38 -04:00
Isaac Connor 914c608dbc get rid of stored procedure. Do everything in the Trigger 2018-04-20 08:54:25 -04:00
Andrew Bauer 85ba525496
rpm spec file - use %{_sourcedir} macro 2018-04-19 20:41:11 -05:00
Andrew Bauer 087fcc6c78
update buildsystem 2018-04-19 20:23:17 -05:00
Andrew Bauer 39244ac6ec
buildsystem update 2018-04-19 20:01:31 -05:00
Andy Bauer 9f74efd18a Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2018-04-19 18:41:16 -05:00
Andy Bauer 411a831338 rpm packaging - mention the firewall in the README's 2018-04-19 18:40:05 -05:00
Andrew Bauer 2d2c0df8f1
rpm specfile - bump version 2018-04-19 15:39:08 -05:00
Andy Bauer ed140426ab rpm packaging changes and documentation 2018-04-19 15:36:43 -05:00
Andrew Bauer 3c225c9f1c Migrate Webcache out of webroot (#2083) 
* migrate webcache folder out of webroot, migrate htaccess files

* rpm specfile - add missing reference to cache folder

* fix submodule mixup
 2018-04-19 15:01:46 -04:00
Isaac Connor fb44619a66 output the initial table head 2018-04-19 14:33:05 -04:00
Andrew Bauer e7be406eb2
Merge pull request #2082 from connortechnology/fix_signalcheck 
Fix signalcheck
 2018-04-19 13:26:54 -05:00
Isaac Connor 64c3c21564 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-04-19 14:22:23 -04:00
Isaac Connor 2516846176 only update DiskSpace if new DiskSpace is defined 2018-04-19 14:22:19 -04:00