ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,042 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

498 Commits

Author SHA1 Message Date
Isaac Connor cb80283398 Merge branch 'master' into timeline_multi_monitor 
update code to use jquery instead of mootools
when only viewing 1 monitor, split view in half
load first event image righ toff the bat
 2022-02-11 18:03:35 -05:00
Isaac Connor 31eff49a46 Implement filter limits. Which go before pagination/advanced search limits 2022-02-02 10:49:05 -05:00
Jonathan Bennett fb832e7d1b Adds janus_enable_audio, a switch to try to enable audio in live stream viewing. 2022-01-19 00:14:52 -06:00
Jonathan Bennett 3a9c16aeea First working Janus build 2022-01-10 23:22:37 -06:00
Isaac Connor 79c45f50d5 define raw as an empty array so we don't generate js errors 2022-01-07 16:21:34 -05:00
Isaac Connor edbe726e86 Implement semaphore retry. Make not getting the semaphore an error 2021-12-17 09:41:45 -05:00
Isaac Connor 30e4d72c1d Implement CMD_MAXFPS 2021-12-16 16:36:12 -05:00
Isaac Connor 69faa42ca7 Add more of the resulting SQL to the filter debug modal 2021-12-13 15:00:55 -05:00
Isaac Connor 6511dc8a4f Allow empty sort field. 2021-12-13 15:00:35 -05:00
Isaac Connor 529e889d99 remove extra , 2021-11-12 15:11:48 -05:00
Isaac Connor 9036728bdc Report error if sql fails. Add check for access to specific event. 2021-11-12 15:11:48 -05:00
Isaac Connor 3ac5402699 Pretty up the v4l field names 2021-11-12 15:11:48 -05:00
Isaac Connor 1fd99424bb Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-05 10:13:41 -04:00
Isaac Connor 3208059040 Fix event listing when not paginated. 2021-11-02 17:24:05 -04:00
Isaac Connor 224b34d69d Send all stats rows instead of just 1. Handle receiving all rows, and don't list event id and frame id 2021-10-29 18:54:23 -04:00
SzymekCRX 2bcad7bf5e
Critical bug in events.php 
Two extra brackets causes fatal error in Ajax request causing 500 HTTP error and problems with listing / deleting events
 2021-10-28 07:43:44 +02:00
Isaac Connor 8afed25d18 Use filter->sort_asc and sort_field which will use either the value specified in query, or defaults set in system. url params order and sort will override. 2021-10-25 12:34:28 -04:00
Isaac Connor d960f9b6af Fix settings being blank due to missing v4l2-ctl 2021-10-16 13:19:19 -04:00
Isaac Connor d71a5932f5 Turn off useless shm display in header. Add ram and swap usage 2021-10-14 13:33:29 -04:00
Isaac Connor 94cd3a6e69 Use v4l2-ctrl to list the available controls and display all of them. Use range sliders where appropriate. 2021-10-05 19:49:42 -04:00
Isaac Connor 292b3c1d37 add an ajax request for querying the available models 2021-09-25 20:49:53 -04:00
Isaac Connor e7e8996060 Can export events if canView Snapshots. Event->canView will filter events that are not in a snapshot 2021-08-18 10:53:59 -04:00
Isaac Connor f236e25e22 Fix deleting snapshots 2021-08-06 13:11:04 -04:00
Isaac Connor 1f1678064e Allow specifying export Structure to get a flat zip 2021-08-06 13:10:44 -04:00
Isaac Connor bed41ca44b Support specifying the export filename by passing the export_root 2021-08-05 13:30:52 -04:00
Isaac Connor 29fb2d3885 Add special handling of sorting by EndTime because it can be NULL. Fixes #3298 2021-06-15 10:34:33 -04:00
Isaac Connor 7878fbc878 Add a limit of 1000 when pulling sessions. Sessions table can contain hundreds of thousands of lines all relatively useless. Modals need to pop up fast. 2021-06-12 12:22:15 -04:00
Isaac Connor 4a40214f73 StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event 2021-06-08 16:58:50 -04:00
Isaac Connor 55f2a7f55e spacing 2021-06-08 16:58:50 -04:00
Isaac Connor f754b82f3b When we do not have permission to edit monitors, return empty string instead of nothing so that we don't generate an error 2021-04-28 12:03:44 -04:00
Isaac Connor 29e91f48e6 Use Snapshots permission instead of Events for snapshots 2021-04-12 15:59:31 -04:00
Isaac Connor 7743445323 Handle when there isn't a server Id 2021-03-22 21:30:56 -04:00
Isaac Connor f306febb5f use find_one when loading Server which can use caching 2021-03-22 17:49:59 -04:00
Isaac Connor 587cebecbb navbar requests don't pass an auth token so we never send an auth update. Just always send it. 2021-03-13 12:10:35 -05:00
Isaac Connor 62cfdd8d61 fix searching in snapshots 2021-03-12 10:52:23 -05:00
Isaac Connor 9504d8be61 event_ids => snapshot_ids 2021-03-12 10:40:23 -05:00
Isaac Connor 70073ea017 Add thumbnails to snapshots list 2021-03-12 10:07:17 -05:00
Isaac Connor 11c2318a05 Rough in the ui for Snapshots 2021-03-12 09:28:05 -05:00
Isaac Connor 4dcce4ac95 Merge branch 'rtsp_server' 2021-01-26 14:22:10 -05:00
Andrew Bauer c13d2ea99f make watch view event list more efficient 2021-01-19 10:10:51 -06:00
Isaac Connor cb90c06cde Merge branch 'master' into zma_to_thread 2021-01-17 17:38:34 -05:00
Isaac Connor 50af7f25b8 Use less memory in event querying. More work to do here 2021-01-16 13:17:46 -05:00
Andrew Bauer b1b71e5f09 fix return too soon when no log results 2021-01-11 13:46:50 -05:00
Andrew Bauer b6d5802301 revert back to a standard modal (no static backdrop) for objdetect 2021-01-11 13:46:50 -05:00
rabsym 56bb4a74fc Avoid top-scroll when returning from bs_modal objdetect 2021-01-11 13:46:50 -05:00
Andrew Bauer c166b0de0f fix return too soon when no log results 2021-01-02 16:33:56 -06:00
Andrew Bauer 56e88aea89
revert back to a standard modal (no static backdrop) for objdetect 2021-01-02 12:34:33 -06:00
rabsym b7970d69a5 Avoid top-scroll when returning from bs_modal objdetect 2021-01-01 14:15:35 +01:00
Isaac Connor a1917d83d0 Merge branch 'master' into zma_to_thread 2020-12-22 19:52:09 -05:00
Andrew Bauer 2ea4b39d93 don't use quotes around the event id 2020-12-22 11:46:31 -06:00