Commit Graph

22307 Commits (6e8347c693859acec370a7f4e4d489c282c2f6d3)

Author SHA1 Message Date
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
Isaac Connor 87f4f9afbd Add scale to status for monitorStream 2023-04-06 19:02:50 -04:00
Isaac Connor 2773385262 Remove redundanct frame_mod=1 2023-04-06 19:02:24 -04:00
Isaac Connor 1ada7d7504 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-04-06 15:16:12 -04:00
Isaac Connor 01b886ef49 Add scale to status and fix cast on elapsed 2023-04-06 15:15:36 -04:00
Isaac Connor a256056d0a All float values in various fields 2023-04-05 17:50:56 -04:00
Isaac Connor ce0a83f904 Reduce minimum to .05% as that is what seems to be necessary these days 2023-04-05 17:47:03 -04:00
Isaac Connor 394cd6e0f8 AlarmRGB should be an actual hex value not a string 2023-04-05 17:46:29 -04:00
Isaac Connor 23fb13f660 Show streams even if not running, since they may be on a different server 2023-04-05 17:46:08 -04:00
Isaac Connor 21f6bdae35 Change minimum percent to 50% instead of 3% 2023-04-05 14:46:13 -04:00
Isaac Connor d170112ef7 Change minimum percent to 50% instead of 3% 2023-04-05 14:45:30 -04:00
Isaac Connor b1df318491 Use ORM Zone Object for Zone insertion on new monitor 2023-04-05 14:43:50 -04:00
Isaac Connor 231b0ab631 Sync up default values with what gets added in actions/monitor 2023-04-05 14:42:44 -04:00
Isaac Connor 48067542f9 Limit progressbar to 100% 2023-04-05 08:59:16 -04:00