Commit Graph

21464 Commits (189bf2f687eddd077d6f5ccef2aa3ba5781ee2e2)

Author SHA1 Message Date
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
Isaac Connor 7da1da1e27 Add libio-interface-perl to dependencies. Fixes #3577 2022-09-16 09:45:19 -04:00
Isaac Connor e51ffb1721
Merge pull request #3588 from VikingGer/patch-1
Update control_functions.php
2022-09-16 09:26:12 -04:00
Isaac Connor 5f308ed795
Merge pull request #3589 from VikingGer/patch-2
Instar control for 720p CGI devices
2022-09-16 09:25:32 -04:00
VikingGer e1a2061ba2
Instar control for 720p CGI devices
Onvif just yielded the absolute basic functions, but especially no presets. This control fills the gap.
2022-09-16 15:14:05 +02:00
VikingGer c43b3d1aef
Update control_functions.php
The Reboot button was not shown without activating another one. Probably not intended  so  I did this micro adjustment
2022-09-16 14:21:15 +02:00
Isaac Connor c197644b96 Fix contents of values on LOCALE_DEFAULT. 2022-09-15 14:05:33 -04:00
Isaac Connor 62b6171934 Only try to set TIMEZONE when loading dateTimeFormatter if it is set. Handle the exception when any of TIMEZONE or LOCALE are invalid. 2022-09-15 14:04:31 -04:00
Isaac Connor bf2b6ca145 Specify that only main page content tables should have the first colunm be min-width: 300px. This was affecting the logout dialog table content. 2022-09-15 14:03:22 -04:00
Isaac Connor b7143a3c84 Add a check for auth timeout and re-adding with a new auth token. 2022-09-14 20:29:33 -04:00
Isaac Connor d1cd7d3f91 Merge branch 'master' into add_janus_rtsp_user 2022-09-14 18:34:07 -04:00
Isaac Connor 319904ab80 When we increment past the event, fix the curr_frame_id so we reference the last image. 2022-09-14 18:30:39 -04:00
Isaac Connor a944a1fac7 Fix no video due to height:auto on videojs 2022-09-14 13:31:25 -04:00
Isaac Connor bc566ccfdf Remove debugging 2022-09-14 13:15:02 -04:00
Isaac Connor 46de7afb0f Add fade to the logout modal which for some reason fixes it not showing after a hide 2022-09-14 13:09:51 -04:00
Isaac Connor 715122e93a Spacing, ignore auth_relay, clean up clickLogout a bit 2022-09-14 13:09:38 -04:00
Isaac Connor 62cf4547dc Merge branch 'iiot' of github.com:ZoneMinder/zoneminder into iiot 2022-09-13 18:27:20 -04:00
Isaac Connor 419a44f8ed Merge branch 'iiot' 2022-09-13 18:23:44 -04:00
Isaac Connor 6936a3547c shared data is frequently not valid or zmc not running. These shouldn't be errors as they generated too much noise. We can generate errors higher up. 2022-09-13 17:59:53 -04:00
Isaac Connor b4fc5abe95 Failure to auth by hash is common, the end result is a redirect to login page. Change the log level to INF 2022-09-13 17:59:53 -04:00
Isaac Connor 4624a53a90 Show time segments in progress bar. Fix alarm cues. 2022-09-13 17:58:30 -04:00
Isaac Connor deb35738db Merge branch 'master' into add_janus_rtsp_user 2022-09-13 16:17:15 -04:00
Isaac Connor 4668ffcaa9 rework event stream. Fixes seeking. Fixes event not completing due to not have Frame records for every frame. Adds send_twice to deal with browsers not showing the last sent image. Use locking around anything to do with curr_frame_id as commandQueue is it's own thread now. 2022-09-13 16:16:54 -04:00
Isaac Connor 8549cdf317 Implement a mutex/locks around changing event data, curr_frame_id, etc. also contains a fix for seeking due to > instead of <. In general fixes seeking 2022-09-12 16:17:42 -04:00
Isaac Connor ea1970418e don't let position go negative in onclick progressbar 2022-09-12 16:05:53 -04:00
Isaac Connor f3e04ca212 shorten and move up the indicator 2022-09-12 16:05:30 -04:00
Isaac Connor fd52e73268 Add time ticks to progressbar with a mouseover highlight 2022-09-12 13:44:18 -04:00
Isaac Connor e2bd72b6a0 Fix eslint 2022-09-12 13:44:18 -04:00