Isaac Connor
|
908e892d48
|
Merge branch 'fix_auth_timeouts'
|
2020-04-23 16:15:30 -04:00 |
Isaac Connor
|
81d329af2f
|
spacing, eslint
|
2020-04-23 16:12:04 -04:00 |
|
Isaac Connor
|
5bf068791b
|
Merge branch 'rate_dropdown' into release-1.34
|
2020-04-23 16:11:59 -04:00 |
|
Isaac Connor
|
91e78410a9
|
Stop the montagereview update while we reload the page
|
2020-04-23 16:08:36 -04:00 |
|
Isaac Connor
|
9a3f699644
|
Use a little less ram by passing by reference
|
2020-04-23 16:07:59 -04:00 |
|
Isaac Connor
|
d3f2dd4d6a
|
fix
|
2020-04-23 16:07:23 -04:00 |
|
Isaac Connor
|
7d0421a02c
|
defend against XSS in Monitor Name
|
2020-04-23 16:06:44 -04:00 |
|
Isaac Connor
|
93a37671c2
|
Merge branch 'release-1.34'
|
2020-04-23 16:01:52 -04:00 |
|
Isaac Connor
|
8e2c76df61
|
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
|
2020-04-23 15:59:12 -04:00 |
|
Isaac Connor
|
63aaf76f0d
|
handle a 0 value for scale as the scale to fit value
|
2020-04-23 15:57:42 -04:00 |
|
Isaac Connor
|
6a9a8f1d5f
|
check length of returned tr array to prevent errors in js log
|
2020-04-23 15:55:46 -04:00 |
|
Isaac Connor
|
12252f1f37
|
defend against XSS in Monitor Name
|
2020-04-23 15:54:12 -04:00 |
|
Isaac Connor
|
7347ef4030
|
Handle a zero value for scale
|
2020-04-23 15:52:47 -04:00 |
|
Isaac Connor
|
b7fd4e26a5
|
defend against XSS in Monitor Name
|
2020-04-23 15:51:29 -04:00 |
|
Isaac Connor
|
bab609426d
|
spacing in views/event.php
|
2020-04-23 15:47:10 -04:00 |
|
Isaac Connor
|
4e9f0b3463
|
defend against XSS in Monitor Name
|
2020-04-23 15:46:05 -04:00 |
|
Isaac Connor
|
b6c1a328a8
|
Fix XSS from monitor Name, group Name, storage Name, server Name
|
2020-04-23 15:45:02 -04:00 |
|
Isaac Connor
|
8d2ce34149
|
include id in monitors dropdown so that it is searchable
|
2020-04-23 15:44:27 -04:00 |
|
Isaac Connor
|
91b1d7bbeb
|
alter setButtonState to take either an id or an element so that we can log the missing element
|
2020-04-23 15:43:36 -04:00 |
|
Isaac Connor
|
a6f5ae2601
|
fix cyclePlay button not working. Move SetButtonState into skin.js
|
2020-04-23 15:42:30 -04:00 |
|
Isaac Connor
|
ced36a5333
|
remove debug and spacing
|
2020-04-23 15:40:35 -04:00 |
|
Isaac Connor
|
96774bd038
|
fix inline javascript in ptz buttons
|
2020-04-23 15:39:31 -04:00 |
|
Isaac Connor
|
042086b565
|
Extend width of ControlDevice and Address to full width
|
2020-04-23 15:38:40 -04:00 |
|
Isaac Connor
|
617b74b8bb
|
fix botched merge
|
2020-04-23 15:28:38 -04:00 |
out
|
a7e49bd62a
|
update chinese translation (～￣▽￣)～
|
2020-04-23 15:27:06 -04:00 |
|
Isaac Connor
|
c0b7aad2c8
|
add passive to addEventListener
|
2020-04-23 15:23:53 -04:00 |
|
Isaac Connor
|
17896b656a
|
cleanup and revert adding Event stack trace
|
2020-04-23 15:23:11 -04:00 |
|
Isaac Connor
|
54995ab0d1
|
handle sort_asc not being set. Handle term['val'] not being set.
|
2020-04-23 15:18:05 -04:00 |
|
Isaac Connor
|
f06dc3f171
|
Update group save action, using Group object methods. Fixes errors on new MariaDB
|
2020-04-23 15:16:22 -04:00 |
|
Isaac Connor
|
b05916fc50
|
Use === when testing for empty value and setting defaults
|
2020-04-23 15:08:01 -04:00 |
|
Isaac Connor
|
eb26c5f798
|
Fix use of array_key_exists instead of property_exists
|
2020-04-23 15:07:28 -04:00 |
|
Isaac Connor
|
f5bf474ba6
|
filter bad characters out of Monitor Name
|
2020-04-23 14:59:21 -04:00 |
|
Isaac Connor
|
6f08322f7f
|
add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving
|
2020-04-23 11:12:47 -04:00 |
|
Isaac Connor
|
daff14df9b
|
Allow users without System::View to read servers.json
|
2020-04-23 11:10:30 -04:00 |
Pliable Pixels
|
9b77f77ac3
|
better logs
|
2020-04-23 11:09:39 -04:00 |
|
Isaac Connor
|
c3a80e7e40
|
Add MonitorId to event data returned for status request
|
2020-04-23 11:07:07 -04:00 |
|
Isaac Connor
|
59f9f37fff
|
cleanup. Don't output errors that break json response
|
2020-04-23 11:06:41 -04:00 |
|
Isaac Connor
|
e770be2e13
|
Merge branch 'release-1.34'
|
2020-04-23 10:26:16 -04:00 |
|
Isaac Connor
|
055c20c3cc
|
fix eslint
|
2020-04-23 10:23:46 -04:00 |
|
Isaac Connor
|
eab08783e9
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-04-23 10:10:08 -04:00 |
|
Isaac Connor
|
264ba6525b
|
Remove debug
|
2020-04-21 12:19:18 -04:00 |
|
Isaac Connor
|
b384d233ae
|
add async and defer to recaptcha load
|
2020-04-21 09:20:33 -04:00 |
|
Isaac Connor
|
543628d0ee
|
cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail
|
2020-04-21 09:20:04 -04:00 |
|
Isaac Connor
|
d0e83fcfcb
|
handle case where g-recaptcha-response is not in the request, due to failure to render the recaptcha
|
2020-04-21 09:19:29 -04:00 |
|
Isaac Connor
|
3e8de7dd6c
|
Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918
|
2020-04-21 08:30:42 -04:00 |
|
Isaac Connor
|
ac017a5c72
|
Add support for strftimes' %r when converting to moment.js formatting
|
2020-04-18 17:51:34 -04:00 |
|
Isaac Connor
|
3700b9fcbe
|
fix eslint
|
2020-04-17 11:04:07 -04:00 |
|
Isaac Connor
|
2194ed8b59
|
spacing in views/event.php
|
2020-04-17 09:46:10 -04:00 |
|
Isaac Connor
|
7d4e1fe895
|
Test for opening file before getting it's size. Remove some debug in view_video
|
2020-04-17 09:45:40 -04:00 |
|
Isaac Connor
|
b74d8d7487
|
Add support for strftimes' %r when converting to moment.js formatting
|
2020-04-17 09:44:07 -04:00 |
|
Isaac Connor
|
74e5cc3066
|
eslint
|
2020-04-10 14:22:44 -04:00 |
|
Isaac Connor
|
6d4d925f1e
|
Fix XSS from monitor Name, group Name, storage Name, server Name
|
2020-04-10 12:42:41 -04:00 |
|
Isaac Connor
|
d99ec696b4
|
reorganize to reduce code depth
|
2020-04-10 12:21:53 -04:00 |
|
Isaac Connor
|
bdfdc2a20c
|
add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving
|
2020-04-10 12:17:09 -04:00 |
|
Isaac Connor
|
81ed022d5a
|
Add a filter_regexp to Monitor Name
|
2020-04-10 12:16:32 -04:00 |
|
Isaac Connor
|
fb70acdf6c
|
fix XSS in monitor Name
|
2020-04-10 11:32:01 -04:00 |
|
Isaac Connor
|
365f0240ad
|
fix inline javascript in ptz buttons
|
2020-04-10 11:30:30 -04:00 |
|
Isaac Connor
|
4f8016cc74
|
spacing in watch.php
|
2020-04-10 11:16:11 -04:00 |
|
Isaac Connor
|
fe96ba0a2a
|
cleanup and revert adding Event stack trace
|
2020-04-10 11:14:46 -04:00 |
|
Isaac Connor
|
da94985508
|
add back global servers
|
2020-04-10 11:14:09 -04:00 |
|
Isaac Connor
|
2d748091a2
|
handle sort_asc not being set. Handle term['val'] not being set.
|
2020-04-10 11:13:30 -04:00 |
|
Isaac Connor
|
a25c3dfb5c
|
Add MonitorId to event data returned for status request
|
2020-04-10 11:11:24 -04:00 |
|
Isaac Connor
|
45c13176dc
|
cleanup. Don't output errors that break json response
|
2020-04-10 11:10:57 -04:00 |
|
Isaac Connor
|
85d779a624
|
defend against XSS in Monitor Name
|
2020-04-10 11:10:13 -04:00 |
|
Isaac Connor
|
4fe649c776
|
defend against XSS in Monitor Name
|
2020-04-10 11:10:09 -04:00 |
|
Isaac Connor
|
105be40ce3
|
fix
|
2020-04-10 11:09:46 -04:00 |
|
Isaac Connor
|
c8128de673
|
defend against XSS in Monitor Name
|
2020-04-10 11:06:39 -04:00 |
|
Isaac Connor
|
e9430d48a7
|
defend against XSS in Monitor Name
|
2020-04-10 11:06:20 -04:00 |
|
Isaac Connor
|
aad0b9362c
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:48 -04:00 |
|
Isaac Connor
|
7473b0572a
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:19 -04:00 |
|
Isaac Connor
|
4f4e6a85f9
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:12 -04:00 |
|
Isaac Connor
|
dca12d8efa
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-04-09 20:41:44 -04:00 |
|
Isaac Connor
|
40d386fe6c
|
Handle Zones without monitor
|
2020-04-09 20:41:34 -04:00 |
|
out
|
c3ab03d3c8
|
update chinese translation (～￣▽￣)～
|
2020-04-09 15:30:43 +08:00 |
outline
|
da8c265945
|
Update with updatelangs.php
|
2020-04-09 12:35:02 +08:00 |
|
Isaac Connor
|
ea8fe7b9a9
|
check length of returned tr array to prevent errors in js log
|
2020-04-06 11:59:27 -04:00 |
|
Isaac Connor
|
d0fe1b60df
|
Merge branch 'release-1.34'
|
2020-04-04 16:58:53 -04:00 |
|
Isaac Connor
|
210d380029
|
CSP must include all Servers.
|
2020-04-04 16:57:52 -04:00 |
|
Isaac Connor
|
024431808e
|
fix onchange to data-on-change-this in width,height,scale, layout dropdowns
|
2020-04-04 16:57:24 -04:00 |
|
Isaac Connor
|
571ff260cc
|
Merge branch 'release-1.34'
|
2020-04-04 16:35:09 -04:00 |
|
Isaac Connor
|
e2cb8a656d
|
change exportEvent to expertEvents
|
2020-04-04 11:53:07 -04:00 |
|
Isaac Connor
|
402c38725b
|
Limit version check popups to once per hour
|
2020-04-04 11:52:40 -04:00 |
|
Isaac Connor
|
6feffe2aa9
|
whitespace
|
2020-04-04 11:51:39 -04:00 |
|
Isaac Connor
|
61e6627fce
|
fix fail to update version reminder due to submit button both submitting and formSubmitting as well as view not being set to version
|
2020-04-04 11:48:42 -04:00 |
Isaac Connor
|
f81cfc0513
|
add 1 month as an option to the version popup dropdown
|
2020-04-04 11:46:31 -04:00 |
|
Isaac Connor
|
2441ae2924
|
Improve event export a little bit. Add links to eventFrames and eventDetail html.
|
2020-04-03 15:34:20 -04:00 |
|
Isaac Connor
|
5d72e3b1b5
|
ensure no output buffering when downloading an archive.
|
2020-04-03 15:33:28 -04:00 |
|
Isaac Connor
|
4547332fad
|
Move more styles into export.css. Remove content from dark/export.css and classic/export.css as it is duplicated.
|
2020-04-03 15:32:22 -04:00 |
|
Isaac Connor
|
4e58a38317
|
use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json.
|
2020-04-03 15:21:31 -04:00 |
|
Isaac Connor
|
ef9fbac90c
|
Add Noscript warnings. Whitespace, improve some logic
|
2020-04-02 18:14:14 -04:00 |
|
Isaac Connor
|
1cc60f0857
|
fix action on cycle play button
|
2020-04-02 16:06:27 -04:00 |
|
Isaac Connor
|
87069b99b6
|
Fix inline-script errors on groups page referenced in #2890
|
2020-04-02 14:13:28 -04:00 |
|
Isaac Connor
|
3bfcd8eb33
|
Check for definition of ZM_TIMEZONE before using it. Fixes #2895
|
2020-04-02 14:00:36 -04:00 |
|
Isaac Connor
|
ebac665d4d
|
Must use namespace ZM
|
2020-03-31 08:54:47 -04:00 |
|
Isaac Connor
|
4dcba55ab6
|
Include Storage.php and Server.php
|
2020-03-31 08:53:32 -04:00 |
|
Isaac Connor
|
2fe0096b21
|
correct label_size array and add translations
|
2020-03-30 18:34:43 -04:00 |
|
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 |
|
Isaac Connor
|
a7c28be365
|
change scale to fit value from auto to 0
|
2020-02-25 12:14:34 -05:00 |
|
Isaac Connor
|
8c7d2c5e1a
|
handle a 0 value for scale
|
2020-02-25 12:14:07 -05:00 |
|
Isaac Connor
|
4dda37a6ee
|
remove extra }
|
2020-02-25 12:13:12 -05:00 |
|
Isaac Connor
|
e2ff241017
|
handle a 0 value for scale as the scale to fit value
|
2020-02-25 12:13:05 -05:00 |