Isaac Connor
|
7a0af0cac1
|
Clear timers around changing img.src. Define statusCmdTime at the top.
|
2022-04-27 17:45:55 -04:00 |
|
Isaac Connor
|
5c96283fd9
|
Remove STATE_ and CMD defines as they are in skin.js.php now. quote connKey so that it retains leading 0s. Should quiet some zms errors.
|
2022-04-27 17:45:08 -04:00 |
|
Isaac Connor
|
ba24a9be02
|
Use MonitorStream functions more in montage, including setStreamScale. Fix behaviour of Width/Height/Scale/Layout buttons.
|
2022-04-27 17:44:09 -04:00 |
|
Isaac Connor
|
6e7f99b7d2
|
remove auth_hash, it is global
|
2022-04-27 17:43:10 -04:00 |
|
Isaac Connor
|
9896b57889
|
split changeScale into applyScale. Fix behaviour when selecting width/height/scale. Fix width:100% not persisting
|
2022-04-27 17:42:51 -04:00 |
|
Isaac Connor
|
6f0c726926
|
remove :'s in labels to be consistent
|
2022-04-27 17:42:02 -04:00 |
|
Isaac Connor
|
67d62a6d01
|
Set width of 200px for cycle sidebar
|
2022-04-27 17:41:43 -04:00 |
|
Isaac Connor
|
c35303fc63
|
remove CMD_ANALYZE and CMD_MAXFPS. They havn't been merged yet
|
2022-04-27 17:41:24 -04:00 |
|
Isaac Connor
|
65c9df9fca
|
Rough in lots of stuff from master. setStreamScale to set src of stream img's. Handle ajax errors better. Send CMD_QUIT when changing img.src. These changes reduce errors from zms.
|
2022-04-27 17:40:51 -04:00 |
|
Isaac Connor
|
2969a00dcb
|
Remove loading=lazy as it causes problems with ajax Querying
|
2022-04-27 17:39:33 -04:00 |
|
Isaac Connor
|
6ff0ce4793
|
Add STATE_UNKOWN == -1
|
2022-04-27 17:38:26 -04:00 |
|
Isaac Connor
|
d8ed0d2774
|
Move CMD_ defines to skin.js.php so that they are available everywhere
|
2022-04-27 16:00:47 -04:00 |
|
Isaac Connor
|
3e627a368d
|
setScale to auto
|
2022-04-27 15:46:34 -04:00 |
|
Isaac Connor
|
12a0b829be
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-04-25 18:33:47 -04:00 |
|
Isaac Connor
|
c761196744
|
Remove debugging
|
2022-04-22 13:08:25 -04:00 |
|
Isaac Connor
|
b4d4d282bb
|
trim all monitor inputs before looking for errors. No inputs should have whitespace at beginning or end
|
2022-04-22 13:08:25 -04:00 |
|
Isaac Connor
|
5eeade14a9
|
Add case to handle scale value stored in cooke == auto
|
2022-04-21 17:41:03 -04:00 |
|
Isaac Connor
|
b069c538b5
|
Remove use of auto for auto scale
|
2022-04-21 17:40:37 -04:00 |
|
Isaac Connor
|
320b860a97
|
defint CMD_QUIT for telling streams to stop
|
2022-04-21 17:38:13 -04:00 |
|
Isaac Connor
|
207991781b
|
synchronize on '0' instead of '' for auto scale.
|
2022-04-21 17:37:53 -04:00 |
|
Isaac Connor
|
d4ab1d55c5
|
Revert back to Scale To Fit having the value 0. Change it to be Auto
|
2022-04-21 17:34:58 -04:00 |
|
Isaac Connor
|
b6e9b6ad9c
|
Send CMD_QUIT when changing img.src to fix safari.
|
2022-04-20 15:38:40 -04:00 |
|
Isaac Connor
|
5756449f0b
|
Include CMD_QUIT
|
2022-04-20 15:02:43 -04:00 |
|
Isaac Connor
|
0702938f44
|
Only apply scale if it is a positive integer. Use const instead of var. Only apply src if it's different
implement streamCommand and use it to send CMD_QUIT when changing img.src
|
2022-04-20 15:02:02 -04:00 |
|
Isaac Connor
|
4b4b2d2703
|
add in auto layout choice based on # of monitors
|
2022-04-20 12:23:01 -04:00 |
|
Isaac Connor
|
139b05eefe
|
scale to fit should have a value of auto and fixed will now be fixed.
|
2022-04-20 12:22:30 -04:00 |
|
Isaac Connor
|
dac24b05ec
|
Set imageFeed img to 100%
|
2022-04-20 12:22:07 -04:00 |
|
Isaac Connor
|
614acc3757
|
You must close the stream first or we get leftovew zms processes
|
2022-04-14 18:17:34 -04:00 |
|
Isaac Connor
|
aab257897c
|
Ensure rate is an integer when coming from cookie. Remove commented out rate display.
|
2022-04-11 09:43:45 -04:00 |
|
Isaac Connor
|
3088a7a181
|
Fix test for chrome version 7 by not including periods. We only care about the major and php is confused.
|
2022-04-04 17:00:41 -04:00 |
|
Isaac Connor
|
a56b5607c3
|
Remove extra { breaking ptz
|
2022-04-03 17:16:47 -04:00 |
|
Isaac Connor
|
10663819b4
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-04-03 16:58:31 -04:00 |
Isaac Connor
|
906d6c62a1
|
remove cruft from ServersController.php
|
2022-03-29 18:50:38 -04:00 |
|
Isaac Connor
|
e6e31b0c94
|
Don't both running zmu if monitor Function is set to None
|
2022-03-29 18:49:57 -04:00 |
Ben Dailey
|
1ad191e8d6
|
Most programmatic images are lazy.
|
2022-03-29 18:45:13 -04:00 |
|
Isaac Connor
|
f4103e6e6e
|
Use net zm_setcookie
|
2022-03-29 18:34:02 -04:00 |
|
Isaac Connor
|
7532d4aaaa
|
Use net zm_setcookie
|
2022-03-29 18:12:32 -04:00 |
|
Isaac Connor
|
8fa924f3ba
|
Add handling of NOT IN and =\[\] and \!\[\]
|
2022-03-29 18:11:52 -04:00 |
|
Isaac Connor
|
ee6ae94dd8
|
Add debugging, but commented out
|
2022-03-29 18:11:12 -04:00 |
|
Isaac Connor
|
e12dfb1025
|
better debugging when the row has no Id
|
2022-03-29 18:10:59 -04:00 |
|
Isaac Connor
|
86e95ff0ce
|
spacing
|
2022-03-29 18:10:29 -04:00 |
|
Isaac Connor
|
2d07fda6fc
|
Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it.
|
2022-03-29 18:09:12 -04:00 |
|
Isaac Connor
|
789b729fd6
|
Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it.
|
2022-03-29 18:03:42 -04:00 |
|
Isaac Connor
|
5856aad74b
|
Implement Server function which figures out which Server likely has the video. Use it to remove duplicate logic
|
2022-03-29 18:01:50 -04:00 |
|
Isaac Connor
|
4d44ab13fc
|
spacing, improve debug
|
2022-03-29 17:59:02 -04:00 |
|
Isaac Connor
|
29f6d9e194
|
define raw as an empty array so we don't generate js errors
|
2022-03-29 17:56:39 -04:00 |
|
Isaac Connor
|
2fde32d211
|
Make filter debug modal work on non-saved filter
|
2022-03-29 17:55:06 -04:00 |
|
Isaac Connor
|
40968ed3f7
|
Add more of the resulting SQL to the filter debug modal
|
2022-03-29 17:55:03 -04:00 |
|
Isaac Connor
|
cd613ec1cc
|
Remove debug relating to max ram use
|
2022-03-29 17:50:24 -04:00 |
|
Isaac Connor
|
709d2568ca
|
Allow editing of admin user. Hide snapshots permission if the feature is turned off
|
2022-03-29 17:20:19 -04:00 |