tftadmin Appleton
|
bdf13bd46e
|
Fix loading sessions
|
2022-05-18 17:51:08 -05:00 |
|
tftadmin Appleton
|
746ee44cf4
|
Specify only sessions active in the last ZM_COOKIE_LIFTTIME seconds when loading logout modal
|
2022-05-18 17:37:53 -05:00 |
r01k
|
10e438e526
|
Fixed in export.php "Class 'Filter' not found" and construction of SQL query with wrong syntax
|
2022-05-13 09:29:09 -04:00 |
Isaac Connor
|
56e121e9bb
|
Don't clear img.src after sending QUIT. QUIT will do the job and killing the stream first might mean that it gets lost
|
2022-05-12 12:05:02 -04:00 |
|
Isaac Connor
|
0d29864d36
|
Start the query status timer on img.load
|
2022-05-12 10:51:27 -04:00 |
|
Isaac Connor
|
6419ec6841
|
Make STATES const instead of VAR
|
2022-05-12 10:51:05 -04:00 |
|
Isaac Connor
|
1af63e151b
|
Fix numbering of states, since UNKNOWN=0
|
2022-05-12 10:17:02 -04:00 |
|
Isaac Connor
|
7f9a9e5c22
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-11 10:22:04 -04:00 |
|
Isaac Connor
|
7545cbea4d
|
Don't assuming we want to communicate with zms if streaming.
|
2022-05-11 10:22:01 -04:00 |
|
Isaac Connor
|
30384ae8f9
|
Convert width and height auto => 0 to auto=>auto. Add an auto-select for 5 wide when there are more than 5 and a multiple of 5
|
2022-05-10 18:35:13 -04:00 |
|
Isaac Connor
|
bfb6d79615
|
Convert width and height auto => 0 to auto=>auto. Set image height in setLayout so that we aren't left with a specified height on the image
|
2022-05-10 18:34:38 -04:00 |
|
Isaac Connor
|
51ffc05c4d
|
Set samesite for session ZMSESSID cookie for php < 7.3
|
2022-05-10 17:48:16 -04:00 |
|
Isaac Connor
|
0e92eace25
|
Remove timeout on ajax call to generate the zip. Fixes #3264
|
2022-05-03 13:20:38 -04:00 |
|
Isaac Connor
|
d62ea5a5f7
|
Comment out debugging
|
2022-05-02 10:25:49 -04:00 |
|
Isaac Connor
|
c572df48ed
|
Fix points not unhighlighting onmouseout
|
2022-04-28 16:08:25 -04:00 |
|
Isaac Connor
|
abc4643bdf
|
Clear statusCmdTimer when changing img.src. Only start it if it was set before. Use toLocaleString to format fps values
|
2022-04-28 11:00:24 -04:00 |
|
Isaac Connor
|
6e6305bbca
|
set image height to value of height dropdown, which is either a pixel value or auto, which is appropriate
|
2022-04-28 10:38:29 -04:00 |
|
Isaac Connor
|
90953cdfcf
|
Remove CMD constants as they are in skin.js.php now
|
2022-04-28 10:38:01 -04:00 |
|
Isaac Connor
|
8d1007246c
|
Add VARPLAY
|
2022-04-28 10:37:41 -04:00 |
|
Isaac Connor
|
68367d8d61
|
MonitorStream doesn't know about MONTAGE. Hiding fields should be done in php. Use toLocaleString to format fps values with 1 decimal.
|
2022-04-28 10:37:29 -04:00 |
|
Isaac Connor
|
cd457ae03f
|
Fix eslint
|
2022-04-28 09:17:11 -04:00 |
|
Isaac Connor
|
8bdaaf097c
|
sync update the style of the surroundin image stream div. Add id and class. Include MonitorStream.js
|
2022-04-27 21:52:48 -04:00 |
|
Isaac Connor
|
bdd2d171c6
|
handle undefined HTTP_REFERER, and escape zone name
|
2022-04-27 21:52:31 -04:00 |
|
Isaac Connor
|
6d1c759dab
|
export the layout id of FreeForm to javascript land
|
2022-04-27 21:51:50 -04:00 |
|
Isaac Connor
|
95590ccd58
|
remove CMD_ and STATE_ defines because they are global now
|
2022-04-27 21:51:07 -04:00 |
|
Isaac Connor
|
8e6f9401c6
|
Scale is now '0' not 'auto'
|
2022-04-27 21:50:40 -04:00 |
|
Isaac Connor
|
001f9a5e9d
|
add statusRefreshTimeout and connKey
|
2022-04-27 21:50:19 -04:00 |
|
Isaac Connor
|
11ea5f2de5
|
Use MonitorStream fo setting img.scale.
|
2022-04-27 21:49:55 -04:00 |
|
Isaac Connor
|
00b80cbe69
|
sync update the style of the surroundin image stream div. Add id and class. Include MonitorStream.js
|
2022-04-27 21:47:24 -04:00 |
|
Isaac Connor
|
3cbca32e36
|
remove #imageFeed style has been moved to global .imageFeed
|
2022-04-27 21:46:17 -04:00 |
|
Isaac Connor
|
e7928a449d
|
Apply .imageFeed img styles globally
|
2022-04-27 21:45:23 -04:00 |
|
Isaac Connor
|
fc78133733
|
Only apply height styles to the stream img.
|
2022-04-27 21:44:55 -04:00 |
|
Isaac Connor
|
f0fb1997db
|
Remove STATE_ and CMD defines as they are in skin.js.php now.
|
2022-04-27 17:47:08 -04:00 |
|
Isaac Connor
|
b37b5fcae9
|
Remove STATE_ and CMD defines as they are in skin.js.php now.
|
2022-04-27 17:46:48 -04:00 |
|
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 |