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

14370 Commits

Author SHA1 Message Date
Isaac Connor 0947c3ef24 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-30 15:37:09 -05:00
Isaac Connor 927165a934 debug the recording_started timestamp and warning when we can't fine a frame before the requested time 2019-11-30 15:37:05 -05:00
Isaac Connor e096e0a7fe improve error logging when running as root as can't chown log file 2019-11-30 15:35:09 -05:00
Isaac Connor 00b67ec352
Merge pull request #2768 from selvanair/fix-video-start 
Correct video buffer length when analysis and capture fps differ
 2019-11-30 14:53:22 -05:00
Isaac Connor eedb31730e fix saving Monitor values that don't get passed when empty, like Enabled 2019-11-29 14:49:43 -05:00
Isaac Connor cab1056328 improve debugging in recursive_array_diff 2019-11-29 14:49:10 -05:00
Isaac Connor 393c25b4f2 fix array keys 2019-11-29 14:26:03 -05:00
Isaac Connor d6a414a1a4
Merge pull request #2767 from connortechnology/fix_2692 
Fix 2692
 2019-11-29 14:24:00 -05:00
Isaac Connor aaa570ed68 bump version for update 2019-11-29 14:23:28 -05:00
Isaac Connor a49d97a526 bump version 2019-11-29 14:07:50 -05:00
Isaac Connor 29572abef2 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:56:02 -05:00
Isaac Connor a9d8e73f68 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:53:46 -05:00
Isaac Connor 7e92900542 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:50:02 -05:00
Isaac Connor 4817efe17c Add enum support for Orientation and Scheme to Events 2019-11-29 13:48:20 -05:00
Isaac Connor d02e30ceca Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:48:02 -05:00
Isaac Connor 55dd40ec85 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:47:45 -05:00
Isaac Connor 01d61f4f32 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:47:25 -05:00
Isaac Connor 585535da30
Merge pull request #2765 from ZoneMinder/pliablepixels-patch-2 
Update api.rst
 2019-11-28 10:48:35 -05:00
Pliable Pixels b4a8790555
Update api.rst 
https://github.com/ZoneMinder/zoneminder/issues/2764#issuecomment-559451717
 2019-11-28 10:39:49 -05:00
Isaac Connor 97d97f3d19
Merge pull request #2763 from pliablepixels/auth-fixes 
Its not necessary the token is a refresh. Can also be empty
 2019-11-27 09:01:13 -05:00
Pliable Pixels 7b99c89541
its not necessary the token is a refresh. Can also be empty 2019-11-26 20:57:25 -05:00
Isaac Connor d9014bf9e7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-26 16:17:33 -05:00
Isaac Connor 54a15573ad Make 32bit the default for COlours 2019-11-26 15:06:24 -05:00
Isaac Connor 5ebf929598 Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area. 2019-11-26 14:36:39 -05:00
Isaac Connor 9d18d5e6f2 Include features in issues that don't go stale 2019-11-25 12:36:47 -05:00
Andrew Bauer 5fb622e432
remove support for f28 builds 2019-11-24 08:27:39 -05:00
Isaac Connor ab9f99bdbb Fix Width & Height rotation when scaling. Fixes #2760 2019-11-22 12:18:30 -05:00
Isaac Connor ce44fd52d8 must reset do_log_rotate! 2019-11-22 10:04:55 -05:00
Isaac Connor 6c997a0bd6 quotes 2019-11-22 10:03:09 -05:00
Isaac Connor c6d5198984 Fix the log Hup handler. It is too heavy. Signals can happen at any time and rotating the logs can pull the dbh connection out from under a running dbi operation. So just set a flag and move the re-init to logPrint 2019-11-22 10:02:50 -05:00
Isaac Connor 150db7e36e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-21 13:32:36 -05:00
Isaac Connor 1dc83700c0 Do a better job of handling the non-server, non-multiport case. Put the code in Url so that it works for other functions that call Url() 2019-11-21 13:32:27 -05:00
Isaac Connor cbe1d7a440
Merge pull request #2759 from pliablepixels/mem_typo 
typo fix
 2019-11-21 12:30:48 -05:00
Pliable Pixels 722a74e038 typo fix 2019-11-21 11:16:13 -05:00
Isaac Connor f1ec455665 Add some debug to logrot 2019-11-21 10:49:23 -05:00
Isaac Connor 1c51c695d9 Remove printMsg, it will be inherited 2019-11-21 10:49:04 -05:00
Isaac Connor e215a6661d Google code style updates, better quotes 2019-11-21 10:45:18 -05:00
Isaac Connor 606c89962f eliminate an extra db call 2019-11-20 16:30:26 -05:00
Isaac Connor 19d4a2287f When restarting, if the process was already dead, we won't restart it. So add a start call. Fixes #2757 2019-11-20 14:22:12 -05:00
Isaac Connor 0648fbf0ca clean up the zmrepo key stuff 2019-11-20 14:21:12 -05:00
Isaac Connor 0f8d2faa6f Just use return code from rsync. We don't mind it's verbose output being always output. 2019-11-20 14:21:01 -05:00
Isaac Connor 65222ff726 put back ssh_known_hosts add-on since the other hack doesn't seem to be working 2019-11-20 13:06:30 -05:00
Isaac Connor d1458108f4 Add dimensions wrong check. Add bytes count 2019-11-20 12:43:17 -05:00
Isaac Connor 9d4c802b48 netEmpty is deprecated. Use notBlank instead 2019-11-20 09:32:19 -05:00
Isaac Connor 5feeedf7f4 Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor 2019-11-20 09:31:58 -05:00
Isaac Connor 5494fdb087 When upgrading from a version that doesn't do DiskSpace storage, there can be a lot of events to update. Can't load them all or we run out of ram. Batch them in 1000's 2019-11-20 09:31:16 -05:00
Isaac Connor ac96a19371 Fix filtering monitors by user's MonitorId restriction 2019-11-19 17:21:01 -05:00
Isaac Connor 207e5918c8 fix lint, remove debug 2019-11-19 11:37:45 -05:00
Isaac Connor e4c23c3100 crank of the verbosity. Add another rsync call just to test if output is not being reported to travis 2019-11-19 09:36:43 -05:00
Isaac Connor 61e27bcb29 Use ecdsa key instead of rsa. Apparently ecdsa is the new correct default. 2019-11-19 09:11:53 -05:00