Commit Graph

23035 Commits (remove_triggers)

Author SHA1 Message Date
Isaac Connor 195a353bda Add Viewing idle timeout code to watch.js and montage.js 2023-11-20 13:42:19 -05:00
Isaac Connor d3cb7774b0 Add ZM_WEB_VIEWING_TIMEOUT, and remove quotes around config integer values so that they are integers instead of strings. 2023-11-20 13:38:22 -05:00
Isaac Connor 3ce96005af Load Type when loading Config 2023-11-20 13:26:28 -05:00
Isaac Connor c7bd2adb11 add ZM_WEB_VIEWING_TIMEOUT 2023-11-20 13:25:53 -05:00
Isaac Connor 3627a4e97d Add ZM_WEB_VIEWING_TIMEOUT config setting for each bw profile. 2023-11-20 13:25:26 -05:00
Isaac Connor d06264624a Refresh events list when filters at top change or close in the case of datetimepicker 2023-11-17 12:06:03 -05:00
Isaac Connor 936cefb41a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-11-17 09:33:22 -05:00
Isaac Connor 56095bec9d Must use MIN_STREAMING_PORT in monitor Url because 80/443 might not go to the same host as MIN_STREAMING_PORT (think reverse proxy) 2023-11-17 09:33:17 -05:00
Isaac Connor 6232cfb8b1 Remove 100 limit on response to events index. Handle there not being a next or prev neighbour. 2023-11-16 18:00:30 -05:00
Isaac Connor d62779b1e8 Include command that failed in Error. 2023-11-16 13:06:52 -05:00
Isaac Connor 939db57fa9 When command fails, log at Warning instead of Debug. 2023-11-16 13:06:29 -05:00
Isaac Connor 0d6df970d3 Enforce max length of 64k for log entries. Use HTTP_X_FORWARDED_FOR in logging so we log actual remote addr 2023-11-16 10:34:44 -05:00
Isaac Connor afb594aa19 Don't load Servers, they are loaded globally in config. Enforce int instead of string for range because fseek can't handle strings 2023-11-16 10:34:44 -05:00
Isaac Connor a1693c34b9 Add HTTP_FRONT_END_HTTPS as a signal to use https in urls. Mainly for when using a reverse proxy 2023-11-16 10:34:44 -05:00
Isaac Connor ee0ef4b6e4 Handle when there are no cueFrames populated 2023-11-16 10:34:43 -05:00
Isaac Connor d9ae4f8e04 Do not need to make servers global in this context. They are by default.| 2023-11-16 10:34:43 -05:00
Isaac Connor 40975184e0 Return the found term instead of true in has_term. 2023-11-16 10:34:43 -05:00
Isaac Connor 8e0793f5e7 Do not format StartDateTime and EndDateTime in ajax events results. Do the formatting in js. 2023-11-16 10:34:43 -05:00
Isaac Connor 50e930ec5c Merge branch 'master' into remove_triggers 2023-11-15 11:34:21 -05:00
Isaac Connor c23ee28fe6 Take expires setting off setCookie so it defaults to 2038 like everywhere else. 2023-11-15 11:34:05 -05:00
Isaac Connor a243263d70
Merge pull request #3785 from efranzwa/fix-monitor-tabs
Fix Monitor Source Tab Rendering
2023-11-15 09:28:03 -05:00
efranzwa cf906e86c8 Added missing table tags 2023-11-15 04:55:18 -08:00
efranzwa 83af15329a Fixed Monitor->WebSite Source Refresh html 2023-11-14 04:13:04 -08:00
Andrew Bauer dbd82709a2 fix invalid date in rpm specfile changelog 2023-11-13 13:41:35 -06:00
Isaac Connor 93ed0d9309 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-11-13 11:38:11 -05:00
Isaac Connor c1b32b79a2 Code style clceanup in server action 2023-11-13 11:38:03 -05:00
Isaac Connor abb4230f86 Use ajax error when specified storage not found. 2023-11-13 11:37:47 -05:00
Isaac Connor aaebd725bb Set default values on members, fixing bad defaults on nwe storage. 2023-11-13 11:37:31 -05:00
Isaac Connor 9f04d90a27 When ZM_AUTH_HASH_IPS is off, don't use remote ip in storing auth hash in session. If ips are constantly changing it breaks. 2023-11-13 11:31:45 -05:00
Jonathan Bennett 3ee44207e5 Modify .spec file to fix rpmbuild 2023-11-12 16:52:52 -06:00
Isaac Connor 1f4e12d2c3
Merge pull request #3783 from efranzwa/update-version
Update ZM version in SECURITY.md
2023-11-12 16:03:35 -05:00
efranzwa 2798e6f205 Update ZM version in SECURITY.md 2023-11-12 04:59:37 -08:00
Isaac Connor beb3e65f54
Merge pull request #3782 from efranzwa/docs-definemonitor
Updates to Docs Defining Monitors Section
2023-11-11 12:11:08 -05:00
efranzwa fec884493c Added images for Defining Monitors section 2023-11-10 12:59:38 -08:00
efranzwa bf08d6c9bc Added MQTT Tab section 2023-11-10 12:54:49 -08:00
efranzwa bea5677a31 Added Misc Tab section 2023-11-10 12:54:33 -08:00
efranzwa ac8ce700bc Added X10 Tab section 2023-11-10 12:54:06 -08:00
efranzwa ad65e34d0f Added Control Tab section 2023-11-10 12:53:48 -08:00
efranzwa bd3b73220f Added Buffers Tab section 2023-11-10 12:53:24 -08:00
efranzwa 703939f7ec Added Timestamp Tab section 2023-11-10 12:53:00 -08:00
efranzwa ca784d9722 Added ONVIF Tab section 2023-11-10 12:52:10 -08:00
efranzwa b347385b21 Added Viewing Tab section 2023-11-10 12:51:46 -08:00
efranzwa 31a1278286 Added Recording Tab section 2023-11-10 12:51:04 -08:00
efranzwa 4861aa7acb Added Analysis Tab section 2023-11-10 12:50:21 -08:00
efranzwa f7cb484fbd Added Source Tab section 2023-11-10 12:49:49 -08:00
efranzwa 15e8ff578b Added General Tab section 2023-11-10 12:49:01 -08:00
efranzwa 8d29f0e468 Add the Adding Monitors section 2023-11-10 12:47:01 -08:00
efranzwa 97b2bd5b9b Update Defining Monitors doc section 2023-11-10 12:42:29 -08:00
Isaac Connor a882b71a3b Close db before logterm because dbclose can do logging at debug level. 2023-11-09 14:54:38 -05:00
Isaac Connor aaaa321464 fix eslint 2023-11-09 11:55:17 -05:00