Isaac Connor
|
64ae6e2944
|
Install basic packages
|
2022-06-02 21:18:33 -04:00 |
|
Isaac Connor
|
db885cac5a
|
fix eslint
|
2022-06-02 16:43:23 -04:00 |
|
Isaac Connor
|
a5f8ea2e82
|
Don't trim select values. In monitor selects are all well defined. Fixes not being able to multi-select groups or linked monitors
|
2022-06-02 16:28:25 -04:00 |
|
Isaac Connor
|
d1bfb78235
|
use a global mode variable to determine if we are editing and disable clicking on image. disabling the onclick doesn't seem to be working. When activating edit mode and saving positions use #monitor instead of #monitorFrame which went away.
|
2022-06-02 13:56:16 -04:00 |
|
Isaac Connor
|
7e5c4d4a76
|
Only set onclick if a new function is given
|
2022-06-02 13:54:48 -04:00 |
|
Isaac Connor
|
6a287708c6
|
use zm_setcookie function with will set required cookie fields so that cookie actually gets set
|
2022-06-02 13:53:39 -04:00 |
|
Isaac Connor
|
56d57fc1aa
|
Bump version 1.36.17
|
2022-05-31 16:06:50 -04:00 |
|
Isaac Connor
|
e270577f40
|
center stream on cycle
|
2022-05-31 14:19:54 -04:00 |
|
Isaac Connor
|
f044cfa280
|
add a newline
|
2022-05-31 14:19:41 -04:00 |
|
Isaac Connor
|
bc3ab9cf66
|
Use monitorStream scaling
|
2022-05-31 14:19:27 -04:00 |
|
Isaac Connor
|
7def1944b6
|
Always force width and height on img to sane values
|
2022-05-31 14:18:56 -04:00 |
|
Isaac Connor
|
ee559a5bc2
|
fix spacing
|
2022-05-31 13:59:29 -04:00 |
|
Isaac Connor
|
9aa7f70c0f
|
remove connkey from initial zms single jpeg in montage.
|
2022-05-31 13:59:17 -04:00 |
|
Isaac Connor
|
722a0174d7
|
use monitorStream more in watch
|
2022-05-31 13:58:48 -04:00 |
|
Isaac Connor
|
8d7293202d
|
use monitorStream more in cycle
|
2022-05-31 13:58:33 -04:00 |
|
Isaac Connor
|
afbf5ebe60
|
Start stream with single jpeg. Add monitor div around imagefeed
|
2022-05-31 13:58:13 -04:00 |
|
Isaac Connor
|
cb11ce100f
|
Include connKey is debug line
|
2022-05-31 13:57:41 -04:00 |
|
Isaac Connor
|
d9c24f96c2
|
Don't delete the socket file because another zms might have opened it and be waiting on the lock. This should remove a ton of zms error messages
|
2022-05-31 13:35:57 -04:00 |
|
Isaac Connor
|
6479a1ec99
|
Implement semaphore retry. Make not getting the semaphore an error
|
2022-05-31 13:14:30 -04:00 |
|
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 |