Isaac Connor
|
eec634c1b0
|
Add Source() support for VNC type
|
2020-03-30 10:10:06 -04:00 |
|
Isaac Connor
|
ff061bd48e
|
Fixup VNC input options. Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
|
2020-03-30 10:09:53 -04:00 |
|
Isaac Connor
|
599960ef05
|
Update group save action, using Group object methods. Fixes errors on new MariaDB
|
2020-03-28 10:09:13 -04:00 |
hax0kartik
|
a781cc2c87
|
WIP scaling
|
2020-03-27 14:32:50 -04:00 |
|
hax0kartik
|
ae80b3b859
|
Start implementing VNC
|
2020-03-27 14:32:50 -04:00 |
|
Isaac Connor
|
c3bcdcff64
|
Use zm_session_start instead of session_start
|
2020-03-27 14:30:42 -04:00 |
|
Isaac Connor
|
4eed0a9c29
|
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
|
2020-03-27 14:30:41 -04:00 |
|
Isaac Connor
|
50700031b1
|
Use zm_session_start instead of session_start
|
2020-03-27 13:05:12 -04:00 |
|
Isaac Connor
|
1ab294e291
|
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
|
2020-03-27 12:43:21 -04:00 |
|
Isaac Connor
|
17fbafd7de
|
including the language files must come after auth in order to user the user's language setting
|
2020-03-27 11:41:04 -04:00 |
|
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 |
|
Isaac Connor
|
0b267fbdee
|
Add Enabled to Storage
|
2020-03-04 10:46:16 -05:00 |
|
Isaac Connor
|
3a24f27a7a
|
include id in monitors dropdown so that it is searchable
|
2020-03-03 16:59:38 -05:00 |
|
Isaac Connor
|
fa6ac399be
|
Fix code in makePopupLink. Return content-type application/json for json response
|
2020-03-02 17:21:58 -05:00 |
|
Isaac Connor
|
d29b93216d
|
Allow users without System::View to read servers.json
|
2020-03-02 16:39:12 -05:00 |
|
Isaac Connor
|
85e5ade07a
|
fix makePopupLink when condition is false
|
2020-03-02 16:10:56 -05:00 |
|
Isaac Connor
|
bd59ae8856
|
Move the Basic Auth login code from skin.php to includes/auth.php
|
2020-03-02 15:00:31 -05:00 |
|
Isaac Connor
|
c1e13221f7
|
Move the Basic Auth login code from skin.php to includes/auth.php
|
2020-03-02 14:59:36 -05:00 |
|
Isaac Connor
|
a2dd24ae1f
|
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
|
2020-03-02 14:38:36 -05:00 |
|
Isaac Connor
|
00de49a5c1
|
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
|
2020-03-02 12:43:07 -05:00 |
|
Isaac Connor
|
7c21f065bd
|
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
|
2020-03-02 12:07:11 -05:00 |
|
Isaac Connor
|
d0e70fc501
|
Merge branch 'fix_auth_timeouts' of github.com:connortechnology/ZoneMinder into fix_auth_timeouts
|
2020-03-02 12:04:45 -05:00 |
|
Isaac Connor
|
8f113ad030
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-03-02 11:55:08 -05:00 |
|
Isaac Connor
|
967e5ad30f
|
alter setButtonState to take either an id or an element so that we can log the missing element
|
2020-03-02 11:52:32 -05:00 |
|
Isaac Connor
|
f0e7b84001
|
Only load user from session if other auth mechanisms aren't present.
|
2020-03-02 11:51:07 -05:00 |
|
Isaac Connor
|
5f16c10e0a
|
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
|
2020-03-02 11:50:40 -05:00 |
|
Pliable Pixels
|
54c14db863
|
better logs
|
2020-03-01 14:02:44 -05:00 |
|
Isaac Connor
|
76131d1887
|
Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style.
|
2020-03-01 11:07:31 -05:00 |
|
Isaac Connor
|
b9acf42929
|
spacing, eslint
|
2020-02-29 09:28:04 -05:00 |
|
Isaac Connor
|
6456d52b97
|
Merge branch 'fix_user_lang'
|
2020-02-27 17:43:51 -05:00 |
|
Isaac Connor
|
d371da7b4f
|
including the language files must come after auth in order to user the user's language setting
|
2020-02-27 17:42:02 -05:00 |
|
Isaac Connor
|
e19332f36a
|
tidy up, be more efficient and warn when language files are not found.
|
2020-02-27 17:40:31 -05:00 |
|
Isaac Connor
|
bab0b2e830
|
handle a scale value of auto
|
2020-02-27 11:35:40 -05:00 |
|
Isaac Connor
|
bf9ba39aa2
|
Merge branch 'release-1.34'
|
2020-02-25 18:22:55 -05:00 |
|
Isaac Connor
|
1b70ed2076
|
Merge branch 'fix_generate_video_page' into release-1.34
|
2020-02-25 18:22:24 -05:00 |
|
Isaac Connor
|
0c70c5c2a4
|
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
|
2020-02-25 18:14:27 -05:00 |
|
Isaac Connor
|
a34af39ca7
|
Fix logging line in generate video function
|
2020-02-25 18:14:14 -05:00 |
|
Isaac Connor
|
e82ed3a098
|
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
|
2020-02-25 18:13:42 -05:00 |
|
Isaac Connor
|
c08ec996f7
|
Fix various aspects of the video generating page. Clean up and update code. Remove inline javascript. Fixes #2843
|
2020-02-25 18:12:25 -05:00 |
|
Isaac Connor
|
4d044a1f14
|
Fix logging line in generate video function
|
2020-02-25 18:11:07 -05:00 |
|
Isaac Connor
|
8fcd5b37ed
|
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
|
2020-02-25 17:15:59 -05:00 |
|
Isaac Connor
|
7787ba1040
|
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
|
2020-02-25 17:15:45 -05:00 |
|
Isaac Connor
|
54a6dfff66
|
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
|
2020-02-25 17:12:48 -05:00 |
|
Isaac Connor
|
bd097bf8ce
|
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
|
2020-02-25 17:00:16 -05:00 |
|
Isaac Connor
|
23e4b43aa0
|
Stop the montagereview update while we reload the page
|
2020-02-25 16:53:08 -05:00 |
|
Isaac Connor
|
3adc20b04e
|
Use a little less ram by passing by reference
|
2020-02-25 16:52:45 -05:00 |
|
Isaac Connor
|
4c2fb6bf08
|
populate a js var minTime and maxTime and use it when setting up the calendar widget to set minTime for end calendar.
|
2020-02-25 13:40:44 -05:00 |
|
Isaac Connor
|
f719514998
|
remove debug
|
2020-02-25 13:39:33 -05:00 |
|
Isaac Connor
|
5c3b7f109e
|
fix cyclePlay button not working.
|
2020-02-25 13:17:45 -05:00 |
|
Isaac Connor
|
dce4d17b51
|
fix cyclePlay button not working. Move SetButtonState into skin.js
|
2020-02-25 13:17:02 -05:00 |
|
Isaac Connor
|
a2c5e4943a
|
Merge branch 'fix_scale'
|
2020-02-25 12:18:27 -05:00 |