Isaac Connor
|
6d16363f07
|
Restore monitor defaults
|
2019-09-21 10:40:24 -04:00 |
|
Isaac Connor
|
d7810bf9b3
|
fix eslint
|
2019-09-20 14:16:37 -04:00 |
|
Isaac Connor
|
cb194cc4d1
|
enable per commit builds for buster so I can test my docker image for it
|
2019-09-20 14:14:56 -04:00 |
|
Isaac Connor
|
6c39fd133d
|
fix eslint
|
2019-09-20 10:44:38 -04:00 |
|
Isaac Connor
|
caf405c678
|
Use my docker hub for buster
|
2019-09-20 10:39:53 -04:00 |
Isaac Connor
|
5d0b4942d6
|
remove debug
|
2019-09-20 10:37:48 -04:00 |
|
Isaac Connor
|
0d19b0dc85
|
Use a subselect instead of inner join because the inner join won't return monitors that don't have a group
|
2019-09-20 10:37:19 -04:00 |
|
Isaac Connor
|
a8cbe7d10d
|
Turn off debug
|
2019-09-20 10:36:50 -04:00 |
|
Isaac Connor
|
481f5b7eac
|
Update control ajax
|
2019-09-20 10:36:38 -04:00 |
|
Isaac Connor
|
f0a8595e50
|
quiet warning caused by server_up being undef for false
|
2019-09-20 10:36:08 -04:00 |
|
Isaac Connor
|
308236b4ad
|
Fix sending ptz controls
|
2019-09-20 10:35:39 -04:00 |
|
Isaac Connor
|
d91c66788e
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-20 08:20:32 -04:00 |
|
Isaac Connor
|
ce37fce99c
|
spacing
|
2019-09-20 08:19:57 -04:00 |
|
Isaac Connor
|
09533c19af
|
Fix %d to %s
|
2019-09-20 08:19:44 -04:00 |
|
Isaac Connor
|
0a0bb1b326
|
Update Frame and Server Objects to use common methods
|
2019-09-19 16:24:05 -04:00 |
|
Isaac Connor
|
4e83f41bc3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-19 14:58:47 -04:00 |
|
Isaac Connor
|
d4435368bc
|
fix spacing between presets and home/set
|
2019-09-19 14:57:48 -04:00 |
|
Isaac Connor
|
1539e34204
|
spacing
|
2019-09-19 14:57:28 -04:00 |
|
Isaac Connor
|
b05ecd881e
|
add onchange to scale
|
2019-09-19 14:57:21 -04:00 |
|
Isaac Connor
|
2da9edf0ff
|
add onchange to scale
|
2019-09-19 14:57:17 -04:00 |
|
Isaac Connor
|
14e625b775
|
Set width of dimensions
|
2019-09-19 14:56:55 -04:00 |
|
Isaac Connor
|
daa9f646fb
|
fix error printing
|
2019-09-19 14:56:34 -04:00 |
|
Isaac Connor
|
b9b52c964e
|
Upgrade monitor saving and viewing
|
2019-09-19 14:56:16 -04:00 |
|
Isaac Connor
|
73a5a8c8c5
|
Improve changes/set/etc to handle more complex defaults
|
2019-09-19 14:55:45 -04:00 |
|
Isaac Connor
|
b41e998a3a
|
Remove Control stuff from Monitor
|
2019-09-19 14:55:27 -04:00 |
|
Isaac Connor
|
4c206c2e9a
|
Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions
|
2019-09-19 14:55:17 -04:00 |
|
Isaac Connor
|
d5ee73a9ee
|
use CaptureResolution instead of CaptureDimensions because it is already in language
|
2019-09-19 10:50:20 -04:00 |
|
Isaac Connor
|
1bd70319a9
|
Add a dimensions dropdown to ease entering monitor dimensions
|
2019-09-19 10:48:25 -04:00 |
|
Isaac Connor
|
2caca5f3ad
|
Merge branch 'master' into update_monitor_saving
|
2019-09-18 11:41:16 -04:00 |
|
Isaac Connor
|
9889311b03
|
Handle username=&password= as well in HostController::login
|
2019-09-18 11:40:55 -04:00 |
|
Isaac Connor
|
458268d866
|
Merge branch 'master' into update_monitor_saving
|
2019-09-18 11:40:09 -04:00 |
|
Isaac Connor
|
b3b7ec660b
|
Add a test for the built-in layouts. Can't edit them.
|
2019-09-18 11:19:28 -04:00 |
|
Isaac Connor
|
9e8c17dfaf
|
Merge branch 'master' into tolland-remove-extra-px
|
2019-09-18 11:17:50 -04:00 |
|
Isaac Connor
|
0eb1fff5b5
|
remove unused view=image-ffmpeg
|
2019-09-18 11:16:49 -04:00 |
|
Isaac Connor
|
f509b4c9d1
|
spacing
|
2019-09-18 11:10:40 -04:00 |
|
Isaac Connor
|
1407d849e8
|
deprecate getStreamSrc in functions.php.
|
2019-09-18 11:10:25 -04:00 |
|
Isaac Connor
|
78ac2bc555
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-17 14:58:40 -04:00 |
|
Isaac Connor
|
17e00cec94
|
Fix setting rtsp_transport when rtsp
|
2019-09-17 14:58:16 -04:00 |
|
Isaac Connor
|
6d19ad7dd8
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-09-17 12:54:04 -04:00 |
|
Isaac Connor
|
e8e29d62b2
|
Use dts instead of pts for first values
|
2019-09-17 12:53:29 -04:00 |
|
Isaac Connor
|
ce1823bd29
|
spacing and fix saving
|
2019-09-17 12:46:11 -04:00 |
|
Isaac Connor
|
bcaabf4cf2
|
update buttons
|
2019-09-17 12:09:36 -04:00 |
|
Isaac Connor
|
e0074692d1
|
Remove debug
|
2019-09-17 12:07:30 -04:00 |
|
Isaac Connor
|
ad84736cb4
|
spacing
|
2019-09-17 12:07:24 -04:00 |
|
Isaac Connor
|
ff8e9fa072
|
Don't glob skins dir and css dirs unless our skin or css is invalid.
|
2019-09-17 12:07:10 -04:00 |
|
Isaac Connor
|
f0cfd674c1
|
Cleanup options skins tab. Setting the values happens in index.php. Use global and
|
2019-09-17 12:06:54 -04:00 |
|
Isaac Connor
|
0d347f0cf5
|
init log early so that we create zmc_m.log instead of undef.log
|
2019-09-17 11:37:48 -04:00 |
|
Isaac Connor
|
6041616efc
|
add string_toupper function
|
2019-09-17 11:37:20 -04:00 |
|
Isaac Connor
|
33aa6abf59
|
Only open log file if we are going to write to it.
|
2019-09-17 11:36:57 -04:00 |
|
Isaac Connor
|
ecde0a7ae0
|
Add a string_toupper function
|
2019-09-17 11:11:22 -04:00 |