mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-28 02:33:42 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,373 Commits 80 Branches 104 Tags
aab717bc91b0beb2cee4cdfd3941b4ff157bb4b9
Commit Graph

8400 Commits

Author SHA1 Message Date
Isaac Connor
ce944b9a61 Add case to handle scale value stored in cooke == auto 2022-04-28 16:33:38 -04:00
Isaac Connor
f8d14b5fa7 New styles for new layout. Image and Points in in 1 div now, floated left, settings floated right. 2022-04-28 16:14:06 -04:00
Isaac Connor
c468be7c40 New styles for new layout. Image and Points in in 1 div now, floated left, settings floated right. 2022-04-28 16:13:51 -04:00
Isaac Connor
ba195203a6 var => const. Fix points not being draggable after switch to MonitorStream.js generated html. Fix hightlightoff not firing over points table 2022-04-28 16:10:46 -04:00
Isaac Connor
84ae91fe24 Comment out width and height setting on the imageFrame 2022-04-28 15:45:35 -04:00
Isaac Connor
00c2c2e794 replace No Data with No event. People get confused by No Data. 2022-04-28 10:36:06 -04:00
Isaac Connor
2a7217ec0d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-27 15:55:12 -04:00
Isaac Connor
0cb15d3418 Remove extra { breaking ptz 2022-04-23 19:29:04 -04:00
Isaac Connor
13b0cdccbd Use getStreamHTML to include the state and zones html 2022-04-22 16:00:50 -04:00
Isaac Connor
b15b0281be Use getStreamHTML to include the state html 2022-04-22 16:00:27 -04:00
Isaac Connor
8d89639e2f Include the padding when figureing the scaling 2022-04-22 15:59:58 -04:00
Isaac Connor
a5bb2535d8 Include the padding when figureing the scaling 2022-04-22 15:59:54 -04:00
Isaac Connor
d584b8ec21 Remove CMD_ defines because they are now in skin.js.php 2022-04-22 15:54:33 -04:00
Isaac Connor
44ace76e2e Remove CMD_ defines because they are now in skin.js.php 2022-04-22 15:54:19 -04:00
Isaac Connor
003b23f171 Set img to 100% so it fills the frame 2022-04-22 15:53:27 -04:00
Isaac Connor
647bd69fc8 Move CMD_ defines to skin.js.php so that they are available everywhere 2022-04-22 15:52:34 -04:00
Isaac Connor
e47d1bcd07 Set imageFrame.monitor to 100%, don't float the .monitor and be more specific about styles for zonePoints so they don't affect other divs 2022-04-22 15:52:08 -04:00
Isaac Connor
2fb44769b6 split setScale into setStreamScale so we can set the img.src without altering the frame 2022-04-22 15:50:55 -04:00
Isaac Connor
07e6ae931f Add mid and zid to zone polygon so that we can use them in atached onclicks 2022-04-22 15:50:00 -04:00
Isaac Connor
1997a1b6d9 Fix reversed logic preventing warning about no video saving 2022-04-22 13:07:40 -04:00
Isaac Connor
348441ac46 Deprecate scale == auto 2022-04-22 13:07:11 -04:00
Isaac Connor
0d176b133a Stop and restart statusCmdReq around rescaling img stream. Deprecate auto as a value for scale. Make another attempt as sanely applying scale 2022-04-22 12:34:49 -04:00
Isaac Connor
889cb7df18 Add workaround for old string values of scale 2022-04-22 12:33:36 -04:00
Isaac Connor
66b4902fd1 Clean up default layout code to match 1.36.15 2022-04-21 09:28:37 -04:00
Isaac Connor
be0037a17a Revert scale=auto to be scale='0' 2022-04-21 09:26:23 -04:00
Isaac Connor
a05488b758 Put auto back to '0' because it needs to be for saving monitors 2022-04-21 09:25:46 -04:00
Isaac Connor
0eb358aecf Make video tag for janus 100% width so that it scales likes img does 2022-04-21 09:24:03 -04:00
Isaac Connor
768941b020 Make video tags 100% as well as img so that janus scales 2022-04-20 18:48:19 -04:00
Isaac Connor
8170ce2b8d Check error instead of textStatus for Unauthorized. Set streamCmdParams.auth when auth_hash changes. Fixes auth timing out in ajax 2022-04-20 18:47:57 -04:00
Isaac Connor
c2dcaab744 fix eslint 2022-04-20 10:00:47 -04:00
Isaac Connor
41cbc1afed Must define CMD_QUIT 2022-04-20 09:39:12 -04:00
Isaac Connor
0501f464c5 Fix scale <0 and send zms a quit command because safari will never close the stream. Fixes no image on safari 2022-04-19 19:30:27 -04:00
Isaac Connor
1561ad140a Merge branch 'master' into fix_viewing 2022-04-19 17:09:02 -04:00
Isaac Connor
ff46f78ab4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-19 17:08:19 -04:00
Isaac Connor
91a5642edc merge 2022-04-19 17:07:20 -04:00
Isaac Connor
b519e3b388 spacing, default to fixed when appropriate, include state html if not website 2022-04-19 17:06:34 -04:00
Isaac Connor
3885d853f9 Don't need to use a random start on watch 2022-04-19 17:05:41 -04:00
Isaac Connor
aedfca22d6 reorg code a bit. Implement setting width & height in REQUEST 2022-04-19 16:59:11 -04:00
Isaac Connor
4393d2b9de Add CMD_STOP, convert to consts 2022-04-19 16:58:33 -04:00
Isaac Connor
61bdcc53ab add debugging and put back code in setLayout to call setScale. Add onclick to navbar elements to stop streaming when clicked. 2022-04-19 16:58:17 -04:00
Isaac Connor
4785954140 Add comments to scaleToFit 2022-04-19 16:57:30 -04:00
Isaac Connor
c171c47d58 Don't remove fixed 2022-04-19 16:56:40 -04:00
Isaac Connor
21716e994b Keep better track of timers. Add img_onerror to report when image breaks. setScale is a mess. Add some more code to guess image scale. Browser can't handle 4k jpeg streams. scaling is a must. 2022-04-19 16:56:21 -04:00
Isaac Connor
1eaeccc564 Handle zones not being set in options 2022-04-19 12:31:43 -04:00
Isaac Connor
fe6663fa39 Fix skipping based on Function instead of Capturing. 2022-04-18 18:03:50 -04:00
Isaac Connor
53805079b6 If no device specified, look in /dev/ for video devices and specify them to zmu. Fix use of undefined host var 2022-04-18 15:56:14 -04:00
Isaac Connor
01ab1c2535 Fix errors when sorting by EndDateTime. 2022-04-13 17:18:59 -04:00
Isaac Connor
2ff16e002b fix eslint 2022-04-12 14:04:35 -04:00
Isaac Connor
6548983f39 Make JANUS options full width and left-align things 2022-04-12 14:01:48 -04:00
Isaac Connor
43fbd7d709 Ensure rate is an integer when coming from cookie. Remove commented out rate display. 2022-04-11 09:46:47 -04:00