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
163 MiB
Commit Graph

21341 Commits (6218d065a590ea6188cf2536a2ccf114732dbd66)

Author SHA1 Message Date
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
Isaac Connor f431ab9e45 Slightly smarted UriEncode, which doens't include numbers and a few other valid characters. Needs more work and tests. 2022-09-12 13:44:18 -04:00
megasaturnv f094a2c76b Modified description for ZM_CASE_INSENSITIVE_USERNAMES 2022-09-12 13:44:18 -04:00
megasaturnv 8fc60fef12 Moved case-insensitive username checks to SQL 2022-09-12 13:44:18 -04:00
megasaturnv 143a00cccc Fix typo 2022-09-12 13:44:18 -04:00
megasaturnv c90e2f7898 Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516 2022-09-12 13:44:18 -04:00
megasaturnv e9ab7f2f26 Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516 2022-09-12 13:44:18 -04:00
Isaac Connor c22007e8ee Allow viewing a specific video file instead of DefaultVideo 2022-09-12 13:44:18 -04:00
Isaac Connor 60d01376c5 clean up, give generation options even if viewing. Fix viewing. Add transform option. 2022-09-12 13:44:18 -04:00
Isaac Connor d3e3807263 setup video.js on the video tag if it exists 2022-09-12 13:44:18 -04:00
Isaac Connor fdbe950640 include video.js for video view as well as event 2022-09-12 13:44:18 -04:00
Isaac Connor 8676609425 Center video obj 2022-09-12 13:44:18 -04:00
Isaac Connor dbcf320808 For mp4, use video tag, with videojs instead of embed 2022-09-12 13:44:18 -04:00
Isaac Connor 37dac7d3a6 Add transform support and use Event::createVideo 2022-09-12 13:44:18 -04:00
Isaac Connor 4d2f956827 Move createVideo from functions to Event 2022-09-12 13:44:18 -04:00
Isaac Connor e98fb98181 Add -t option to zmvideo.pl to add transforms like hue=s=0 support 2022-09-12 13:44:18 -04:00
Isaac Connor 7f627cc253 Make GenearteVideo code handle more options for generating video, including transforms like=hue=s=0 2022-09-12 13:44:18 -04:00
Isaac Connor f9fddcb6ee format filesize into human_readable in generate video view 2022-09-12 13:44:18 -04:00
Isaac Connor 6452f8127a Convert password fields to hidden fields on submit so that browser doesn't offer to remember passwords 2022-09-12 13:44:18 -04:00
Isaac Connor eb9ac11d21 fix updating donation reminder. I would always be a month or more 2022-09-12 13:44:18 -04:00
Isaac Connor 1fe3d52c96 remove extra spacing, move dropdown option own to where they are used 2022-09-12 13:44:18 -04:00
Isaac Connor 813434e0f4 Fix saving monitor due to MQTT being empty 2022-09-12 13:44:18 -04:00
Isaac Connor e088e88e13 Make monitor rows in event stats a link if user can view monitors. Include path to event. 2022-09-12 13:44:18 -04:00
Isaac Connor ce4dd065ff Use y instead of Y for path generation when using Deep scheme. Fixes #3583 2022-09-12 13:44:18 -04:00