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

13605 Commits

Author SHA1 Message Date
Isaac Connor 1103928ed7 only call check_timezone on console for efficiency in all other requests 2019-08-15 15:16:20 -04:00
Isaac Connor f09941ed48 timezone errors shouldn't be fatal 2019-08-15 15:16:02 -04:00
Isaac Connor 81dadc17dc Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-14 16:18:31 -04:00
Isaac Connor c7b6db9be7 Put backticks around all columns and tables in sql to deal with mysql 8 2019-08-14 16:18:21 -04:00
Isaac Connor e390195ebb Merge branch 'storageareas' 2019-08-13 15:34:38 -04:00
Isaac Connor ed9175b4ad Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2019-08-13 15:34:11 -04:00
Isaac Connor 74e414eb00 Clean up ugly hack in CopyTo. Do not modify the object resulting in cached crap 2019-08-13 15:33:38 -04:00
Isaac Connor 4140d51e9f database.php cleanup. remove dbFetchMonitor and dbFetchGroup. Their usage has been replaced with the Object::find_one usage. Also more quoting of table and colume names to fix #2659 2019-08-13 11:45:50 -04:00
Isaac Connor 29fc63dd15 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-11 20:21:50 -04:00
Isaac Connor c1984ad7cb Fix problem calculating mem_size using an int from ImageSize. With camera resolutions going up, width*height*colour could exceed 32bits. So use a guarnteed 53bit type, which fixes the memsize calculations. Fixes #2682 2019-08-11 20:21:37 -04:00
Andrew Bauer d75d64280d
Update zoneminder.spec 2019-08-11 15:03:15 -05:00
Isaac Connor 5b62c91cc2 Improve some debugging to try to diagnose recent segfault report 2019-08-10 14:46:05 -04:00
Isaac Connor 0cdb43e165 make dump_video_frame a define instead of a function, fix linesize 2019-08-10 14:45:45 -04:00
Isaac Connor 38a09bbd18 Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas 2019-08-08 15:34:07 -04:00
Isaac Connor 3368f94c1a
Add code to handleDelay to cancel identical delayed actions. Fixes #2619 (#2681) 2019-08-08 14:38:27 -04:00
Isaac Connor 2e9d72ed63 spacing and extra () 2019-08-08 14:11:24 -04:00
Isaac Connor 5f77634aca Update Group object to use shared code in Object.php. Should fix #2659 2019-08-08 13:51:56 -04:00
Isaac Connor 702cb65d2a Merge branch 'storageareas' 2019-08-08 13:38:36 -04:00
Isaac Connor 45b970fb09 fix spacing 2019-08-08 13:34:28 -04:00
Isaac Connor df285006d2 change sortHeader to include eid if it is in the request 2019-08-08 13:34:10 -04:00
Isaac Connor d3ba0ce129 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2019-08-08 13:16:40 -04:00
Isaac Connor a9de537e01 Merge branch 'master' into storageareas 2019-08-08 09:27:27 -04:00
Isaac Connor bb6d2631c9 Fix hwaccel compile on pi 2019-08-08 09:26:40 -04:00
Isaac Connor 1892528679 quotes 2019-08-08 09:26:15 -04:00
Isaac Connor 5b0509e000 When invalid operator terms, use print_r on the term instead of just the operator 2019-08-08 09:26:00 -04:00
Tsaukpaetra c5d2aab80a Update faq.rst (#2680) 
Add new entry for timezone-related issue
 2019-08-08 08:47:23 -04:00
Isaac Connor b23a1d0955 Merge branch 'master' into storageareas 2019-08-07 15:51:21 -04:00
Isaac Connor 3a142df14f Only send zmdc.pl commands for filters to running servers 2019-08-07 15:51:01 -04:00
Isaac Connor bf6170bf61 Test for values in aws url and give better errors if Url empty. Don't append events dir to S3 bucket path 2019-08-07 15:47:12 -04:00
Isaac Connor fb414b3f19 remove debug statements 2019-08-07 15:34:45 -04:00
Isaac Connor fb7ab993b5 Have to include the --daemon param when telling zmdc.pl what to do with zmfilter.pl 2019-08-07 15:34:30 -04:00
Isaac Connor d4b59211cd Merge branch 'master' into storageareas 2019-08-07 11:21:19 -04:00
Isaac Connor fcabec085f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-07 11:16:01 -04:00
Isaac Connor 5cc6b6b0af Fix EIMOD substitution 2019-08-07 11:15:50 -04:00
Andrew Bauer 78e49cd2cb
Update debian.rst 
fixes #2679
 2019-08-07 09:39:28 -05:00
Isaac Connor 26720192ea bumpv ersion for copy to filtet code 2019-08-06 20:30:06 -04:00
Isaac Connor 962049fa31 Merge branch 'master' into filter_add_copy 2019-08-06 20:17:21 -04:00
Isaac Connor 8759eb88a9 Merge branch 'fix_2671' into storageareas 2019-08-02 08:05:12 -04:00
Isaac Connor ebbb2359d3 gMerge branch 'master' into storageareas 2019-08-02 08:05:06 -04:00
Isaac Connor 7e6b0058d2 Update Zone buttons. Fix double submit. Fixes #2671 2019-08-02 08:04:38 -04:00
Isaac Connor 6a9464044b Demote warnings about fixing non-monotonic dts to debug 2019-08-02 08:03:02 -04:00
Isaac Connor 479e7c290c cosmic is unsupported, don't build for it by default 2019-08-01 09:51:03 -04:00
Isaac Connor d578f34ecc Merge branch 'master' into storageareas 2019-07-31 20:51:03 -04:00
Isaac Connor 14ed777eeb fix segfault when debbing is turned on for zma 2019-07-31 17:17:54 -04:00
Isaac Connor 90cb5d018a
Fix 2673 (#2675) 
* Change MaxFPS to DECIMAL(5,3) to handle values like 1/60 = 0.017

* When fps < 1 we may need to wait longer than 10s.  Also, we cannot sleep for a long time, because we may need to send a keep alive or check the command queue. So limit the sleep to 1s

* Bump version

* Update MaxFPS to Decimal(5,3)

* Fix missing ;
 2019-07-31 11:42:38 -04:00
Isaac Connor 48ad8d47fc Add capture_max_fps to monitor object instead of just calculating the delay. 2019-07-31 11:23:02 -04:00
Isaac Connor 7f19831e0c Use isset when testing for existence of authash in session 2019-07-29 14:54:55 -04:00
Isaac Connor 5a93150f5b Use isset when testing for existence of authash in session 2019-07-29 14:54:36 -04:00
Isaac Connor e5ba108149 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2019-07-26 12:46:01 -04:00
Isaac Connor 8167ff2143 fix eslint 2019-07-26 12:28:02 -04:00