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

18567 Commits

Author SHA1 Message Date
Isaac Connor 9504d8be61 event_ids => snapshot_ids 2021-03-12 10:40:23 -05:00
Isaac Connor 1ae1a89abf Only allow show zones for System::View permission 2021-03-12 10:29:13 -05:00
Isaac Connor ba00bee4b8 fix header alignment 2021-03-12 10:07:33 -05:00
Isaac Connor 70073ea017 Add thumbnails to snapshots list 2021-03-12 10:07:17 -05:00
Isaac Connor 527defc0c8 Bump version to 1.35.21 for Snapshots 2021-03-12 09:28:47 -05:00
Isaac Connor 11c2318a05 Rough in the ui for Snapshots 2021-03-12 09:28:05 -05:00
Isaac Connor c9170a87b2 Allow users with Monitors::View to generate and cancel events 2021-03-12 09:26:56 -05:00
Isaac Connor 6682ec7da5 Add Snapshots and Snapshot_Events Tables. Add HomeView to Users. 2021-03-12 09:26:23 -05:00
Isaac Connor 620806a1bf Add Snapshots and Snapshot_Events Tables. Add HomeView to Users. 2021-03-12 09:26:13 -05:00
Isaac Connor 786adc5511 Spacing 2021-03-11 13:48:52 -05:00
Isaac Connor 28490816dc Use new zmDbDoUpdate to end the event 2021-03-11 13:48:42 -05:00
Isaac Connor cbec5b2800 Implement zmDbDoUpdate which returns -mysql_errer or # of rows modified 2021-03-11 13:48:16 -05:00
Isaac Connor b5f45b0987 fix alignment of help 2021-03-11 13:16:44 -05:00
Isaac Connor 86a26ef3b1 nvsnprintf won't exceed the buffer but it can hit the end of it so adding the ending ]\n can overflow. Test and prevent. 2021-03-11 13:16:32 -05:00
Isaac Connor 43e7e612c5 Have to turn off DB logging when logging from a db query or else we infinite loop 2021-03-11 13:07:47 -05:00
Isaac Connor f2553220b6 Implement xop::Authenticator::GetFailedResponse to return a 401 2021-03-11 11:45:39 -05:00
Isaac Connor 874e61d681 remove Base64 include from live555 2021-03-11 09:26:50 -05:00
Isaac Connor 0da9ee2e4c Remove live555 detection 2021-03-11 08:08:01 -05:00
Isaac Connor 644d6d34a4 Must init video_stream_id and audio_stream_id 2021-03-10 17:23:44 -05:00
Isaac Connor 5d968358f7 Need to use ZM::make_unique because std::make_unique is c++14 2021-03-10 16:35:03 -05:00
Isaac Connor 000df68f72 include memory 2021-03-10 16:17:26 -05:00
Isaac Connor 93e4691b08 remove liblivemedia as a dependency. We have gone another way 2021-03-10 16:17:26 -05:00
Isaac Connor faddace69d Update version 2021-03-10 15:59:38 -05:00
Isaac Connor bdd808926d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-03-10 14:02:09 -05:00
Isaac Connor 08110fe9b1 try again at adding RtspServer submodule 2021-03-10 14:02:03 -05:00
Isaac Connor 15bd3276d2 fix define 2021-03-10 13:50:42 -05:00
Isaac Connor 42972f9ab7 Add our fork of RtspServer as a module 2021-03-10 13:38:46 -05:00
Isaac Connor aadee4ea65 add a Query String parse in zm_utils 
add an authenticator to use with RtspServer
 2021-03-10 13:20:14 -05:00
Isaac Connor 562e7c7e80 Add authentication 2021-03-10 13:19:41 -05:00
Isaac Connor a0957fbd10 remove debug 2021-03-10 13:19:30 -05:00
Isaac Connor 24fb020686 Add PHZ76 in deps. Must be added as a submodule 2021-03-10 11:01:52 -05:00
Isaac Connor b1f6eb127b Switch from live555 to PHZ76/RtspServer 2021-03-10 11:01:04 -05:00
Isaac Connor f4cb4ec5b3 Remove mp4v2-dev dependency 2021-03-09 09:10:56 -05:00
Isaac Connor 831cf8af56 remove zm_video.h which is no longer relevant 2021-03-08 22:14:47 -05:00
Isaac Connor 41085c9e5c Remove final bits of zm_video writer. 2021-03-08 22:14:13 -05:00
Isaac Connor 46bf765f80 Set heartbeat on startup. Fix logic in ShmValid 2021-03-08 18:31:01 -05:00
Isaac Connor e38e8a2775 Actually use zmc_heartbeat_time. Set it on every capture and use it in ShmValid to determine if zmc has gone away. 2021-03-08 09:30:53 -05:00
Isaac Connor 920556e002
Merge pull request #3191 from DanielSchetritt/patch-1 
Fix rendering of RST codeblock in documentation
 2021-03-07 17:50:27 -05:00
Daniel Schetritt 9660448e5a
Fix rendering of RST codeblock in documentation 
This fixes the rendering of a codeblock in reStructuredText. I think the parser couldn't render a codeblock containing a URL using the shorthand `::` so an explicit `.. codeblock::` directive is used instead.
 2021-03-07 10:37:21 -08:00
Peter Keresztes Schmidt 8ebaee998a CI/Cirrus: Show Catch2 output on test failure 2021-03-07 17:43:48 +01:00
Isaac Connor c0990a7982
Merge pull request #3190 from Carbenium/db-locking 
Fix SQL queries with missing lock
 2021-03-06 18:51:02 -05:00
Peter Keresztes Schmidt 32f8bc8e31 Fifo: Fix a crash on shutdown 
outfile can be undefined if the fifo couldn't be opened correctly.
Only try to close outfile on shutdown when it is valid.
 2021-03-06 23:39:59 +01:00
Peter Keresztes Schmidt 0796a2262e Utils: Replace stringtf with a type-safe version that can't overflow 2021-03-06 00:12:18 +01:00
Peter Keresztes Schmidt 9e77324de4 Replace raw mysql_query calls with the zmDb* functions 
With this we can make sure we have proper locking of our DB connection at all times.
 2021-03-06 00:12:18 +01:00
Isaac Connor c96cb1dd8d Put back terminate_ 2021-03-05 14:21:18 -05:00
Isaac Connor cfb8e062c1 Add deleting sources to RTSPServerThread::Stop(). Delete redundant terminate 2021-03-05 14:18:51 -05:00
Isaac Connor ebd29a3cb9 use the timeout version of read_into so that we don't stay blocked while we have been told to exit. If getNextFrame returns -1 sleep for a second. 2021-03-05 14:18:12 -05:00
Isaac Connor 07339e443b Add RTSP Server shutdown code 2021-03-05 14:13:24 -05:00
Isaac Connor f99b8896ec Don't unlock the mutex around openFile. It is a recursive mutex so we should be able to stay locked 2021-03-05 14:13:10 -05:00
Isaac Connor 0af68a0914 Implement read_into with a timeout 2021-03-05 14:12:44 -05:00