Isaac Connor
|
da0cf59144
|
fix borders and centering on live view
|
2022-05-31 12:43:20 -04:00 |
|
Isaac Connor
|
a782aea12f
|
Handle ctrl-click for opening in a new window
|
2022-05-31 12:01:01 -04:00 |
|
Isaac Connor
|
858167a779
|
just like in master use .monitor.alert for styling
|
2022-05-31 12:00:38 -04:00 |
|
Isaac Connor
|
a26042ea02
|
Don't change width if it is a percent
|
2022-05-31 12:00:17 -04:00 |
|
Isaac Connor
|
1fc9ddb54b
|
Put live stream in a monitor div so that it lays out right
|
2022-05-31 11:44:04 -04:00 |
|
Isaac Connor
|
bd4195d0c7
|
ZM_OPT_USE_GEOLOCATION is globally included so remove from monitor.js.php. Only test Path if not empty and handle exceptions in parsing it.
|
2022-05-31 11:43:44 -04:00 |
|
Isaac Connor
|
d584431160
|
Fix centering of live view
|
2022-05-31 11:42:44 -04:00 |
|
Isaac Connor
|
c481a812d0
|
Put back click on image in montage to bring live view
|
2022-05-31 11:31:57 -04:00 |
|
Isaac Connor
|
67e148052a
|
set _last_error if insert fails
|
2022-05-31 11:31:24 -04:00 |
|
Isaac Connor
|
5ff68badbc
|
Report more saving errors to ui
|
2022-05-31 11:31:03 -04:00 |
|
Isaac Connor
|
04ebb81072
|
Implement CTRL-click to open event in a new tab/window
|
2022-05-30 14:02:24 -04:00 |
|
Isaac Connor
|
77090f79d5
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-30 09:53:42 -04:00 |
|
Isaac Connor
|
760d692086
|
Zoom by 10% instead of 25%
|
2022-05-27 10:45:27 -04:00 |
|
Isaac Connor
|
45e3505c60
|
Implement 25% zoom incrementts with no max
|
2022-05-27 10:45:09 -04:00 |
|
Isaac Connor
|
bcbb7be54b
|
Remove unused variable
|
2022-05-27 10:43:20 -04:00 |
|
Isaac Connor
|
4c718727c2
|
Add Width() and Height() to Box.
|
2022-05-27 10:40:01 -04:00 |
|
Isaac Connor
|
e6ddb1bbde
|
Implement a Scale(new_width, new_height) using sw_scale.
|
2022-05-27 10:38:45 -04:00 |
|
Isaac Connor
|
5933137e55
|
Clean out cruft from prepareImage. Fixes not sending scaled image.
|
2022-05-27 10:30:35 -04:00 |
|
Isaac Connor
|
c410448fe7
|
Finally fix centering of zoomed image
|
2022-05-27 10:29:30 -04:00 |
|
Isaac Connor
|
2ca115080b
|
Rework zooming. We now crop first, then scale to retain image fidelity as much as possible. More work to be done but is working better than the old code and I think is more readable. This also makes Box a class member instead of a static
|
2022-05-27 10:29:18 -04:00 |
|
Isaac Connor
|
4ff50b82c8
|
There are no available runners for a xenial ci, so just forget it.
|
2022-05-27 10:22:52 -04:00 |
|
Isaac Connor
|
0c5bdbe88e
|
Fix empty PATH_FFMPEG.
|
2022-05-27 10:22:08 -04:00 |
|
Isaac Connor
|
32aa919c9f
|
Don't update DiskSpace with a 0 value when listing events. This generally happens with missing events and causes too much contention on the Events and summaries tables
|
2022-05-27 10:21:24 -04:00 |
|
Isaac Connor
|
a8c2653453
|
Prevent editing of system config entries through the api
|
2022-05-27 10:20:33 -04:00 |
|
Isaac Connor
|
1198b391ee
|
remove debug
|
2022-05-27 09:30:37 -04:00 |
|
Isaac Connor
|
7256189644
|
assign class=monitor to match other views
|
2022-05-26 16:37:07 -04:00 |
|
Isaac Connor
|
d5f0fe0259
|
remove data-on-click from alarmForce and cancel buttons as we check for canedit in watch.js. Update status fields to include the id to match montage so that monitorstream can access them.
|
2022-05-26 16:36:50 -04:00 |
|
Isaac Connor
|
dc8865659e
|
When clicking cancel on zone edit, go back instead of reload
|
2022-05-26 16:35:58 -04:00 |
|
Isaac Connor
|
6daa75df29
|
Use more of monitorStream. alert if the ajax has a message
|
2022-05-26 16:35:38 -04:00 |
|
Isaac Connor
|
58749f5165
|
Move monitor alarm styles into skin.css as they are used in other views now too
|
2022-05-26 16:34:14 -04:00 |
|
Isaac Connor
|
b708b3f545
|
Remove debug
|
2022-05-26 16:33:49 -04:00 |
|
Isaac Connor
|
e7e692ddbf
|
Use global config vale for ZM_WEB_POPUP_ON_ALARM
|
2022-05-26 16:33:38 -04:00 |
|
Isaac Connor
|
e06925d192
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-05-26 14:00:13 -04:00 |
|
Isaac Connor
|
994662985f
|
fix missing ] on checkboxx
|
2022-05-26 14:00:03 -04:00 |
tftadmin Appleton
|
46b43b980a
|
Remove janus
|
2022-05-25 15:46:44 -05:00 |
|
Isaac Connor
|
b1ac4981bf
|
Fixup cherry pick escaping multi-line config consts
|
2022-05-25 16:07:39 -04:00 |
|
Isaac Connor
|
d8f666ec2d
|
Update styles so that alarmed images get red border
|
2022-05-25 16:06:59 -04:00 |
|
Isaac Connor
|
eacc7edf15
|
Re-instate setting the class of the monitor div on alarm
|
2022-05-25 16:06:42 -04:00 |
|
Isaac Connor
|
e26c7ed132
|
fix replacement on escape. For some reason needs double bacl slash
|
2022-05-25 15:59:55 -04:00 |
Isaac Connor
|
c5e5389843
|
Make config entries const
|
2022-05-25 15:59:09 -04:00 |
|
Isaac Connor
|
968b52239d
|
Add divs needed for MonitorStream. Improve title to include monitor name, start in single mode
|
2022-05-25 15:58:07 -04:00 |
|
Isaac Connor
|
e5b858a3c3
|
Add divs needed for MonitorStream
|
2022-05-25 15:57:47 -04:00 |
|
Isaac Connor
|
34ee033b7e
|
Start in single mode, make imageFeed have the monitor it in it. Include MOnitorStream.js
|
2022-05-25 15:54:35 -04:00 |
|
Isaac Connor
|
0265f69c6d
|
add monitorData so that we can use MonitorStream.js
|
2022-05-25 15:54:12 -04:00 |
|
Isaac Connor
|
32e2db03fc
|
Update to use setScale instead of setStreamScale
|
2022-05-25 15:54:04 -04:00 |
|
Isaac Connor
|
02d5b7eab7
|
add monitorData so that we can use MonitorStream.js
|
2022-05-25 15:53:44 -04:00 |
|
Isaac Connor
|
82582efeca
|
Fix point updating
|
2022-05-25 15:53:19 -04:00 |
|
Isaac Connor
|
63adbbad03
|
Remove monitorFrame and dead code
|
2022-05-25 15:52:39 -04:00 |
|
Isaac Connor
|
388592e5ca
|
Update Layouts to fill the space
|
2022-05-25 15:51:12 -04:00 |
|
Isaac Connor
|
838e020efc
|
Update styles to match master, meaning #imageFrame => .imageFrame
|
2022-05-25 15:11:44 -04:00 |