Isaac Connor
|
89d112cfe8
|
Add video.js includes at bottom of video view since they are no longer handled in includes/function.php
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
23b0b9876d
|
Add leaflet.js includes at bottom of monitor view since they are no longer handled in includes/function.php
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
2cbae814c3
|
Add video.js includes at bottom of event view since they are no longer handled in includes/function.php
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
0fc91ec8cb
|
Remove export-related functions out of skin.js into export.js
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
beec8bb03a
|
Move view-specific includes out of includes/functions. It is far easier to just put those at the bottom of the actual view file.
|
2022-10-21 10:19:06 -04:00 |
|
Isaac Connor
|
262a2f0cb0
|
Don't add class=alarmCue to noneCue spans. Move calls to get frames data to after applying scale
|
2022-10-20 16:48:07 -04:00 |
|
Isaac Connor
|
8681b6d1b2
|
Add back setting width and height when scaling to image stream
|
2022-10-20 16:46:38 -04:00 |
|
Isaac Connor
|
bce8c6195a
|
Don't display errors in Server.php
|
2022-10-20 16:45:52 -04:00 |
|
Isaac Connor
|
f1843528d0
|
Put back width and height setting on img tag. Needed for event viewing
|
2022-10-20 16:45:37 -04:00 |
|
Isaac Connor
|
5cf47622d7
|
Clean up alarm cue styles a bit. Fix background color on noneCue
|
2022-10-20 16:41:21 -04:00 |
|
Isaac Connor
|
082ffdf76e
|
Fix SQL for when passing an empty array to find. Return false instead of trying weird sql.
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
76cd1b6b90
|
remove debug of monitors and Fix Warning when monitor is not visible
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
49b7f1e557
|
Make inputs on action table 100%
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
84fd4b42d5
|
Fix test for null in Object::find
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
ff01d4d394
|
IN () being false could still result in a true result of used in an OR, so instead of just returning, use an always false sql equivalent
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
837d0ece7f
|
return empty array when passing empty as SQLvalue
|
2022-10-20 10:22:56 -04:00 |
|
Isaac Connor
|
73c2415f83
|
Remove swp file
|
2022-10-20 10:20:58 -04:00 |
|
Isaac Connor
|
59bc1c3fc3
|
add IIOT styles
|
2022-10-20 10:20:26 -04:00 |
|
Isaac Connor
|
85a1b15e92
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-10-20 08:59:23 -04:00 |
|
Isaac Connor
|
23863c1853
|
Make inputs on action table 100%
|
2022-10-18 13:56:16 -04:00 |
|
Isaac Connor
|
c698027ac9
|
Fix test for null in Object::find
|
2022-10-18 13:29:12 -04:00 |
|
Isaac Connor
|
1be399026e
|
IN () being false could still result in a true result of used in an OR, so instead of just returning, use an always false sql equivalent
|
2022-10-18 13:28:54 -04:00 |
|
Isaac Connor
|
27757c1e59
|
return empty array when passing empty as SQLvalue
|
2022-10-18 13:28:43 -04:00 |
|
Isaac Connor
|
07ea55d7ea
|
Merge ../ZoneMinder.connortechnology
|
2022-10-18 08:58:49 -04:00 |
|
Isaac Connor
|
c40d251009
|
Add setting remoteAddr in session after regenerating
|
2022-10-17 19:09:24 -04:00 |
|
Isaac Connor
|
9adf5f662f
|
Use REQUEST instead of SESSION to store the post login redirect because we clear the session on login. Fixes #3517
|
2022-10-17 17:25:56 -04:00 |
|
Isaac Connor
|
22a059d3bc
|
Remove debug
|
2022-10-17 17:25:46 -04:00 |
|
Isaac Connor
|
ce62bb1297
|
Minor cleanup, remove dead code
|
2022-10-17 17:25:36 -04:00 |
|
Isaac Connor
|
155328b0d6
|
Put view in the form get part for visibility
|
2022-10-17 17:25:27 -04:00 |
|
Isaac Connor
|
9e257def8a
|
Add debug, add validateId function to session handler. Change it to be a a subclass of SessionHandlerInterface so that we don't have to provide createId. Fixes session breakage in php8.2
|
2022-10-17 17:24:52 -04:00 |
|
Isaac Connor
|
5c8343f737
|
remoteAddr is set when session is opened. So no need to do it in auth. session_clear closes the session so no need to close it first
|
2022-10-17 17:23:45 -04:00 |
|
Isaac Connor
|
c2680f7f77
|
Turn failure to send into a debug. When running under fpm etc we may not get SIGPIPE.
|
2022-10-17 17:22:23 -04:00 |
|
Isaac Connor
|
520baefeae
|
Make font file location full width
|
2022-10-17 16:50:39 -04:00 |
|
Isaac Connor
|
9f4c9919e2
|
when a config value is overridden via *.conf files, put up a warning/explanation.
|
2022-10-17 16:50:23 -04:00 |
|
Isaac Connor
|
2b54f732a6
|
improve alarm cue and progress indicator styles
|
2022-10-14 17:39:23 -04:00 |
|
Isaac Connor
|
ae70b1255c
|
Fix styles after removal of dark styles from header
|
2022-10-14 17:32:58 -04:00 |
|
Isaac Connor
|
20ebbc3c58
|
Fix saving from the function modal. Put action in the post variables and change the action to save instead of function.
|
2022-10-14 14:10:46 -04:00 |
|
Isaac Connor
|
5ae47c8671
|
Fix form structure, use of get instead of post and duplicated action input
|
2022-10-14 14:09:43 -04:00 |
|
Isaac Connor
|
feecd5439d
|
left align option value column
|
2022-10-14 14:09:34 -04:00 |
Isaac Connor
|
2329dda323
|
Merge pull request #3609 from connortechnology/fix_non_post_auth
Move relevant code out of includes/actions/auth.php into includs/auth…
|
2022-10-14 14:09:09 -04:00 |
|
Isaac Connor
|
658ca44c32
|
Don't panic if no font file found. Perhaps we can continue with diminished function
|
2022-10-14 14:04:06 -04:00 |
|
Isaac Connor
|
7e4f9f49e8
|
Fix not handling Shallow storage areas
|
2022-10-14 09:25:58 -04:00 |
|
Isaac Connor
|
abe055b9e2
|
Bump version to 1.37.25 for db changes to Monitor_Status table
|
2022-10-14 09:00:13 -04:00 |
|
Isaac Connor
|
e49876de53
|
Bump number of db queue entries before warning to 40. 40 is still a reasonable number and rarely hit in testing.
|
2022-10-13 17:36:41 -04:00 |
|
Isaac Connor
|
5a5a665cdf
|
Test for definition of ZM_LOG_INJECT. We don't include the config when not logged in. So it won't be defined
|
2022-10-12 19:34:05 -04:00 |
|
Isaac Connor
|
86e4d7f4d4
|
Don't show CaptureBandwidth as null/s if there is no value
|
2022-10-12 19:16:17 -04:00 |
|
Isaac Connor
|
a1595c0093
|
Default to use faststart since we close events in a separate thread we can get away with this now
|
2022-10-12 19:15:04 -04:00 |
|
Isaac Connor
|
67a399cd1f
|
Include UpdatedOn when updating Monitor_Status
|
2022-10-12 19:13:52 -04:00 |
|
Isaac Connor
|
196ae7cf89
|
Add UpdatedOn field to Monitor_Status
|
2022-10-12 19:12:36 -04:00 |
|
Isaac Connor
|
f305ac668b
|
Update db calls to use zmDbDo which will handle debug and errorl loging. Add a delete from Monitor_Status for Monitors that are set to None
|
2022-10-12 19:11:55 -04:00 |