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

13464 Commits

Author SHA1 Message Date
Pliable Pixels d952fe7117 Moved to openSSL SHA1, initial JWT plugin 2019-05-04 11:52:53 -04:00
Pliable Pixels 7603e94e90 added lib-ssl/dev for JWT signing 2019-05-03 16:57:43 -04:00
Isaac Connor 50070a9a7c Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2019-05-03 14:59:14 -04:00
Isaac Connor 1e08b333b4 choose cur_dts instead of 0 for dts 2019-05-03 14:59:09 -04:00
Isaac Connor 4ecf41f2b4 Merge branch 'sort_packets' into storageareas 2019-05-03 14:58:34 -04:00
Isaac Connor c91da4a7f5 if no packet found, still append to end 2019-05-03 14:58:29 -04:00
Isaac Connor 21999cf943 Merge branch 'sort_packets' into storageareas 2019-05-03 13:48:23 -04:00
Isaac Connor aec8311deb implement sorting incoming packets in the packetqueue 2019-05-03 13:48:05 -04:00
Pliable Pixels ca2e7ea97c logs tweak 2019-05-03 12:01:13 -04:00
Pliable Pixels 18c5b2da2a move to fork 2019-05-03 11:43:38 -04:00
Pliable Pixels 72325d12b7 move to wrapper 2019-05-03 11:40:35 -04:00
Andrew Bauer 74bd812632 rpm packaging - buildrequire zlib-devel 2019-05-03 09:07:19 -05:00
Isaac Connor 63a970d49f Merge branch 'fix_no_zlib' into storageareas 2019-05-03 09:42:06 -04:00
Isaac Connor aaf4665909 Merge branch 'section_length_when_modect' into storageareas 2019-05-03 09:41:41 -04:00
Isaac Connor f6b6daafab close and reopen event when we hit section_length 2019-05-03 09:41:29 -04:00
Isaac Connor fee95c2316 ifdef HAVE_ZLIB_H around code that uses Image->Zip 2019-05-03 09:04:31 -04:00
Andrew Bauer 8733f89b29
eol f27 support 2019-05-02 20:09:15 -05:00
Pliable Pixels d252a8ba30 build bcrypt as static 2019-05-02 10:52:21 -04:00
Isaac Connor 8b1565c41d Change pid path to /run/zm/zm.pid instead of /var/run/zm/zm.pid. systemd now complains about the use of a legacy directory, so this quiets that. 2019-05-02 10:52:19 -04:00
Pliable Pixels 45b7814124 absolute path 2019-05-01 14:33:36 -04:00
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