ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,341 Commits
32 Branches
93 Tags
162 MiB
Commit Graph

21341 Commits (6218d065a590ea6188cf2536a2ccf114732dbd66)

Author SHA1 Message Date
Pliable Pixels 6218d065a5 make OutputCodec work in API 2022-09-25 12:41:07 -04:00
Jonathan Bennett 9cb21dce22 Uses the master Janus secret as the mountpoint secret, detects and restarts mounts if PIN is stale 2022-09-24 16:05:52 -05:00
Isaac Connor e91b11d1db Add IDLE to the states where we will close the event at section length end time. 2022-09-23 14:17:28 -04:00
Isaac Connor 63e4c81d9c Try out just using connkey as the semaphore key instead of ftok 2022-09-22 16:22:36 -04:00
Isaac Connor 8a6db4a5e7 convert event->Id() explicitly to a string for strpos. 2022-09-22 16:21:25 -04:00
Isaac Connor faa6b8c9e7 Add connkey and semaphore key to logging about failure to get semaphore. Add sem_release before every ajaxError call because ajaxError exits and so we never release the semaphore. 2022-09-22 11:30:59 -04:00
Isaac Connor a16e7aad62 Switch to utf8mb4 to support 4 byte unicode which is available since mysql 5.5 2022-09-22 10:15:57 -04:00
Isaac Connor cb6dd816d8 streamSrc is no longer used and is making php complain 2022-09-21 15:46:42 -04:00
Isaac Connor 5fef98ce6f Add types to buttons. Make save a submit button, and remove the javascript onclick event. 2022-09-21 15:37:47 -04:00
Isaac Connor 9338732bd3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-21 14:36:05 -04:00
Isaac Connor 363c589975 More properly fix the alarm status api changing. The previous hack broken doing alarm on/off. 2022-09-21 14:35:27 -04:00
Isaac Connor 97a791656e Fix log causing idle events to not be closed when close_mode=ALARM. 2022-09-21 13:41:09 -04:00
Isaac Connor f68c64ea30 Last and next buttons don't get disabled if the event record thinks it has more frames than are actually in the db. 2022-09-21 13:24:18 -04:00
Isaac Connor 6d1b341141 Add a.btn-primary.disabled to disabled buttons style so that frame view buttons look right 2022-09-21 13:23:49 -04:00
Isaac Connor 1072a8aa69 When scaling frame images, apparently a float value for height is no good. So use intval to fix. 2022-09-21 13:23:16 -04:00
Isaac Connor 895adcb4c4 put back code to close an event when idle, at section_length when using CLOSE_MODE==idle 2022-09-21 12:32:15 -04:00
Isaac Connor 9d6d5a242f fix monitorIds => MonitorIds 2022-09-21 12:32:15 -04:00
Isaac Connor 78ab6583e7 Fix typo causing broken link to monitor in event stats 2022-09-21 12:32:15 -04:00
Isaac Connor c3c897cd76 In failure state populate imageData array to reduce output php errors 2022-09-21 12:32:14 -04:00
Isaac Connor 86f27d2ac5 Update frame view js to use const etc instead of var. Put back EventId and FrameId in stats being links and fix FrameId not being populated. If no stats available disable the stats button and use the title to explain why. 2022-09-21 12:32:14 -04:00
Isaac Connor 291c43ec0f Add spans and titles over the title h2 parts so that on mouseover it tells you what they are 2022-09-21 12:32:14 -04:00
Isaac Connor 6e55ae4f7d
Merge pull request #3598 from megasaturnv/3516-CaseInsensitiveLogin 
Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516
 2022-09-21 11:51:34 -04:00
megasaturnv 8fb6477820
Case insensitive login - Fix spacing ZoneMinder/zoneminder#3516 2022-09-21 16:47:16 +01:00
Isaac Connor 4138aa950b
Merge pull request #3597 from sashashura/patch-1 
GitHub Workflows security hardening
 2022-09-20 10:05:07 -04:00
Alex 6b0985a690 build: harden create-packages.yml permissions 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2022-09-20 13:35:41 +02:00
Alex 8514658262 build: harden release-packages.yml permissions 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2022-09-20 13:35:33 +02:00
Isaac Connor 58e22e3e1d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-19 17:46:40 -04:00
Isaac Connor 7f38ec1999 Update API entries replacing Function concept 2022-09-19 13:46:29 -04:00
Isaac Connor 4907a706a7 New image of monitor add view 2022-09-19 13:40:52 -04:00
Isaac Connor a6e6b5015d Add a note about setting the Id monitor field 2022-09-19 13:17:55 -04:00
Isaac Connor 4f76b36a75 Update defining monitors section of docs to reflect the current state. 2022-09-19 13:14:39 -04:00
Isaac Connor c6cdf070af Update the requirements for monitor Name. Whitespace is allowed! 2022-09-19 11:45:53 -04:00
Isaac Connor b24fab2463 Bump version to 1.37.23 2022-09-18 18:14:29 -04:00
Isaac Connor dfbd9f4ed4 Set the rtsp version so that the mandatory s field in the SDP is filled 2022-09-18 14:16:35 -04:00
Isaac Connor abc5ea26d8 Merge branch 'master' into add_janus_rtsp_user 2022-09-18 12:44:25 -04:00
Isaac Connor bdf5b5d202 Use empty() instead of length() which is faster. Add rtsp path to debug 2022-09-18 12:36:29 -04:00
Isaac Connor dd82a01291 Don't encode the user/pass. If they were properly entered in the web ui then we will double encode them. 2022-09-18 12:35:04 -04:00
Isaac Connor 11d6911ad4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-17 19:17:02 -04:00
Isaac Connor 67a7c0721a Fix bad merge reverts. Put back code that take username and password from fields in monitor instead of parsing from rtsp path 2022-09-17 18:58:50 -04:00
Isaac Connor a36a28d4b5
Merge pull request #3591 from VikingGer/patch-4 
Update MonitorLinkExpression.js
 2022-09-17 14:53:31 -04:00
Isaac Connor ec16937939
Merge pull request #3592 from VikingGer/patch-5 
Update event.js
 2022-09-17 10:23:24 -04:00
Isaac Connor 3843b9e14f
Merge pull request #3593 from VikingGer/patch-6 
Update report.php
 2022-09-17 10:22:33 -04:00
Isaac Connor d1edd8fd1f
Merge pull request #3594 from VikingGer/patch-7 
Update reports.js
 2022-09-17 10:22:04 -04:00
VikingGer ac55a9e0f2
Update reports.js 
Function name missing? Assumed to be correct according to the rest.
 2022-09-17 10:28:10 +02:00
VikingGer a099a4e3ae
Update report.php 
Again Eslint errors
 2022-09-17 10:19:42 +02:00
VikingGer 851ddb7f06
Update event.js 
Again Eslint errors
 2022-09-17 10:14:00 +02:00
VikingGer 11a4735082
Update MonitorLinkExpression.js 
Trailing spaces lead to eslint error. Removed them
 2022-09-17 10:08:07 +02:00
Isaac Connor 7d9771e41c Merge branch 'master' into add_janus_rtsp_user 2022-09-16 18:33:52 -04:00
Isaac Connor adbf25e9b7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-16 18:33:38 -04:00
Isaac Connor ad1a504d53 remove blank line 2022-09-16 18:33:23 -04:00