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

21276 Commits (adbf25e9b7e1f29c7f751e2f405e05c74d7ce502)

Author SHA1 Message Date
Isaac Connor d9c0e1dd8f Move RTSPServer options to under Viewing 2022-09-09 11:37:19 -04:00
Isaac Connor c306722a4e Adjust styles on ONVIF tab so that Username and Password are shorter and there is room for the reveal password icon 2022-09-09 11:35:50 -04:00
Isaac Connor 8ba1bbc63c Set new defaults: Only analysis jpegs, and passthrough on. Label Size => Default. Fix warnings when creating a new MOnitor because Path, User, Pass are unset. 2022-09-09 11:29:32 -04:00
Isaac Connor 11c2cc1829 Change first entry of Storage Areas to say Unspecified instead of Default. 2022-09-09 09:35:12 -04:00
Isaac Connor 9276ae7d67 calling trim on null is deprecated 2022-09-08 15:11:53 -04:00
Isaac Connor 0e2e1903c1 Only init the boostrap events table if we can view Events. 2022-09-08 15:11:39 -04:00
Isaac Connor 834dc3c986 Restore status value to pre 1.36.16 value by substracting 1. So Unknown == -1, 0 = IDLE etc. Fixes #3584 2022-09-08 13:01:45 -04:00
Isaac Connor 1e3b26e178 Add time ticks to progressbar with a mouseover highlight 2022-09-08 11:50:16 -04:00
Jonathan Bennett c35bbc8c30 Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it 2022-09-07 15:49:47 -05:00
Jonathan Bennett db3017de7d Adds the generateKey() function to zm_crypt 2022-09-07 15:49:47 -05:00
Isaac Connor 0e22181092 Merge branch 'master' into iiot 2022-09-07 15:13:11 -04:00
Isaac Connor 7398fd97d7 Fix eslint 2022-09-07 09:35:03 -04:00
Isaac Connor 594649605c Slightly smarted UriEncode, which doens't include numbers and a few other valid characters. Needs more work and tests. 2022-09-07 09:31:50 -04:00
Isaac Connor 8aaa5e52b3
Merge pull request #3582 from megasaturnv/3516-CaseInsensitiveLogin 
Issue #3516 case insensitive login
 2022-09-06 16:39:53 -04:00
Isaac Connor bb8b11a2a1 Allow viewing a specific video file instead of DefaultVideo 2022-09-06 15:44:41 -04:00
Isaac Connor 11bfdebc72 clean up, give generation options even if viewing. Fix viewing. Add transform option. 2022-09-06 15:44:09 -04:00
Isaac Connor dbf92147d7 setup video.js on the video tag if it exists 2022-09-06 15:42:49 -04:00
Isaac Connor 82fb209e7f include video.js for video view as well as event 2022-09-06 15:42:11 -04:00
Isaac Connor f98f5648d9 Center video obj 2022-09-06 15:41:55 -04:00
Isaac Connor 7059e5a1ea For mp4, use video tag, with videojs instead of embed 2022-09-06 15:41:42 -04:00
Isaac Connor 4c40ef8cfb Add transform support and use Event::createVideo 2022-09-06 13:46:54 -04:00
Isaac Connor 3079438038 Move createVideo from functions to Event 2022-09-06 13:46:41 -04:00
Isaac Connor 46b3edbb10 Add -t option to zmvideo.pl to add transforms like hue=s=0 support 2022-09-06 13:45:16 -04:00
Isaac Connor 783fadc2d4 Make GenearteVideo code handle more options for generating video, including transforms like=hue=s=0 2022-09-06 13:44:53 -04:00
Isaac Connor c4b895045b format filesize into human_readable in generate video view 2022-09-06 11:41:53 -04:00
Isaac Connor e6c8081fb6 Convert password fields to hidden fields on submit so that browser doesn't offer to remember passwords 2022-09-06 11:22:47 -04:00
Isaac Connor 70073719e4 use ajax() instead of getJSON so that we can specify no timeout. This prevents log queries from stacking up overloading the db 2022-09-06 11:22:47 -04:00
Isaac Connor ce2aea9615 fix updating donation reminder. I would always be a month or more 2022-09-06 11:22:47 -04:00
Isaac Connor d9babda8ad remove extra spacing, move dropdown option own to where they are used 2022-09-06 11:22:47 -04:00
Isaac Connor 1f20b18100 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-09-06 11:22:28 -04:00
Isaac Connor d76c425057 Fix saving monitor due to MQTT being empty 2022-09-06 11:22:04 -04:00
megasaturnv 9d8e32b28c Modified description for ZM_CASE_INSENSITIVE_USERNAMES 2022-09-05 15:49:26 +01:00
megasaturnv 6c4fb3e2cd
Moved case-insensitive username checks to SQL 2022-09-05 15:43:53 +01:00
megasaturnv d80026cab1
Fix typo 2022-09-05 15:29:23 +01:00
Isaac Connor 85278293c2 Make monitor rows in event stats a link if user can view monitors. Include path to event. 2022-09-04 13:54:18 -04:00
Isaac Connor b611a4fc08 Use y instead of Y for path generation when using Deep scheme. Fixes #3583 2022-09-04 13:53:19 -04:00
megasaturnv 6c0f40f570 Renamed ZM_AUTH_CASE_INSENSITIVE_USERNAMES to ZM_CASE_INSENSITIVE_USERNAMES as name was too long ZoneMinder/zoneminder#3516 2022-09-02 12:03:47 +01:00
megasaturnv 63e5b63eec Added option ZM_AUTH_CASE_INSENSITIVE_USERNAMES to match mixed case usernames to lower case usernames in database ZoneMinder/zoneminder#3516 2022-09-02 11:58:02 +01:00
Isaac Connor 4508940c30 Don't trust zm_packet->packet to not be null 2022-09-01 07:10:44 -04:00
Isaac Connor 87e251561d Hide fieldset borders on filter edit. They look weird because the top one is hidden 2022-09-01 07:09:36 -04:00
Isaac Connor 0378023a11 Fix colours on hr to match button blue. 2022-09-01 07:09:27 -04:00
Isaac Connor 4c90bd0ac6 Add a title to the zone polygon 2022-09-01 07:08:39 -04:00
Isaac Connor 6c8819977e Cache Group Monitors Ids so we don't query the database multiple times for them. 2022-09-01 07:08:04 -04:00
Isaac Connor 980e49b547 Don't query for Monitors if there are no Monitors in the Group. 2022-09-01 07:07:55 -04:00
Isaac Connor 3d1a9c5b2d Add LIMIT 1 when filtering by AlarmZoneId to speed up 2022-09-01 07:06:46 -04:00
Isaac Connor 606fb108d5 Fix use of filter instead of this 2022-09-01 07:06:10 -04:00
Isaac Connor f610cd5e1b Don't trust zm_packet->packet to not be null 2022-09-01 13:04:40 +02:00
Isaac Connor 3115952782 Check for key existing instead of value to fix duplication of the first label dataset 2022-08-31 23:39:33 +02:00
Isaac Connor 148460630b use ajax() instead of getJSON so that we can specify no timeout. This prevents log queries from stacking up overloading the db 2022-08-31 23:38:50 +02:00
Isaac Connor ee4302f2cf Hide fieldset borders on filter edit. They look weird because the top one is hidden 2022-08-31 23:37:32 +02:00