Pliable Pixels
|
b293592e4c
|
added token validation to zms/zmu/zmuser
|
2019-05-08 10:55:32 -04:00 |
Isaac Connor
|
4c8a29e8d3
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2019-05-08 06:06:28 -04:00 |
|
Pliable Pixels
|
e8f79f3254
|
JWT integration, validate JWT token via validateToken
|
2019-05-07 15:04:51 -04:00 |
|
Pliable Pixels
|
d36c1f5d3c
|
Add JWT token creation, move old code to a different function for future deprecation, simplified code for ZM_XX parameter reading
|
2019-05-07 15:04:12 -04:00 |
|
Pliable Pixels
|
0bbc582971
|
New token= query for JWT
|
2019-05-07 15:03:13 -04:00 |
Isaac Connor
|
3a7b49560a
|
spacing
|
2019-05-06 12:16:06 -04:00 |
Chris
|
faaec9e1d6
|
Another attempt to fix SQL Control values (#2600)
|
2019-05-06 12:14:03 -04:00 |
|
Isaac Connor
|
9469ce8c71
|
Merge branch 'section_length_when_modect' into storageareas
|
2019-05-06 10:50:41 -04:00 |
|
Isaac Connor
|
9ef912f2ba
|
add missing new event status info
|
2019-05-06 10:50:12 -04:00 |
|
Isaac Connor
|
5fe565b99d
|
spacing
|
2019-05-06 10:49:18 -04:00 |
|
Isaac Connor
|
1ca5eee53a
|
spacing
|
2019-05-06 10:45:40 -04:00 |
|
Isaac Connor
|
f0e5a435cf
|
spacing and quotes, but the main change is using aud_print instead of Info
|
2019-05-06 10:04:53 -04:00 |
|
Pliable Pixels
|
37f915ec0f
|
moved to jwt-cpp after PR merge
|
2019-05-05 14:32:54 -04:00 |
|
Pliable Pixels
|
ca3f65deef
|
go back to jwt-cpp as PR merged
|
2019-05-05 14:32:09 -04:00 |
|
Pliable Pixels
|
37040f33a8
|
add composer vendor directory
|
2019-05-05 12:49:33 -04:00 |
|
Pliable Pixels
|
31c7cc31a2
|
own fork
|
2019-05-05 11:26:20 -04:00 |
|
Pliable Pixels
|
e9d3dd1987
|
own fork
|
2019-05-05 11:26:01 -04:00 |
|
Pliable Pixels
|
a55a11dad1
|
first attempt to fix cast error
|
2019-05-05 11:24:55 -04:00 |
|
Pliable Pixels
|
8d62c61b7a
|
fixed module path
|
2019-05-05 07:50:52 -04:00 |
|
Pliable Pixels
|
725c3c50ed
|
use php-jwt, use proper way to add PHP modules, via composer
|
2019-05-05 07:08:25 -04:00 |
|
Pliable Pixels
|
4c8d20db64
|
typo
|
2019-05-04 15:27:00 -04:00 |
|
Pliable Pixels
|
983e050fd7
|
fixed SHA1 algo
|
2019-05-04 15:20:31 -04:00 |
|
Pliable Pixels
|
4c51747171
|
removed vog
|
2019-05-04 11:57:30 -04:00 |
|
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 |