ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,567 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

12567 Commits

Author SHA1 Message Date
Isaac Connor 967fe14b22 Add ability to update incorrect starttime. 2018-11-11 10:17:32 -05:00
Isaac Connor 1e98ecb595 Sort keys in to_string 2018-11-09 12:14:39 -05:00
Isaac Connor 5f81e9111f Add Scheme and SaveJPEGs to Event fields, and fix setting Scheme 2018-11-09 12:14:05 -05:00
Isaac Connor abada5c95c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-09 10:47:00 -05:00
Isaac Connor 4ddd328c61 Check and Fix Scheme and StorageArea 2018-11-09 10:39:57 -05:00
Aktarus 1844a7eb29 Update definemonitor.rst (#2299) 2018-11-09 07:59:06 -05:00
Isaac Connor 8b8e75350c Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-11-07 20:34:55 -05:00
Andrew Bauer d6877b763d
Merge pull request #2298 from connortechnology/log_use_global_dbh 
Use the global dbh in ZoneMinder::Database instead of keeping our own…
 2018-11-07 12:29:11 -06:00
Isaac Connor 82abd04f36 Add type=button to buttons so they don't act like submit buttons 2018-11-07 13:19:42 -05:00
Isaac Connor ec09a71ba0 Include defaults for all the missing Monitor Columns 2018-11-07 13:18:53 -05:00
Isaac Connor 702143e51b Create a function called getBodyTopHTML that outputs the body tag and anything else that should go at the top. 
Things like the we require javascript message, and any other messages like error messages.
Use this on the monitor and console view to stick an error message at the top when saving a monitor fails.

This is a pretty quick, crude implementation.
 2018-11-07 12:33:54 -05:00
Isaac Connor a066968aca fix dbError and cause it to return the error string instead of just logging it. Add error logging of db errors that don't throw exceptions. 2018-11-07 12:33:18 -05:00
Isaac Connor 230ce61dc4 fix #2296 by prepending bind with :: 2018-11-07 11:54:18 -05:00
Isaac Connor 0e3eb0df17 remove extra quotes, google code style, update pod docs 2018-11-07 11:26:48 -05:00
Isaac Connor 4107082845 Don't delete default states if there are none 2018-11-07 11:01:49 -05:00
Isaac Connor 0ebcef7324 in poddoc and over needs a =back 2018-11-07 11:01:12 -05:00
Isaac Connor 4993894b27 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-07 10:43:41 -05:00
Isaac Connor 56bdd53757 Use the global dbh in ZoneMinder::Database instead of keeping our own copy of it in Logger 2018-11-07 10:40:44 -05:00
Isaac Connor c0c1247fa0 bump verion to 1.32.2 2018-11-07 10:33:55 -05:00
Isaac Connor 93bf05be4e Merge branch 'zmrecover' into storageareas 2018-11-06 20:37:35 -05:00
Isaac Connor 9a96785fa4 Add in Frame.php 2018-11-06 20:37:00 -05:00
Isaac Connor 5495ab8036 Fix package for Event 2018-11-06 16:15:27 -05:00
Isaac Connor c60bd3af1e Need to new an Event 2018-11-06 15:43:22 -05:00
Isaac Connor 5a6ffe758a Merge branch 'zmrecover' into storageareas 2018-11-06 15:29:02 -05:00
Isaac Connor f86ed5c66c allow interactive=0 and use Inf for log lines about resurecting events 2018-11-06 15:28:56 -05:00
Isaac Connor 181a8c29e1 Add SaveJPEGs to Event 2018-11-06 15:28:37 -05:00
Isaac Connor be0767b4cd Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-11-06 15:27:17 -05:00
Isaac Connor 5a933a93c2 clean up static vars and google code style 2018-11-06 15:27:10 -05:00
Isaac Connor 6d6d25261f Merge branch 'zmrecover' into storageareas 2018-11-06 12:14:54 -05:00
Isaac Connor 3cd1887d54 Cleanup POSIX use. Fix conflict between POSIX and Date::Format. 2018-11-06 12:14:42 -05:00
Isaac Connor d973d55d2f Use SaveJPEGs from the Event record instead of the Monitor Object 2018-11-06 11:45:34 -05:00
Isaac Connor aa9bb81b61 Merge branch 'zmrecover' into storageareas 2018-11-06 09:57:01 -05:00
Isaac Connor e0bc0484d4 Add empty string default for DefaultVideo 2018-11-06 09:56:29 -05:00
Isaac Connor 18b327b4ac Turn off massive debugging 2018-11-06 09:55:53 -05:00
Andrew Bauer ec95163810
Add fedora 29 support to buildsystem 2018-11-05 19:35:05 -06:00
Isaac Connor 762874fb4a Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-05 16:53:17 -05:00
Isaac Connor e1a5940254 Merge branch 'zmrecover' into storageareas 2018-11-05 16:53:01 -05:00
Isaac Connor 451c42ddf5 Implement rmrecover script. Flush out Object code to support find, find_one, find_sql, improve to_string, etc. 2018-11-05 16:52:34 -05:00
Andrew Bauer d3064e4402
Update zoneminder.spec 2018-11-05 07:06:34 -06:00
Andrew Bauer b8066e66ed
Update zoneminder.spec 2018-11-05 06:51:08 -06:00
Andrew Bauer 720505cbea
spelling 2018-11-04 17:14:46 -06:00
Andrew Bauer e6e7069ec0
Merge pull request #2293 from knight-of-ni/rpm-nginx 
update nginx support on redhat
 2018-11-04 17:13:11 -06:00
Andy Bauer 3aee902a96 update nginx support on redhat 2018-11-04 17:11:19 -06:00
Andrew Bauer 6360b84e15
Merge pull request #2288 from connortechnology/add_monitor_status_to_api 
rough in adding Monitor_Status to Monitors
 2018-11-03 20:46:11 -05:00
Andrew Bauer cac049e2c9
Merge pull request #2291 from pliablepixels/api-updates 
updated API - streaming/server/storage/other edits
 2018-11-03 20:45:52 -05:00
Andrew Bauer 0e6fbe2213
Merge pull request #2286 from ratmole/api-php-notice-fix 
API - Disable E_NOTICE from php error reporting in cake debug
 2018-11-03 20:41:52 -05:00
Andrew Bauer a50c2bae35
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg 
Audio only with ffmpeg
 2018-11-03 20:39:18 -05:00
Isaac Connor 4b24bf4e36 merge from storageareas, fully specify Module for zmDbDisconnect as we havn't 'used' it 2018-11-02 11:48:35 -04:00
Isaac Connor 09fab280ea SOCKS dir creation logs should be debug 2018-11-02 10:57:47 -04:00
Isaac Connor 17c091f9f9 Google code style and add a debug showing the # of addresses in hp 2018-11-02 10:26:39 -04:00