06eb9a3bb2
merge typo
2019-05-16 16:15:16 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
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
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
4f44db8cbf
ifdef HAVE_ZLIB_H around code that uses Image->Zip ( #2597 )
2019-05-16 15:35:19 -04:00
0e72080c4a
Migrate from libdigest to crypt-eks-blowfish due to notice
2019-05-16 09:37:11 -04:00
228acb8794
Merge branch 'master' into storageareas
2019-05-15 19:35:47 -04:00
1855ee441a
Fix #2609 invalid value horz instead of hori in orientations enumeration
2019-05-15 19:35:19 -04:00
a07da01f0c
reworked API document for new changes in 2.0
2019-05-15 13:57:51 -04:00
95460a945a
added token support to index.php
2019-05-14 19:22:49 -04:00
4027a5adf8
fix update script
2019-05-13 14:48:26 -04:00
4a2ac470ee
add back ssl_dev, got deleted
2019-05-13 14:32:48 -04:00
e9f843f297
bulk overlay hash mysql encoded passwords
2019-05-13 14:29:24 -04:00
c257fb46f6
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-13 10:34:45 -04:00
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
87e407aa90
forgot to checkin update file
2019-05-13 10:31:09 -04:00
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
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
74095963cc
Merge branch 'master' into storageareas
2019-05-12 19:39:09 -04:00
41ae745b17
removed stale code
2019-05-12 18:53:51 -04:00
ec279ccc9a
make old API auth mechanism optional
2019-05-12 18:51:07 -04:00
881d531fe9
make old API auth optional, on by default
2019-05-12 18:19:19 -04:00
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
cc0d23ce4e
move token index after adding password
2019-05-12 15:01:49 -04:00
9a8aa5453b
add Password back so User object indexes don't change
2019-05-12 14:48:23 -04:00
adb01c4d0e
added password_compat for PHP >=5.3 <5.5
2019-05-12 13:57:25 -04:00
d7dbaf52d4
move user creation to bcrypt
2019-05-12 13:01:29 -04:00
91dd6630b5
enable API options only if API enabled
2019-05-12 12:34:55 -04:00
9998c26101
comma
2019-05-12 12:21:49 -04:00
c1891e35b9
moved API enable back to system
2019-05-12 12:15:08 -04:00
22c5d46c65
rescale audio packet duration and pts before feeding to codec after resample
2019-05-12 12:14:03 -04:00
a9d601e5ae
add ability to revoke tokens and enable/disable APIs per user
2019-05-12 10:56:17 -04:00
d7daf8550f
Merge branch 'master' into storageareas
2019-05-12 09:37:41 -04:00
453bc2afd8
more frame dumping in resample
2019-05-12 09:36:26 -04:00
aada171440
clean up some logic in Analyse
2019-05-12 09:35:48 -04:00
8499958767
typo
2019-05-12 05:57:17 -04:00
225893fcd6
add mintokenexpiry to DB seek
2019-05-12 05:50:19 -04:00
1f22c38453
more fixes
2019-05-12 05:10:20 -04:00
6ab31dfe4b
more fixes
2019-05-12 05:03:16 -04:00
3e66be27a8
use strtoul for conversion
2019-05-11 16:09:42 -04:00
053e57af62
use strtoul for conversion
2019-05-11 16:01:05 -04:00
96fa6149a8
use strtoul for conversion
2019-05-11 15:58:07 -04:00
88d50ec9ca
added revoke all tokens code, removed test code
2019-05-11 15:47:57 -04:00
2ee466f5e4
display user table in api
2019-05-11 14:08:49 -04:00
91b6d0103c
remove M typo
2019-05-11 13:41:19 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
e6b7af4583
initial baby step for api tab
2019-05-10 15:11:35 -04:00
d9f7e93df3
Fix typo gegress to degrees. Fixes #2601
2019-05-10 14:27:51 -04:00
67c20aa976
fix frame->duration to frame->pkt_duration
2019-05-10 12:58:54 -04:00
f67c00c29a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-05-10 12:31:27 -04:00
Pliable Pixels
Isaac Connor
Mitch Capper
Isaac Connor
Jonathan Meredith