Commit Graph

  • 392d4f367f Bump version to 1.36.36 Isaac Connor 2024-10-25 10:53:42 -0400
  • ebeb01a40a Clean out duplicated datetimeformatter stuff that happens in config.php Isaac Connor 2024-10-25 10:51:01 -0400
  • 824ae0e60f Check for validity of locale. Handle fatal crash when setting datetiemformatter when an invalid locale is used. Fixes #4179 Isaac Connor 2024-10-25 10:41:56 -0400
  • f02121fcc2 Check for validity of locale. Handle fatal crash when setting datetiemformatter when an invalid locale is used. Fixes #4179 Isaac Connor 2024-10-25 10:41:56 -0400
  • bd6570d492 Add missing const Isaac Connor 2024-10-24 18:29:23 -0400
  • 73cebb5a77 Improve debug message Isaac Connor 2024-10-24 10:23:44 -0400
  • dadd9e24df when counting keyframe interval in clearPackets start at 0. Reset max_keyframe_interval when clearing packetqueue. This prevents errors in log when using ondemand capture Isaac Connor 2024-10-24 10:23:29 -0400
  • 8496ce637a When every frame is a keyframe, make max_keyframe_interval=1 instead of 0 as 0 is the uninitialised state Isaac Connor 2024-10-24 10:11:31 -0400
  • 8a7c7f20f6 Add Turkishtr Isaac Connor 2024-10-24 10:00:32 -0400
  • 2e4cd94853 Fix eslint Isaac Connor 2024-10-24 09:02:46 -0400
  • 550c08969f Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2024-10-24 09:02:09 -0400
  • 859f80fab4 MQTT Error should be a debug Isaac Connor 2024-10-24 08:16:57 -0400
  • bc5000ec06 Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2024-10-23 19:06:37 -0400
  • 899269d83f Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2024-10-23 18:47:50 -0400
  • 93953cef3a ALways re-apply the last update Isaac Connor 2024-10-23 18:46:54 -0400
  • c7975f11ed Add missing n Isaac Connor 2024-10-23 09:04:17 -0400
  • 1b08c6d00f Init last_fps_update in stream constructor Isaac Connor 2024-10-22 18:32:31 -0400
  • 6f8ac29aa9 Make stream state inline so it all fits on one line Isaac Connor 2024-10-22 18:31:36 -0400
  • e600472625 If using WallClockTimestamps, don't sweat a big jump in time. Isaac Connor 2024-10-22 18:22:50 -0400
  • 02871576a5 Add fps to event status. Convert CmdTimer to Interval Isaac Connor 2024-10-22 18:22:19 -0400
  • b6d01f45f4 Removed the deprecated delay code, and swapped some vars for consts Isaac Connor 2024-10-22 16:18:54 -0400
  • ce1a1b87e9 Only try to send a command to enable analysis frames if we are streaming through zms. prevents an error being logged Isaac Connor 2024-10-22 16:18:31 -0400
  • 61d07af38a
    No generate scaled jpeg if we passed $_REQUEST['path'] (image.php) IgorA100 2024-10-22 19:24:42 +0300
  • bc351c5c75
    Update montage.js IgorA100 2024-10-22 19:18:10 +0300
  • 140d51eeda
    Sanitize input data (montage.php) IgorA100 2024-10-22 19:03:17 +0300
  • 81568a72f3
    Merge branch 'ZoneMinder:master' into patch-474778 IgorA100 2024-10-22 19:00:19 +0300
  • c2fccb16b1 Add support for no sort field. No longer default to StartDateTime 1.36.35 Isaac Connor 2024-10-22 10:26:45 -0400
  • bbe366f05f Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2024-10-22 10:15:08 -0400
  • 5ff4bee71f Gracefully handle if panzoom entry hasn't been created Isaac Connor 2024-10-22 10:15:04 -0400
  • b273db24e1 Have to add MOSQUITTO_FOUND and MOSQUITTOPP_FOUDN to zoneminder-config.cmake in order for those defines to show up in config.h Isaac Connor 2024-10-21 17:39:27 -0400
  • 6b32790a93 FIx up zm_mqtt.cpp to actually compile Isaac Connor 2024-10-21 17:38:56 -0400
  • 282d736491 Add debug to tell when mqtt not compiled in, add include for zm_mqtt.h Isaac Connor 2024-10-21 17:38:15 -0400
  • 7ba5476f95 Correct MQTT library addition to ZM_BIN_LIBS Isaac Connor 2024-10-21 17:37:43 -0400
  • d111455c6a Append monitor id to MQTT name Isaac Connor 2024-10-21 07:10:52 -0400
  • d16481dede Remove generated files Isaac Connor 2024-10-21 07:10:30 -0400
  • a140754eb1 Janus_Use_RTSP_REstream is a checkbox, and so doesn't have length. Isaac Connor 2024-10-06 20:02:28 -0400
  • 91e31d91bc Load #progressBar once Isaac Connor 2024-10-06 20:02:02 -0400
  • dea3b741c9 Require path to be a defined storage area. Use detaintPath to prevent Path Traversal. Fixes GHSA-g355-3rf6-f38v Isaac Connor 2024-09-30 07:09:19 -0400
  • 60363e5a62
    Merge branch 'ZoneMinder:master' into patch-474778 IgorA100 2024-10-21 23:43:22 +0300
  • a35bb17f8e Fix format string for response_code Isaac Connor 2024-10-21 15:18:11 -0400
  • 890f14860d We need a lock around accessing the alarms map, because the onvif thread may clear an item while we are accessing it. Isaac Connor 2024-10-21 15:18:05 -0400
  • 42914b63c0 Remove unneeded initialisations and group command processor code together Isaac Connor 2024-10-20 18:04:12 -0400
  • 369c448dd3 TUrn x10 events into a debug Isaac Connor 2024-10-20 09:58:56 -0400
  • 6e57c55db6 Move response_code down in scope, log curl_error value if not ok. Isaac Connor 2024-10-18 18:39:08 -0400
  • f265497cca
    Code cleaning (montage_class.php) IgorA100 2024-10-19 00:01:29 +0300
  • 6ba0f63a3d
    Fix: Last unfinished event (display on Timeline, playback) (montage_class.php) IgorA100 2024-10-18 23:46:09 +0300
  • 3f8e2a5500
    Fix: Text size in Canvas (montage.js) IgorA100 2024-10-18 23:38:46 +0300
  • 8a6b597d34 Only require Date::Manip if using strtotime Charlie Root 2023-12-08 11:25:07 -0800
  • 0f0f571c7a Make NULL be case-insensitive Isaac Connor 2024-09-03 09:50:58 -0400
  • b176709c30 Add checking of keyframeinterval to Ready() Isaac Connor 2023-08-14 12:56:48 -0400
  • a7e01f2db2 Only calculate keyframe interval using video stream Isaac Connor 2023-12-06 12:25:30 -0500
  • 3ae02948e7 Fix again the infinite loop in counting keyframes Isaac Connor 2023-09-11 11:26:47 -0400
  • dccec69b2e Fix infinite loop looking for keyframe interval Isaac Connor 2023-09-08 14:16:31 -0400
  • 90dc655090 Count keyframes on queuePacket so that analysis Ready() will start when out of order packets are present Isaac Connor 2023-08-23 11:41:54 -0400
  • b50ef69629 Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2024-10-16 18:45:51 -0400
  • 88692cf04f COde style, cleanups, remove STATE_TAPE Isaac Connor 2024-10-16 18:45:10 -0400
  • 2770a9caa7 Handle change of res/colours in zms by reloading the monitor object. Isaac Connor 2023-12-08 10:14:38 -0500
  • b236b48f1b Updates removing zma and fixing some of the perl module names Isaac Connor 2024-10-16 11:42:55 -0400
  • ca24b43f36 Fix typo Isaac Connor 2024-10-16 10:23:37 -0400
  • 962f91e22c Add No sort field as an option Isaac Connor 2024-10-16 10:23:21 -0400
  • f5828f7024 Handle failure to allocate a frame Isaac Connor 2024-10-16 10:23:03 -0400
  • c8b652c25b Fix crash due to trying to access event->StartTime when there is no event Isaac Connor 2024-10-16 10:22:47 -0400
  • c4dbbbccc5 Revert change of tot_score and avg_score to unsigned ints. Make them ints so that comparison with other scores is ok Isaac Connor 2024-10-16 10:22:25 -0400
  • 123c261e75 Fix eslint Isaac Connor 2024-10-15 18:16:55 -0400
  • c2fe3ce1e8 Fix eslint Isaac Connor 2024-10-15 18:10:05 -0400
  • 038bf5c07e Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2024-10-15 17:58:48 -0400
  • 65fd598bb7 Upgrade jwt-cpp to 0.7.0 Isaac Connor 2024-10-15 17:41:48 -0400
  • a89160ff2d Fix zone edit image jumping around when status is alert Isaac Connor 2024-10-15 16:36:31 -0400
  • d04153b06b Only show location tab when GEOLOCATION is turned on Isaac Connor 2024-10-15 13:53:00 -0400
  • f12d7a2184 Fix labelling for defaultCodec, as it is used for event viewing, not live view. Isaac Connor 2024-10-15 13:38:44 -0400
  • 4ea68c59d5 Add End Date Time as an option for sorting in filters Isaac Connor 2024-01-09 17:13:27 -0500
  • 75cd5e6166
    Merge pull request #4175 from 0xB0D/master+gsoap-link-fix Isaac Connor 2024-10-13 12:01:29 -0400
  • f43d048641 Fix libgsoap linking in src/CMakeLists.txt Bryan O'Donoghue 2024-10-13 13:57:34 +0100
  • d224128372
    Fix last event that has not yet ended (montage_class.php) IgorA100 2024-10-11 00:11:25 +0300
  • 0cb5c61570
    Fix: Last event that has not yet ended (montage_class.php) IgorA100 2024-10-10 23:45:00 +0300
  • 2be8cf7e63 Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2024-10-10 13:56:23 -0400
  • f1a72c909d
    Merge pull request #4171 from IgorA100/patch-438287 Isaac Connor 2024-10-10 13:52:33 -0400
  • 8e2bbd57c5
    Merge pull request #4172 from IgorA100/patch-406680 Isaac Connor 2024-10-10 13:51:00 -0400
  • a745c61aef
    Merge pull request #4173 from IgorA100/patch-253092 Isaac Connor 2024-10-10 13:10:55 -0400
  • 0019857f11 Die with semi-useful log message if failed to create x10 Isaac Connor 2024-10-10 12:21:37 -0400
  • e4fa3e9e12
    Increase z-index to 20 for buttons ".btn-zoom-in & .btn-zoom-out" (skin.css) IgorA100 2024-10-10 16:24:14 +0300
  • b59a72b8e5
    On TimeLine display the last, unfinished event (montage_class.php) IgorA100 2024-10-09 00:10:39 +0300
  • a0398dd2d7
    Merge pull request #4170 from 0xB0D/master+alarms-fix Isaac Connor 2024-10-08 15:33:28 -0400
  • fb19016564
    Fix: Specify 'mode'=>'mp4' for getStreamSrc() Otherwise video.js sometimes cannot determine that it is a file recording that is being played, and not a direct viewing. (event.php) IgorA100 2024-10-08 19:58:14 +0300
  • 4d38ecd06e
    Fix: incorrect placement of brackets (event.php) IgorA100 2024-10-08 19:49:25 +0300
  • 1136ef9ebe Fix alarms() out of scope Bryan O'Donoghue 2024-10-08 11:48:07 +0100
  • a1753f3dd2
    Fix: $defaultSpeed = 1.0 (montage.php) IgorA100 2024-10-06 22:47:05 +0300
  • 31af773448
    Fix: save "speed" value in cookies for viewing in recording (montage.js) IgorA100 2024-10-06 22:43:47 +0300
  • a0a95d887c Don't crash when alarms is empty Isaac Connor 2024-10-06 11:07:10 -0400
  • 6e1e077a90 If shm size is 0 don't log an error Isaac Connor 2024-10-04 14:35:06 -0400
  • 3d3ece315b Code style and spacing Isaac Connor 2024-10-04 14:34:42 -0400
  • f9f2d0cdd1 Fix some spaces Isaac Connor 2024-10-04 12:22:24 -0400
  • a83c598dae
    When the event is not playing, display "No recording for this time" instead of "No Event" (montage.js) IgorA100 2024-10-04 18:06:47 +0300
  • 3b10ec1ac6
    Fix: Get next event to play (montage.js) IgorA100 2024-10-04 14:36:43 +0300
  • 59756eb747
    Optimization of SQL query for getting last event (montage_class.php) IgorA100 2024-10-04 13:27:46 +0300
  • be946e959b
    Merge pull request #4167 from BHMSD-bdailey/ONVIFNotes Isaac Connor 2024-10-03 14:54:33 -0400
  • abd3097af3 Merge branch 'master' of github.com:ZoneMinder/zoneminder Isaac Connor 2024-10-03 14:42:57 -0400
  • d2514b5e83 a while is better than a for Isaac Connor 2024-10-03 14:42:51 -0400
  • 52d3eba938
    Fix: Removed extra AJAX requests when receiving the next event for playback (montage.js) IgorA100 2024-10-03 20:30:50 +0300
  • 6159a74d41 Clean up unneeded code Ben Dailey 2024-10-03 11:59:08 -0400