mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-01-27 15:40:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,122 Commits 66 Branches 101 Tags
2fc7b3cf4d69e25fa68d190dd6b052d7fef94077
Commit Graph

13122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Connor
2fc7b3cf4d Don't allow deleting of in-progress recording 2019-05-24 09:31:48 -04:00
Isaac Connor
bdbbab0d3e Handle no results from get_ProbeMatch() 2019-05-21 17:15:08 -04:00
Isaac Connor
96f578f1bd If running a custom run state, show the state instead of Running. Also select the running state in the state change popup. (#2604) 2019-05-16 15:37:37 -04:00
Mitch Capper
eb005e8b9c FIFO support for zoneminder zone debugging (#2594) 
Adds fifo options for diagnostic images for much lower impact diagnostics mode.  Diagnostic images are only written when there is a client listening for them (otherwise they are skipped).  Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion.  This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
 2019-05-16 15:37:03 -04:00
Isaac Connor
4f44db8cbf ifdef HAVE_ZLIB_H around code that uses Image->Zip (#2597) 2019-05-16 15:35:19 -04:00
Isaac Connor
1855ee441a Fix #2609 invalid value horz instead of hori in orientations enumeration 2019-05-15 19:35:19 -04:00
Jonathan Meredith
74d9f4f1aa Spelling and grammar fixes in help (#2603) 
* Edit Help array to make it match others below. This should not affect the results

* Misc. grammer and spelling fixes along with removing some duplicated words.  This should not affect compilation.

* More grammer and spelling errors

* Replace Javascript with ZoneMinder because it did not make sense there.

* More spelling and grammar edits
 2019-05-13 07:58:18 -04:00
Isaac Connor
22c5d46c65 rescale audio packet duration and pts before feeding to codec after resample 2019-05-12 12:14:03 -04:00
Isaac Connor
d9f7e93df3 Fix typo gegress to degrees. Fixes #2601 2019-05-10 14:27:51 -04:00
Isaac Connor
67c20aa976 fix frame->duration to frame->pkt_duration 2019-05-10 12:58:54 -04:00
Isaac Connor
f67c00c29a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-05-10 12:31:27 -04:00
Isaac Connor
d3a680aaa3 Set out_frame duration when resampling. Better error message if failed to write to fifo 2019-05-10 12:31:10 -04:00
Chris
faaec9e1d6 Another attempt to fix SQL Control values (#2600) 2019-05-06 12:14:03 -04:00
Andrew Bauer
74bd812632 rpm packaging - buildrequire zlib-devel 2019-05-03 09:07:19 -05:00
Andrew Bauer
8733f89b29 eol f27 support 2019-05-02 20:09:15 -05:00
Andrew Bauer
ed02ef39f1 bump rpm specfile 2019-04-30 18:11:38 -05:00
Isaac Connor
75b4f4f2b3 Add a few missing GREATESTs in the triggers. 2019-04-30 17:29:18 -04:00
Andrew Bauer
16de92e11c Merge pull request #2591 from redaco/2590-netcat-onvif-authentication-support 
Netcat ONVIF: adding ONVIF authentication
 2019-04-30 07:17:06 -05:00
Andrew Bauer
27344df373 fix typo 2019-04-30 07:15:00 -05:00
Rémi Da Costa
16697565bf Netcat ONVIF: adding ONVIF authentication 2019-04-30 07:48:47 +02:00
Andrew Bauer
c57017bd34 Merge pull request #2587 from connortechnology/update_triggers_prevent_negatives 
Use GREATEST function prevent negative values in event counts
 2019-04-29 18:30:47 -05:00
Andrew Bauer
220a41dcf1 Merge pull request #2557 from cnighswonger/iris_control 
Add camera relative iris control methods
 2019-04-29 15:31:56 -05:00
cnighswonger
ff738a99ba Enabling relative iris methods 2019-04-29 16:06:41 -04:00
cnighswonger
dfa997a989 Add camera relative iris control methods 
This set of methods invoke realtive iris size in the direction indicated by
    the <Large/Small> portion of their name. They accept no arguments.

    NOTE:

    This only just does work. The Dahua API specifies "multiples" as the input.
    We pass in a 1 for that as it does not seem to matter what number (0-8) is
    provided, the camera iris behaves the same.
 2019-04-29 16:05:44 -04:00
redaco
76dd411341 Netcat ONVIF: Added support for "profile token" (#2589) 2019-04-29 15:56:55 -04:00
Isaac Connor
940338ea12 namespace escape Error calls 2019-04-29 12:51:02 -04:00
Isaac Connor
847d4c5e80 Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder 2019-04-29 12:50:31 -04:00
Isaac Connor
28269eccc3 Fix Remote RTSP Method on newer ffmpeg 2019-04-28 12:05:32 -04:00
Isaac Connor
a0dbb70af6 filter the form submit on enter to only affect input elements, not textareas 2019-04-26 10:40:11 -04:00
Isaac Connor
735a996e41 dsiable form submit on enter on the monitor view 2019-04-26 10:26:16 -04:00
Isaac Connor
6a250d61e3 cache_bust logger.js and overlay.js 2019-04-26 10:25:32 -04:00
Isaac Connor
c4fb2cc407 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-04-25 18:45:54 -04:00
Isaac Connor
18285e1b94 fix using in_frame->nb_samples instead of out_frame->nb_samples in resample fifo. 2019-04-25 18:45:43 -04:00
Pliable Pixels
ea7c38ceff Alarm cause fix (#2582) 
* move alarm cause code to when the alarm flag is set

* formatting

* added temp info log

* char* not string in log

* merged alarm clause into info message about alarm

* add a comma only if there are more active zones

* JB tweak to slightly optimize leading comma processing
 2019-04-24 13:55:57 -04:00
Isaac Connor
3c56b32b08 Use GREATEST function prevent negative values in event counts 2019-04-24 10:38:08 -04:00
Steve Root
0d4651c2d6 Update url to donate page (#2586) 2019-04-23 10:58:28 -04:00
Javier González Calleja
8195c4e395 Fixing video export view (#2585) 2019-04-20 11:19:27 -04:00
Andrew Bauer
017479303e Merge pull request #2584 from alexfornuto/patch-1 
Update Debian Instructions
 2019-04-18 20:25:49 -04:00
Alex Fornuto
41cadf3a00 Update Debian Instructions 
When downloading the repository GPG key, `wget` does not require `sudo`. The root permissions required are provided by `sudo` after the pipe.
 2019-04-18 18:51:06 -05:00
Isaac Connor
eb76cd87bb Revert "Alarm cause fix (#2580)" (#2581) 
This reverts commit 6923382485.
 2019-04-17 13:53:11 -04:00
Pliable Pixels
6923382485 Alarm cause fix (#2580) 
* move alarm cause code to when the alarm flag is set

* formatting

* added temp info log

* char* not string in log
 2019-04-17 13:33:38 -04:00
Isaac Connor
70ed4a4646 Must unlock mutex before destructor as we do some logging in the mutex destructor when we destroy it while locked. 2019-04-16 11:51:10 -04:00
Isaac Connor
22adb243ec Fix crash when reporting an event longer than section length when event was just closed so event is null. 2019-04-16 11:50:41 -04:00
Isaac Connor
13e5fd0950 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-15 13:27:25 -04:00
Isaac Connor
3664084862 Handle out of order dts in writeAudioFrame 2019-04-15 13:27:13 -04:00
Isaac Connor
f28af7b729 store diag_path in the object and initialize them in constructor instead of constantly checking to see if they have been initialized in DetectMotion. Also use a string instead of a static char[MAX_PATH]. Also split it into diag_path_r and diag_path_d to fix the bug that only diag_path_r would ever get created and would be overwritten by the delta image. 2019-04-15 13:26:55 -04:00
Isaac Connor
93f0a03d8b spacing and code comments 2019-04-15 12:55:28 -04:00
Isaac Connor
7c8b37e08c fix mutex hang on Fatal 2019-04-15 11:21:23 -04:00
andornaut
164a2d4d70 Fix image path (#2576) 
Change the path of the "center.png" image from skins/classic/graphics/graphics/center.png to skins/classic/graphics/center.png.

Note that the `graphics/` directory was previously duplicated.
 2019-04-14 15:41:58 -04:00
Isaac Connor
91ea9615ad Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-14 13:50:18 -04:00