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

14200 Commits

Author SHA1 Message Date
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 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
Isaac Connor 7868d969ce add -v to rsync 2019-11-18 17:59:10 -05:00
Isaac Connor d9e3f21ba1 Turn off controlmaster to see if that is what is causing us trouble with rsync 2019-11-18 17:02:30 -05:00
Isaac Connor 627adf5a1f do the .deb installation and test on xenial instead of trusty 2019-11-18 14:35:26 -05:00
Isaac Connor efdba5a50f add ssh -v to rsync command so we can figure out why it isn't working 2019-11-18 14:31:32 -05:00
Isaac Connor ffc09a58ce remove extra install 2019-11-18 13:49:13 -05:00
Isaac Connor 0e626c6585 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-18 13:43:50 -05:00
Isaac Connor 16cea4b65a remove MIM attack possibility by specifying the host key to use for zmrepo.zoneminder.com. Might also solve travis deploy problems 2019-11-18 13:43:44 -05:00
Isaac Connor f90c1817c5
Merge pull request #2754 from pliablepixels/doc-fix 
add note on API wrapper
 2019-11-17 16:51:03 -05:00
Pliable Pixels 1a72b5b9fe
add note on API wrapper 2019-11-17 15:56:41 -05:00
Isaac Connor c3250dea00 fix typos and add some more text 2019-11-15 15:20:07 -05:00
Isaac Connor 79c1047bcf
Merge pull request #2752 from Tsopic/storage-docs 
Add storage docs
 2019-11-15 15:13:41 -05:00
Martin Kask 98a1cb8c29 Add storage docs 2019-11-14 08:00:52 +02:00
Isaac Connor fdf5150a16 fix build on jessie 2019-11-13 13:51:22 -05:00
Isaac Connor 070fe467d5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-11 13:34:23 -05:00
Isaac Connor 59b9220ddd if doing multiport still call Url(), as it requires a hostname 2019-11-11 13:33:54 -05:00
Andrew Bauer be970cce04
Update .travis.yml 2019-11-10 15:19:03 -06:00
Isaac Connor c1913cdbc4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-10 15:49:49 -05:00