Isaac Connor
|
2c0a9528b3
|
Fix behaviour of layout,width,height scale etc. Height is a special case, it works differently than the rest. Use MonitorStream.js functions for setting the width/height and scale of the zms url. The img is always 100% width and height, everything is set in the containing divs.
|
2022-04-10 17:26:23 -04:00 |
|
Isaac Connor
|
37d0b6e606
|
Add some basic sanity checks for width & height == 0
|
2022-04-07 19:38:43 -04:00 |
|
Isaac Connor
|
a58111fa46
|
Rough in an onclick handler for the monitor tabs so that we can store the selected tab value
|
2022-04-07 13:17:02 -04:00 |
|
Isaac Connor
|
906951e450
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-04-06 10:37:10 -04:00 |
|
Isaac Connor
|
0e337cd8bf
|
Remove support for Cambozola which no longer works or is needed.
|
2022-04-06 10:37:02 -04:00 |
|
Isaac Connor
|
6d17aa4b77
|
Don't always default to Freeform. Also update some code in selectLayout
|
2022-04-04 17:47:45 -04:00 |
Isaac Connor
|
717dfff0c4
|
Merge pull request #3456 from exuvo/master
ffmpeg change
|
2022-04-03 14:59:35 -04:00 |
|
Isaac Connor
|
0e4c175aba
|
clean up debug
|
2022-03-28 13:49:46 -04:00 |
|
Isaac Connor
|
d6e504aa34
|
trim all monitor inputs before looking for errors. No inputs should have whitespace at beginning or end
|
2022-03-28 13:47:45 -04:00 |
|
Isaac Connor
|
13f403c56e
|
fix eslint
|
2022-03-13 08:47:11 -04:00 |
Exuvo
|
9fd0a94c9f
|
Add support for vp9 and av1 encoding
|
2022-03-11 13:37:27 +01:00 |
|
Isaac Connor
|
10402fdabe
|
Use template backticks for the Notes string to handle multi-line
|
2022-03-04 13:41:19 -05:00 |
|
Isaac Connor
|
1fb42d0b77
|
Change api of selectLayout. Now takes a value. use MonitorStream.setScale to set image scale. In general fix behaviour when switching between fixed sizes, scales and layouts
|
2022-03-04 12:08:29 -05:00 |
|
Isaac Connor
|
494da65b9a
|
Replace use of Function with Recording
|
2022-02-28 15:46:38 -05:00 |
|
Isaac Connor
|
7283f8629a
|
Function dropdown no longer exists
|
2022-02-28 15:44:15 -05:00 |
|
Isaac Connor
|
5b319258c4
|
fix eslint
|
2022-02-27 14:26:05 -05:00 |
|
Isaac Connor
|
e33b41745d
|
Merge branch 'master' into replace_function_concept
|
2022-02-27 14:04:01 -05:00 |
|
Isaac Connor
|
6fc5803e16
|
Add another clearInterval to prevent looping during window.location
|
2022-02-25 15:54:56 -05:00 |
|
Isaac Connor
|
813fd36b0a
|
clearInterval when location.replacing so that timer stops. Prevents infinite loop
|
2022-02-25 14:13:18 -05:00 |
|
Isaac Connor
|
a40b305065
|
Merge branch 'master' into replace_function_concept
|
2022-02-20 09:52:03 -05:00 |
|
Isaac Connor
|
1a54a96c04
|
Improve title on alarm buttons when we don't have permission. Move onclick from data-on-click to setup in initPage only if permitted
|
2022-02-18 17:11:18 -05:00 |
|
Isaac Connor
|
adf8413333
|
Include EndDateTimeShort in event stats
|
2022-02-17 13:31:25 -05:00 |
|
Isaac Connor
|
8dedac1a21
|
Handle empty endtime more gracefully. If there is a next event just jump to it.
|
2022-02-17 13:30:50 -05:00 |
|
Isaac Connor
|
cd2c977ed8
|
Merge branch 'master' into replace_function_concept
|
2022-02-16 14:25:38 -05:00 |
|
Isaac Connor
|
b67e7b8111
|
serialize form instead of just passing filter id because the modal can now handle unsaved filters
|
2022-02-15 18:52:46 -05:00 |
|
Isaac Connor
|
485cc26065
|
Merge branch 'master' into replace_function_concept
|
2022-02-12 22:17:47 -05:00 |
|
Isaac Connor
|
cb80283398
|
Merge branch 'master' into timeline_multi_monitor
update code to use jquery instead of mootools
when only viewing 1 monitor, split view in half
load first event image righ toff the bat
|
2022-02-11 18:03:35 -05:00 |
|
Isaac Connor
|
b866888062
|
Change title of settings button to give an indication WHY it isn't enabled
|
2022-02-08 17:52:59 -05:00 |
|
Isaac Connor
|
f66a463574
|
Merge branch 'master' into replace_function_concept
|
2022-02-08 12:07:30 -05:00 |
|
Isaac Connor
|
b005927ea3
|
debug when no data.frames
|
2022-02-08 11:21:56 -05:00 |
|
Isaac Connor
|
33473eac6a
|
Add arp-scan as a tool for getting list of devices on network. Add an interface specifier to monitor probe just like on onvif-probe. Rough in support for Hikvision cameras
|
2022-02-07 12:33:53 -05:00 |
|
Isaac Connor
|
3c655807e8
|
Use new Event->Server function to return the correct (and matching url to zms) url to use for ajax status calls. Fixes errors in a multi-server environment.
|
2022-02-03 14:47:32 -05:00 |
|
Isaac Connor
|
7a95aa7210
|
Don't render cues if we don't have any. This occurs on initial load we call changeScale which would re-render the cues but the cur ajax hasn't completed yet, so this just avoids an error being logged
|
2022-02-03 14:46:39 -05:00 |
|
Isaac Connor
|
10e39b3b13
|
:wqMerge branch 'master' into replace_function_concept
|
2022-02-02 17:08:01 -05:00 |
|
Isaac Connor
|
3feb4fcc51
|
Merge branch 'master' into master
|
2022-02-02 12:28:17 -05:00 |
|
Isaac Connor
|
3d5767b326
|
Merge branch 'master' into multistream
|
2022-02-01 16:52:42 -05:00 |
|
Isaac Connor
|
0eb4d95d0e
|
remove geolocation copies from config to javscript land. Now all of config is brought in my skin.js.php
|
2022-01-31 18:33:03 -05:00 |
|
Isaac Connor
|
23bfbcd6ce
|
Merge branch 'master' into multistream
|
2022-01-26 10:13:20 -05:00 |
Jonathan Bennett
|
57a697093e
|
Remove redundant JS define
|
2022-01-25 22:38:06 -06:00 |
|
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
|
Jonathan Bennett
|
d110987935
|
Fix indentation for ESLint
|
2022-01-22 13:37:44 -06:00 |
|
Isaac Connor
|
4910ec752f
|
Merge branch 'master' into multistream
|
2022-01-22 11:52:19 -05:00 |
|
Jonathan Bennett
|
2e9bda1af1
|
Add firefox specific workaround for Janus streaming
|
2022-01-21 23:21:41 -06:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
Isaac Connor
|
57bb91e105
|
add connKey to monitorData
|
2022-01-20 11:53:05 -05:00 |
|
Isaac Connor
|
e73659843a
|
Rework to use MonitorStream.js
|
2022-01-20 11:52:01 -05:00 |
|
Isaac Connor
|
24a9dcbf47
|
If rate > 1600, limit it to 1600 to prevent logged errors
|
2022-01-20 11:50:53 -05:00 |
|
Jonathan Bennett
|
fb832e7d1b
|
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
|
2022-01-19 00:14:52 -06:00 |
|
Isaac Connor
|
3835087c9d
|
Merge branch 'master' into multistream
|
2022-01-18 20:16:08 -05:00 |
|
Jonathan Bennett
|
59056b4103
|
Refactor Montage view js -- Janus in MonitorStream
|
2022-01-15 01:33:17 -06:00 |