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

22270 Commits (becabbcd1af4a2c81b7075b4fedd614840141423)

Author SHA1 Message Date
Isaac Connor 4d8d4b6ee5 Update add_monitors to make it scan the network. 2023-04-21 17:52:14 -04:00
Isaac Connor e4509a54ce Move form control search box font fix to skin so it affects everywhere 2023-04-21 17:51:44 -04:00
Isaac Connor 0480a745d8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-04-21 17:37:44 -04:00
Isaac Connor 9102389394 Remove debugging from font loading 2023-04-21 17:33:14 -04:00
Isaac Connor 5cbec2aa81
Merge pull request #3689 from ZoneMinder/baudneo-patch-JanusRTSPTimeoutFix 
Fix Janus RTSP Timeout grouping
 2023-04-20 08:56:05 -04:00
baudneo 343dd7006c
Fix ESLint errors 
GitHub web editor adds tabs when it autoformats code,
 2023-04-20 00:44:04 -06:00
baudneo 7a7c57f4d4
Update monitor.js 
Fix indentation.
 2023-04-20 00:39:42 -06:00
baudneo ad6f93d6d8
Update monitor.js 
Hide Janus RTSP Timeout when use Janus is unchecked.
 2023-04-20 00:36:04 -06:00
Isaac Connor 94ef0939ba Add Deleted=false to sql loading monitors 2023-04-19 18:57:11 -04:00
Isaac Connor 02046b9c88 Use object methods to load monitor and delete it 2023-04-19 18:56:52 -04:00
Isaac Connor 73548dda73 Add Deleted member 2023-04-19 18:56:29 -04:00
Isaac Connor 6a2d28d92f If Monitor is deleted, don't show event 2023-04-19 18:56:19 -04:00
Isaac Connor 8862fe9d87 Only start non deleted Monitors 2023-04-19 18:55:48 -04:00
Isaac Connor e15d1f7e5b Add Deleted column to Monitors 2023-04-19 18:25:45 -04:00
Isaac Connor 2dd869ab1e
Merge pull request #3688 from kholk/patch-2 
views/monitor.php: Add back h264 NVMPI decoder
 2023-04-18 12:20:20 -04:00
AngeloGioacchino Del Regno daa47f4eac
views/monitor.php: Add back h264 NVMPI decoder 
While moving decoder selection to be configuration based, the NVMPI based
H264 decoder was missed: add it back.

Fixes: 5027bf207 ("add h264_mmal as a decoder option")
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
 2023-04-18 18:02:48 +02:00
Isaac Connor 2c2b0a4c30 Add current setting for analysing and recording to Function column 2023-04-13 17:08:13 -04:00
Isaac Connor 2447f6e0db Fix wrong number of parameters when using text search 2023-04-13 13:27:20 -04:00
Isaac Connor ad89fe94ac If holding ctrl when clicking zoomout button, zoom out all the way 2023-04-13 12:25:50 -04:00
Isaac Connor 8a434c95fc Fix checkbox column still being on the right in the footer 2023-04-13 12:25:26 -04:00
Isaac Connor c61d5ce341 Implement ZOOMSTOP for live monitor view 2023-04-13 12:25:08 -04:00
Isaac Connor 1f11493266 Don't need to add auth_hash if we have auth_relay 2023-04-13 10:13:27 -04:00
Isaac Connor 50be9b6bf1 Allow table to have 200 rows instead of 100. 2023-04-13 10:13:06 -04:00
Isaac Connor 036091d7e1 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-04-11 12:12:09 -04:00
Isaac Connor 1fcb29bbba Fix the auto population of ControlAddress with user:port@ip 2023-04-11 12:12:04 -04:00
Isaac Connor 1f87eddd48 Cast event counts to int so that they say 0 instead of null 2023-04-11 08:22:18 -04:00
Isaac Connor 08e315c25d Fix unmatched} 2023-04-11 07:55:23 -04:00
Isaac Connor 6fd46c54d5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-04-11 07:54:02 -04:00
Isaac Connor 240333381a Handle val and cnj not being specified. Add Notes to attr that must be non empty 2023-04-11 07:53:55 -04:00
Isaac Connor 22bca46921 When viewing events with no startdate add a blak StartDate filter 2023-04-10 18:09:29 -04:00
Isaac Connor 8c923aa0be Put back zm_create.sql 2023-04-10 15:48:20 -04:00
Isaac Connor 74409daec4 Fix 5MP resolution 2023-04-10 14:20:53 -04:00
Isaac Connor b85b7e462e When testing ZM_ALARM_ON_SOUND, use string comparison as the config value is a string. Also add log if other config options are not set 2023-04-10 13:13:36 -04:00
Isaac Connor aff74f0dab Add text spans on buttons so we could hide text if we wanted to 2023-04-10 10:49:26 -04:00
Isaac Connor e447137bf9 Define ZM_DIR_SOUNDS on montage 2023-04-09 08:58:28 -04:00
Isaac Connor 8dcc767af1 Split button bar into three sections, adding a right button bar and make it flex. Add right buttons to do sorting instead of using an image in each row. Move the Id column to the left for consistency and good UI. 2023-04-07 13:27:20 -04:00
Isaac Connor 75d9d9ad9b Fix eslint 2023-04-07 12:09:01 -04:00
Isaac Connor 92f8adb654 Fix eslint 2023-04-07 12:08:18 -04:00
Isaac Connor 7b3a613474
Merge pull request #3685 from Simpler1/shift-delete-event 
feat(event): Shift delete with no confirm
 2023-04-07 12:03:55 -04:00
Simpler1 26d39dcde6 feat(event): Shift delete with no confirm 2023-04-07 12:00:53 -04:00
Simpler1 e0dd6ccca2 feat(event): Shift delete with no confirm 2023-04-07 11:26:32 -04:00
Isaac Connor b2fe561608
Merge pull request #3682 from Simpler1/alarm-sound 
fix(alarmSound): Use Audio.play() for alarm sound
 2023-04-07 11:17:14 -04:00
Isaac Connor 977f392ffb
Merge pull request #3684 from Simpler1/shift-delete-watch 
feat(watch): Shift delete with no confirm
 2023-04-07 11:16:08 -04:00
Isaac Connor 70693b2b49
Merge pull request #3683 from Simpler1/shift-delete-events 
feat(events): Shift delete with no confirm
 2023-04-07 11:13:00 -04:00
Simpler1 0a84cd0327 fix(alarmSound): Use Audio.play() for alarm sound 2023-04-07 10:55:09 -04:00
Simpler1 d4b9982584 feat(events): Shift delete with no confirm 2023-04-07 10:54:15 -04:00
Simpler1 4b0a6e1cb0 feat(watch): Shift delete with no confirm 2023-04-07 10:53:11 -04:00
Isaac Connor e45e798c3f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-04-06 19:03:45 -04:00
Isaac Connor 2343a42eea Add Resolution to event stats 2023-04-06 19:03:40 -04:00
Isaac Connor 37c1b923bb Update var=>const, and add detection of unapplied scale to image stream, and re-apply 2023-04-06 19:03:24 -04:00