Isaac Connor
|
4ce944da23
|
Merge branch 'release-1.34'
|
2020-03-26 15:38:35 -04:00 |
Isaac Connor
|
3e55795cad
|
Handle different command line syntax for zmcontrol.pl
|
2020-03-26 13:57:43 -04:00 |
Isaac Connor
|
b354641df3
|
fix syntax errors in triggers in monitor view
|
2020-03-26 13:57:19 -04:00 |
Isaac Connor
|
af36cc3e52
|
Fix starting and stopping zmcontrol processes across servers.
|
2020-03-26 13:57:00 -04:00 |
Isaac Connor
|
2bd805c1f1
|
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
|
2020-03-24 16:16:32 -04:00 |
Isaac Connor
|
b611e2616b
|
handle scale=auto
|
2020-03-24 16:15:24 -04:00 |
Isaac Connor
|
e06912a995
|
Merge branch 'release-1.34'
|
2020-03-21 15:28:27 -04:00 |
Isaac Connor
|
d3df0defc9
|
Support missing openssl_random_pseudo_bytes by using alternate functions
|
2020-03-21 15:28:18 -04:00 |
Isaac Connor
|
5a20ef959f
|
Merge branch 'release-1.34'
|
2020-03-20 11:07:46 -04:00 |
Isaac Connor
|
d7ea798c09
|
add modern stracktrace to log messages
|
2020-03-20 11:06:32 -04:00 |
Isaac Connor
|
ecaaae90f3
|
fix streamImg loading when using applet. Also don't alter actParms as it is not a global.
|
2020-03-20 11:06:01 -04:00 |
Isaac Connor
|
d54b2e5b21
|
Merge pull request #2888 from pliablepixels/mp4objdetect
Mp4 animations for objdetect
|
2020-03-15 10:45:52 -04:00 |
Pliable Pixels
|
921c4c5bbd
|
don't return mp4 if objdetect is used
|
2020-03-14 15:00:33 -04:00 |
Pliable Pixels
|
4342506e5b
|
fix media type allocations
|
2020-03-14 14:24:39 -04:00 |
Pliable Pixels
|
4d5f9f7de0
|
add back gif, make nomenclature consistent of objdetect_subtypes
|
2020-03-14 14:18:25 -04:00 |
Isaac Connor
|
f8fa0340fc
|
fix eslint
|
2020-03-14 09:27:07 -04:00 |
Pliable Pixels
|
9a31d545d4
|
replace GIF function with MP4
|
2020-03-14 08:08:52 -04:00 |
Isaac Connor
|
4c984c3617
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-03-10 18:47:33 -04:00 |
Isaac Connor
|
9a3127da06
|
Merge branch 'rate_dropdown'
|
2020-03-10 18:47:19 -04:00 |
Isaac Connor
|
59bd658a96
|
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
|
2020-03-10 18:46:20 -04:00 |
Isaac Connor
|
84d719f2dd
|
Merge branch 'release-1.34' into rate_dropdown
|
2020-03-10 16:06:11 -04:00 |
Pliable Pixels
|
49f23cb35b
|
Added options to render objdetect, objdetectanim and objdetectimage
|
2020-03-10 13:51:55 -04:00 |
Isaac Connor
|
0f741d0e1c
|
Merge pull request #2880 from pliablepixels/1.34-dev
Add ability for image.php to render gif images
|
2020-03-09 16:30:15 -04:00 |
Pliable Pixels
|
38b519c8a6
|
better error log
|
2020-03-09 15:58:57 -04:00 |
Pliable Pixels
|
6bc8012e04
|
add support to render gif image that may be created by object detection
|
2020-03-09 15:56:34 -04:00 |
Isaac Connor
|
561479dd93
|
Merge branch 'release-1.34'
|
2020-03-09 14:45:00 -04:00 |
Isaac Connor
|
5fe1452a1a
|
Merge pull request #2879 from pliablepixels/1.34-dev
return frame IDs of snapshot and alarm frames for a specific e…
|
2020-03-09 14:44:41 -04:00 |
Isaac Connor
|
e8553babfa
|
remove extra spaces, fix eslint
|
2020-03-09 14:43:54 -04:00 |
Isaac Connor
|
3d993eef80
|
Fix triggers code
|
2020-03-09 14:39:57 -04:00 |
Isaac Connor
|
a0bd602339
|
Use === when testing for empty value and setting defaults
|
2020-03-09 14:39:22 -04:00 |
Pliable Pixels
|
a261efe0a7
|
return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0
|
2020-03-09 12:04:40 -04:00 |
Pliable Pixels
|
3611d147e6
|
fix score frameID to return ID not Score
|
2020-03-09 11:25:07 -04:00 |
Pliable Pixels
|
c5e838fa33
|
return global frame IDs of snapshot and alarm frames for a specific event
|
2020-03-09 11:09:20 -04:00 |
Isaac Connor
|
f056f787c5
|
Merge branch 'release-1.34'
|
2020-03-08 17:24:06 -04:00 |
Isaac Connor
|
e56976c800
|
Triggers cannot be null, it is '' instead
|
2020-03-08 17:23:48 -04:00 |
Isaac Connor
|
b482993d33
|
Merge branch 'release-1.34'
|
2020-03-06 15:04:48 -05:00 |
Isaac Connor
|
f0791c8118
|
silence warning when no language is set
|
2020-03-05 22:13:32 -05:00 |
Isaac Connor
|
f003daa791
|
Merge branch 'add_enabled_to_storage'
|
2020-03-05 15:48:43 -05:00 |
Isaac Connor
|
d30480e31e
|
add passive to addEventListener
|
2020-03-05 14:10:35 -05:00 |
Isaac Connor
|
53f262a4cb
|
Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
|
2020-03-04 11:31:16 -05:00 |
Isaac Connor
|
d60e1a783f
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-03-04 11:22:15 -05:00 |
Isaac Connor
|
55f63e8e9d
|
Merge branch 'fix_auth_timeouts'
|
2020-03-04 11:22:08 -05:00 |
Isaac Connor
|
4dae0c4609
|
Merge pull request #2870 from pliablepixels/dev
#2866 - fixes incorrect token type comparison
|
2020-03-04 11:21:48 -05:00 |
Isaac Connor
|
a9e3d0691f
|
quotes, fix status ajax call using old auth_hash
|
2020-03-04 11:17:48 -05:00 |
Isaac Connor
|
8eee5cc222
|
Add global array so that we only do it once.
|
2020-03-04 11:03:30 -05:00 |
Isaac Connor
|
d24069e3d0
|
Look for global array so we don't load all Servers multiple times. Add all servers to allowed script-src in CSPHeaders
|
2020-03-04 11:03:07 -05:00 |
Pliable Pixels
|
1381cb194e
|
#2866 - fixes incorrect token type comparison
|
2020-03-04 10:50:59 -05:00 |
Isaac Connor
|
9f696186a8
|
Increase height of storage popup for Enabled
|
2020-03-04 10:48:02 -05:00 |
Isaac Connor
|
ac00ca0ad8
|
Only list enabled Storage Areas
|
2020-03-04 10:46:59 -05:00 |
Isaac Connor
|
077b8888f9
|
Use Storage object and add Enabled
|
2020-03-04 10:46:32 -05:00 |