Commit Graph

15315 Commits

Author SHA1 Message Date
Brandon Myers ce4e04cd0b
Fix typo in AUTH_TYPE help text 2020-06-27 00:23:05 -05:00
Isaac Connor e137e1dacf Don't consult EVENT_CLOSE_MODE if mode is RECORD 2020-06-26 19:30:35 -04:00
Isaac Connor 73ec5f10a5 sendCmd failures should not be fatal 2020-06-26 16:52:34 -04:00
Isaac Connor d1e7d396f7 zmcontrol needs to be able to take floats instead of integers for it's parameters 2020-06-26 16:49:55 -04:00
Isaac Connor 0a383c02c4 Better debugging of REQUEST/POST vars 2020-06-23 22:20:07 -04:00
Isaac Connor 4d8d926c89 minor code updates. Use user_row instead of generic row variable name. 2020-06-23 22:19:46 -04:00
Isaac Connor e778ea0918 Update saving Users. Don't allow restrictions on admin user. Fix CSP violations. 2020-06-23 22:19:04 -04:00
Isaac Connor 93b0552ed7 Update saving Users. Don't allow restrictions on admin user. Fix CSP violations. 2020-06-23 22:18:45 -04:00
Isaac Connor 728f41fe9c Log @debug when a linked monitor is disconnected. Use ZM_MAX_RESTART_DELAY instead of hard coded 60 seconds before next reconnect attempt 2020-06-23 16:56:35 -04:00
Isaac Connor 31a3be5c8e check shared_data->valid when checking if LinkedMonitor is connected 2020-06-23 15:05:17 -04:00
Isaac Connor 7354b4d30f Fix compile on old ffmpeg 2020-06-23 14:43:11 -04:00
Isaac Connor e618966e08 spacing, improve error message when can't connect. 2020-06-23 10:23:17 -04:00
Isaac Connor a15aace2fb introduce shared_data->zmc_heartbeat_time and zma_heartbeat_time. 2020-06-22 10:40:00 -04:00
Isaac Connor 4d020bab56 spacing 2020-06-22 10:39:29 -04:00
Isaac Connor f73cb3bebe Don't start filter if the command was execute 2020-06-17 13:36:28 -04:00
Isaac Connor e68bf13a6b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-06-17 12:50:42 -04:00
Isaac Connor d3c474fc8b use translate on Show/Hide Zones 2020-06-17 12:50:36 -04:00
Isaac Connor 8efe00157d add a User object 2020-06-17 12:50:22 -04:00
Isaac Connor 1a838b1137
Merge pull request #2964 from roddone/stream-zoom-accuracy
apply stream scale in zoom coordinates
2020-06-17 09:30:52 -04:00
Romain ODDONE dcb77cdaea
apply stream scale in zoom coordinates 2020-06-17 14:46:10 +02:00
Isaac Connor aba403e3f2 Correct handling of Transport in onvif results 2020-06-16 16:48:17 -04:00
Isaac Connor 30072cf9e1 Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal. 2020-06-15 16:06:51 -04:00
Isaac Connor ae5116ff9c improve efficiency of outputting device query. The constant strlen's were terrible. 2020-06-15 15:29:26 -04:00
Isaac Connor 1b9402239a Add libvncclient0 as an option for jessie 2020-06-15 14:59:33 -04:00
Isaac Connor 9b4a753194 deprecate ubuntu disco 2020-06-09 14:20:35 -04:00
Isaac Connor d984c33b92 Replace old message abou ensuring that ZM is stopped with our new one, which only pauses if ZMIS running. 2020-06-09 13:36:33 -04:00
Isaac Connor a2a28d389e Finish exporting and fixing new systemStatus packageControl and daemonControl functions 2020-06-09 13:35:52 -04:00
Isaac Connor 5e0f1a03c5 Detect if system is running and prompt to stop it before doing the update. 2020-06-09 13:19:19 -04:00
Isaac Connor d4488ac4e1 spacing 2020-06-09 12:18:29 -04:00
Isaac Connor 58ae7bb342 die early if db connection fails 2020-06-07 11:57:20 -04:00
Isaac Connor d59697b9b5 fix event->self 2020-06-07 11:57:08 -04:00
Isaac Connor a719565bf3 Merge branch 'master' into add_user_to_filters 2020-06-05 19:03:23 -04:00
Isaac Connor 198790796d Merge branch 'release-1.34'
plus cleanups in dbConnect
2020-06-05 19:02:43 -04:00
Isaac Connor d0a24ae32b Make all Filters operate on in-progress events 2020-06-05 18:01:20 -04:00
Isaac Connor 65d7c9e51d bump version 1.35.5 2020-06-05 17:51:06 -04:00
Isaac Connor caa48e7b80 Finish canEdit function 2020-06-05 17:50:52 -04:00
Isaac Connor 0905655377 Merge branch 'master' into add_user_to_filters 2020-06-05 17:08:14 -04:00
Isaac Connor 402ab9ad9f Bump version to 1.34.16 for release 2020-06-05 16:38:20 -04:00
Isaac Connor f71926c736 Merge branch 'release-1.34' 2020-06-05 10:09:07 -04:00
Isaac Connor 910d4b51c9 Escape table names for mysql-8 2020-06-04 11:44:59 -04:00
Isaac Connor 20e6a1f53d Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password. 2020-06-04 11:37:44 -04:00
Isaac Connor 8802447b10 Handle no DB_HOST specifed so default to localhost 2020-06-04 11:36:10 -04:00
Isaac Connor f8a11633bb Handle no db_host specified, meaning local unix socket 2020-06-04 11:35:48 -04:00
Isaac Connor ef3fc758cb in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954 2020-06-04 11:34:48 -04:00
Isaac Connor c4b2aa4a85 Handle no DB_HOST specifed so default to localhost 2020-06-04 11:34:16 -04:00
Isaac Connor 6869710747 Handle no db_host specified, meaning local unix socket 2020-06-04 11:28:26 -04:00
Isaac Connor 87078dfc31 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-06-03 17:41:09 -04:00
Isaac Connor 0644358d0a in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954 2020-06-03 17:41:03 -04:00
Isaac Connor 14f7e01c00
Merge pull request #2942 from roddone/fix_monitors_table_responsive
make monitors table (console view) responsive
2020-06-03 15:44:38 -04:00
Isaac Connor ade0d750c8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-06-03 15:37:32 -04:00