Isaac Connor
|
d7daf8550f
|
Merge branch 'master' into storageareas
|
2019-05-12 09:37:41 -04:00 |
|
Isaac Connor
|
453bc2afd8
|
more frame dumping in resample
|
2019-05-12 09:36:26 -04:00 |
|
Isaac Connor
|
aada171440
|
clean up some logic in Analyse
|
2019-05-12 09:35:48 -04:00 |
Pliable Pixels
|
8499958767
|
typo
|
2019-05-12 05:57:17 -04:00 |
|
Pliable Pixels
|
225893fcd6
|
add mintokenexpiry to DB seek
|
2019-05-12 05:50:19 -04:00 |
|
Pliable Pixels
|
1f22c38453
|
more fixes
|
2019-05-12 05:10:20 -04:00 |
|
Pliable Pixels
|
6ab31dfe4b
|
more fixes
|
2019-05-12 05:03:16 -04:00 |
|
Pliable Pixels
|
3e66be27a8
|
use strtoul for conversion
|
2019-05-11 16:09:42 -04:00 |
|
Pliable Pixels
|
053e57af62
|
use strtoul for conversion
|
2019-05-11 16:01:05 -04:00 |
|
Pliable Pixels
|
96fa6149a8
|
use strtoul for conversion
|
2019-05-11 15:58:07 -04:00 |
|
Pliable Pixels
|
88d50ec9ca
|
added revoke all tokens code, removed test code
|
2019-05-11 15:47:57 -04:00 |
|
Pliable Pixels
|
2ee466f5e4
|
display user table in api
|
2019-05-11 14:08:49 -04:00 |
|
Pliable Pixels
|
91b6d0103c
|
remove M typo
|
2019-05-11 13:41:19 -04:00 |
|
Pliable Pixels
|
ae14be916c
|
initial plumbing to introduce token expiry and API bans per user
|
2019-05-11 13:39:40 -04:00 |
|
Pliable Pixels
|
e6b7af4583
|
initial baby step for api tab
|
2019-05-10 15:11:35 -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 |
|
Pliable Pixels
|
95b448abdd
|
handle case when supplied password is hashed, fix wrong params in AppController
|
2019-05-10 11:25:55 -04:00 |
|
Isaac Connor
|
1498027f12
|
Add option to attach the objdetect image in emails
|
2019-05-08 22:45:04 -04:00 |
|
Pliable Pixels
|
8461852e27
|
move out sha header
|
2019-05-08 19:32:58 -04:00 |
|
Pliable Pixels
|
0bb5ff934e
|
move sha headers out
|
2019-05-08 19:17:31 -04:00 |
|
Pliable Pixels
|
4ab0c35962
|
move JWT/Bcrypt inside zm_crypt
|
2019-05-08 16:45:28 -04:00 |
|
Pliable Pixels
|
2212244882
|
fix absolute path
|
2019-05-08 15:47:38 -04:00 |
|
Pliable Pixels
|
1770ebea23
|
make sure refresh token login doesn't generate another refresh token
|
2019-05-08 15:26:51 -04:00 |
|
Pliable Pixels
|
c41a2d067c
|
fixed type conversion
|
2019-05-08 14:29:44 -04:00 |
|
Pliable Pixels
|
0bc96dfe83
|
Error out if used did not create an AUTH_HASH_SECRET
|
2019-05-08 14:26:16 -04:00 |
|
Pliable Pixels
|
f9730bb46b
|
remove auth_hash_ip
|
2019-05-08 14:07:48 -04:00 |
|
Pliable Pixels
|
bc050fe330
|
support refresh tokens as well for increased security
|
2019-05-08 13:38:42 -04:00 |
|
Pliable Pixels
|
27e6e46f84
|
remove allowing auth_hash_ip for token
|
2019-05-08 12:11:32 -04:00 |
|
Pliable Pixels
|
3c6d0131ff
|
fix db read, forgot to exec query
|
2019-05-08 12:06:37 -04:00 |
|
Pliable Pixels
|
04c3bebef9
|
exception handling for try/catch
|
2019-05-08 11:44:15 -04:00 |
|
Pliable Pixels
|
3a67217972
|
move decode inside try/catch
|
2019-05-08 11:29:34 -04:00 |
|
Pliable Pixels
|
bb18c305ab
|
add token to command line for zmu
|
2019-05-08 11:08:27 -04:00 |
|
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 |