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

13444 Commits

Author SHA1 Message Date
Pliable Pixels 65a57feedb absolute path 2019-05-01 14:30:00 -04:00
Pliable Pixels c663246f0a try add_library instead 2019-05-01 14:22:10 -04:00
Pliable Pixels ca24b504d4 fixed typo 2019-05-01 13:46:54 -04:00
Pliable Pixels 8bbddadc12 put link_dir ahead of add_executable 2019-05-01 13:43:41 -04:00
Pliable Pixels 07be830f94 added bcrypt to others 2019-05-01 13:35:18 -04:00
Pliable Pixels dd63fe86ce add sha source 2019-05-01 13:28:39 -04:00
Pliable Pixels ddb7752226 added include path 2019-05-01 13:24:50 -04:00
Pliable Pixels 887912e7ad bcrypt auth migration in PHP land 2019-05-01 13:22:24 -04:00
Pliable Pixels 1ba1bf0c45 added test sha1 and bcrypt code to validate working 2019-05-01 13:18:51 -04:00
Pliable Pixels c4b1bc19e0 added bcrypt and sha to src build process 2019-05-01 13:15:07 -04:00
Pliable Pixels a5de45419f added sha1 and bcrypt submodules 2019-05-01 13:08:52 -04:00
Isaac Connor 91f7034642 Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas 2019-05-01 08:57:40 -04:00
Isaac Connor 25614bb75e Merge branch 'master' into storageareas 2019-05-01 08:57:20 -04: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 b3fb934fb5 add namespace to Logging calls 2019-04-29 14:16: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 626342f00e Merge branch 'master' into storageareas 2019-04-26 10:44:00 -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 ca02f0cc17 Merge branch 'update_triggers_prevent_negatives' into storageareas 2019-04-24 10:38:39 -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 5b68ddcc9a add a note deprecating getDiskPercent 2019-04-17 09:55:34 -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 2ff1e7ed6d Fix crash when reporting an event longer than section length when event was just closed so event is null. 2019-04-16 11:30:18 -04:00
Isaac Connor 98a9c68b8b spacing and code documentation 2019-04-15 17:54:30 -04:00
Isaac Connor 293ec20824 Must unlock mutex before destructor as we do some logging in the mutex destructor when we destroy it while locked. 2019-04-15 17:54:17 -04:00
Isaac Connor 14791ec19b Merge branch 'master' into storageareas 2019-04-15 13:27:41 -04:00
Isaac Connor 13e5fd0950 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-04-15 13:27:25 -04:00