Commit Graph

  • 5dbd9f867c
    Merge 3a901ae350 into bf4e87307a IgorA100 2025-09-09 20:41:32 +0000
  • 3a901ae350
    Merge branch 'ZoneMinder:master' into patch-527046 IgorA100 2025-09-09 23:41:29 +0300
  • af44e1797c
    Merge a5c6e02291 into bf4e87307a IgorA100 2025-09-09 23:39:27 +0300
  • bf4e87307a Put back OutputCodec as updates require it exists master Isaac Connor 2025-09-08 14:09:34 -0400
  • 244cabea3c Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2025-09-07 18:05:53 -0400
  • 9d91f452b1 TUrn off install for CxxUrl. Fixes #4436 Isaac Connor 2025-09-07 18:05:44 -0400
  • ef4ee1e276
    Merge pull request #4435 from IgorA100/patch-612243 Isaac Connor 2025-09-06 17:53:32 -0400
  • 0bd0e16dca
    Removed extra line break (ru_ru.php) IgorA100 2025-09-07 00:11:46 +0300
  • f1c2dbb894
    Added Russian translation for Help for audio recording to streamline label (ru_ru.php) IgorA100 2025-09-07 00:09:43 +0300
  • 2d762e2bdc Allow 0 for FPS limits Isaac Connor 2025-02-11 12:11:33 -0500
  • ab7ffd20f6 Add capture and analysis fps totals Isaac Connor 2025-08-19 18:55:19 +0530
  • 9cf3c1adec Limit scaled thumbnail to 100% Isaac Connor 2025-01-31 16:21:07 -0800
  • 1dfc577dd7 Add Help for audio recording to streamline label Isaac Connor 2025-01-08 12:35:08 -0500
  • b1e7266319 Turn off debug Isaac Connor 2025-05-14 14:16:25 -0400
  • ca8a3048ed Turn off debug Isaac Connor 2025-02-11 07:00:46 -0800
  • 164c4b9117 Default password for Amcrest is admin, pass Manufacturer to monitor creation Isaac Connor 2025-04-23 18:47:04 -0400
  • 203418d45e Only make symlink if name is different than id Isaac Connor 2025-05-06 20:03:33 +0000
  • 2a11b14bce Remove Function reference Isaac Connor 2025-09-06 11:34:09 -0400
  • f9d8ba5281 Store log Component in session Isaac Connor 2025-02-12 15:56:33 -0500
  • f9282db349 Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2025-09-06 10:55:44 -0400
  • bb356a8b96 Add debug of new keyframe interval Isaac Connor 2025-03-28 14:51:12 -0400
  • 09c767174f Try out a better method of counting keyframes Isaac Connor 2025-03-26 11:37:15 -0400
  • 3c4dca78f0 Log when failed to lock packet. Isaac Connor 2025-03-25 11:32:58 -0400
  • eb09e0ad33 Log the # of packets removed Isaac Connor 2025-02-20 22:48:54 -0500
  • 3be4e1440e Reduce debug logging Isaac Connor 2025-02-19 20:53:20 -0500
  • 727e1fe5bb Add debug to not keeping keyframes case Isaac Connor 2025-02-15 11:42:39 -0500
  • 15730be300 need to keep the greater of pre_event_count or alarm_frame_count in the packetqueue. Isaac Connor 2025-09-06 10:05:02 -0400
  • b03264957d Populate BaseURL Isaac Connor 2025-09-05 15:27:13 -0400
  • 1dde898154 Add support for NOT using named params, using query string instead Isaac Connor 2025-09-05 12:42:13 -0400
  • 9c96ba3d28 Fix references to StartTime => StartDateTime and EndTime Isaac Connor 2025-09-05 11:45:49 -0400
  • 96df4d254d Fix warning Isaac Connor 2025-09-05 10:24:47 -0400
  • edf87d6463 Move stream-info off the video stream down to where the monitor status info is. Isaac Connor 2025-09-05 09:35:53 -0400
  • 652d71c0b8 Remove path from url.hpp to resolve build issues Isaac Connor 2025-09-04 17:29:29 -0400
  • 42073929d1 Fix url to CxxUrl targz Isaac Connor 2025-09-04 17:23:07 -0400
  • 3ea34aef2d Add CxxUrl Isaac Connor 2025-09-04 15:59:07 -0400
  • d8c714cbff Fix url to CxxURL Isaac Connor 2025-09-04 15:42:49 -0400
  • 218578e6eb Fix eslint Isaac Connor 2025-09-04 15:30:44 -0400
  • 8a34e1e300 Add eslint.config.js to .eslintignore Isaac Connor 2025-09-04 15:27:51 -0400
  • ff1242d839 Add reason for failure to rename Isaac Connor 2025-09-04 15:23:23 -0400
  • a5c6e02291
    Avoid SQL error because we are not using the "ZMSEnabled" field yet(Monitor.php) IgorA100 2025-09-02 18:50:33 +0300
  • 22b03d44e3 Add parsing of http output into commands. Isaac Connor 2025-09-02 11:09:28 -0400
  • 49cfbebdd5 Rename amcrest_response to response. Add some other stuff to match onvif functionality Isaac Connor 2025-09-02 11:09:07 -0400
  • 0ca432fc6a Use Control::guess_credentials. Isaac Connor 2025-09-01 09:36:07 -0400
  • a534f9b429 Return uri from guess_credentials. Add a warning when no ip in ping Isaac Connor 2025-09-01 09:35:16 -0400
  • 0c53e6bf4e
    Merge 826c1e39bf into ba3f9439c0 IgorA100 2025-09-01 13:21:08 +1000
  • 7d1df1d95b Fix: Eslint IgorA100 2025-08-31 21:57:03 +0300
  • e514183265 Replaced "data-monitor-url" with "data-server-url" IgorA100 2025-08-31 21:34:13 +0300
  • ba3f9439c0 Move AMcrest API to Analysis tab as it does not depend on onvif Isaac Connor 2025-08-31 11:21:55 -0400
  • 17ecf16c3a Amcrest_API does not depend on ONVIF Isaac Connor 2025-08-31 11:20:45 -0400
  • f7951e9c66 Fixup amcrest api. Use path if onvif_url not defined. Remove duplicate multi_perform. Use user and pass if onvif user and pass not filled in. Isaac Connor 2025-08-31 11:20:24 -0400
  • 1f061c9666 Include CxxUrl and use it to build the correct url in Amcrest API Isaac Connor 2025-08-31 10:08:40 -0400
  • ed96724f54 Return undef or \!undef from open. Set self{host} for use in get/post Isaac Connor 2025-08-30 16:30:43 -0400
  • dfd5422538 Include # of messages in debug Isaac Connor 2025-08-30 10:56:22 -0400
  • 6c36959009 SPlit logic of fail to parse and no matching onvif_alarm_txt to allow for better debugging Isaac Connor 2025-08-30 09:53:03 -0400
  • 98c620d722 Don't default to MotionAlarm for ONVIF events, empty should allow for ALL events Isaac Connor 2025-08-30 09:30:22 -0400
  • b5af4db1c1 Add TapoC520WS PTZ Script Isaac Connor 2025-08-30 10:37:08 -0400
  • c1245d8b1e Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2025-08-30 10:31:36 -0400
  • 60bde473a6
    Update skin.js IgorA100 2025-08-29 22:42:25 +0300
  • cf0f0a46b4
    Added <select> to select players (monitor.php) IgorA100 2025-08-29 16:39:47 +0300
  • 2f356082ca
    For Thumbs we will assign the attribute "data-monitor-url" so that we can send ZMS the CMD_QUIT command without using MonitorStream. (watch.php) IgorA100 2025-08-29 16:12:31 +0300
  • 26f91efe93
    For Thumbs we will assign the attribute "data-monitor-url" (frames.php) IgorA100 2025-08-29 15:58:49 +0300
  • 06621b4915
    For Thumbs we will assign the attribute "data-monitor-url" so that we can send ZMS the CMD_QUIT command without using MonitorStream. (console.php) IgorA100 2025-08-29 15:21:05 +0300
  • 163124f816
    For Thumbs we will assign the attribute "data-monitor-url" so that we can send ZMS the CMD_QUIT command without using MonitorStream. (monitor.php) IgorA100 2025-08-29 15:16:06 +0300
  • 3807caa64b
    For Thumbs we will create the attribute "data-monitor-url" (events.php) IgorA100 2025-08-29 15:04:06 +0300
  • c0cac2e56c
    Merge cbe4e78207 into e517738ec0 IgorA100 2025-08-29 07:34:55 +0100
  • b8c98421a5
    Fix Eslint (monitor.js) IgorA100 2025-08-27 00:35:37 +0300
  • d40868890b
    Added support for "input.disabled" (skin.css) IgorA100 2025-08-27 00:21:46 +0300
  • e517738ec0 Fix for when there is no Model in Monitor Isaac Connor 2025-08-26 16:17:21 -0500
  • 7f24e0e30b
    Added 'ZMSEnabled' (monitor.php) IgorA100 2025-08-27 00:02:27 +0300
  • 02206048d1
    Disabled the ability to click on the element "input.disabled" (skin.js) IgorA100 2025-08-26 23:56:55 +0300
  • 182360f99b
    Added "ZMSEnabled" (Monitor.php) IgorA100 2025-08-26 23:36:30 +0300
  • d1e4f73168
    Feat: Added <select> to control enabling players on Monitor page (monitor.js) IgorA100 2025-08-26 23:05:07 +0300
  • a79a3f645b Default to no limit to fps Isaac Connor 2025-02-12 16:05:35 -0500
  • d67649417b prioritise event_id as log file format as we may also specify monitor -id Isaac Connor 2025-08-26 04:45:26 -0700
  • 2920c1fd55 Revert to single, include monitor for visiblity, don't appen auth_relay if it's empty Isaac Connor 2025-08-22 04:14:06 +0530
  • c9f9254b90 Code cleanups, move global jquery elements to top. Fixup underSlider stuff. It is still a mess. Isaac Connor 2025-08-22 00:44:19 +0530
  • e931f5ee40 Send an error image instead of ISE when we can't get the required frame Isaac Connor 2025-08-26 04:44:37 -0700
  • 8967a0ed7f prioritise event_id as log file format as we may also specify monitor -id Isaac Connor 2025-08-26 04:45:26 -0700
  • 75cf3a16d4
    Merge pull request #4427 from IgorA100/patch-679564 Isaac Connor 2025-08-26 08:06:05 -0400
  • 6fc80e70bb
    Merge 3ee8547409 into 38fd362f29 IgorA100 2025-08-24 22:11:55 +0000
  • 4dd30f58e2
    Use submitThisForm() only if there is no 'data-on-change' == 'submitThisForm' attribute (skin.js) IgorA100 2025-08-23 18:40:36 +0300
  • 02c481a05b
    Fix: Do not use submitThisForm() when the "Enter" button press event occurs, because our form already uses "data-on-change="submitThisForm"" (skin.js) IgorA100 2025-08-23 17:18:11 +0300
  • 38fd362f29
    Merge pull request #4425 from IgorA100/patch-90928 Isaac Connor 2025-08-22 08:30:39 -0400
  • 3c2dc57b1c
    Fix: Preview orientation at screen bottom for Monitor page (skin.js) IgorA100 2025-08-22 13:12:24 +0300
  • 5225e178bc Init output_codec to instead of 0 Isaac Connor 2025-08-20 16:35:57 -0400
  • 7bf2fb8fce Convert OutputCodec from int to varchar OutputCodecName. ffmpeg has different values for codec_id for different versions of ffmpeg. So just use the codec name instead. Isaac Connor 2025-08-20 15:59:02 -0400
  • 10c5d5123e
    Merge 9daa54bb45 into 0d88341712 VikingGer 2025-08-19 15:23:01 +0800
  • 86ea787ff2
    Merge a97dbc03c3 into 0d88341712 sletteland 2025-08-19 15:23:01 +0800
  • 05fcb5d8e0
    Merge db288824b3 into 0d88341712 Simpler1 2025-08-19 17:23:01 +1000
  • 7dadd9f7a1
    Merge 0d4c78e851 into 0d88341712 Doug Nazar 2025-08-19 14:12:01 +0800
  • c191f43d45 Add new eslint config Isaac Connor 2025-08-18 16:04:17 -0400
  • b3f1d5cfe7 When coming back from AYSW, maybe img.src == new src. Just set it and send a PLAY for good measure Isaac Connor 2025-08-18 15:52:13 -0400
  • 0d88341712 Fix url and uri Isaac Connor 2025-08-18 15:50:40 -0400
  • 035b81dff5 Remove trixie as packpack doesn't support it yet Isaac Connor 2025-08-18 15:40:00 -0400
  • b64351b3e1 Fix streams not restarting because player='' auto and we need to be looking at activePlayer Isaac Connor 2025-08-18 15:14:49 -0400
  • 6185c53818 Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2025-08-18 13:29:59 -0400
  • d0b7c6a04d Fix eslint Isaac Connor 2025-08-18 09:30:02 -0400
  • 9022fa00e2 Fix casing on SecondPathInput. Fixes #4424 Isaac Connor 2025-08-18 08:58:05 -0400
  • 7200e6c067 Only show groups if there are any in the system. Add autocomplete=one-time-code to prevent autocomplete on manufacturer and model Isaac Connor 2025-08-15 18:22:43 -0400
  • 7cf58d230e Rename Event to event, and use new fix_DefaultVideo and guess_EndDateTime to make the recovered video more useuful by fixing DefaultVideo and EndDateTime Isaac Connor 2025-08-14 18:07:55 -0400