10e39b3b13
:wqMerge branch 'master' into replace_function_concept
2022-02-02 17:08:01 -05:00
23bfbcd6ce
Merge branch 'master' into multistream
2022-01-26 10:13:20 -05:00
ec9403fb6f
Adds Amcrest On-camera Motion Detection
2022-01-25 22:38:00 -06:00
fb832e7d1b
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
2022-01-19 00:14:52 -06:00
6bd04de5f6
Merge branch 'master' into multistream
2021-12-31 17:53:36 -05:00
7b18b22f82
Fix value of unknown Model
2021-11-17 18:58:02 -05:00
d8b51fcf38
add function for onchange for Capturing, Analysing, Recordin, SecondPath
2021-10-16 20:35:37 -04:00
ee609ad28b
Further develop behavour when typing in text input for new manufacturer or model. If it already exists, select it.
2021-09-26 14:46:56 -04:00
fe72056d73
fixup populating Models dropdown after Manufacturer select
2021-09-25 20:48:14 -04:00
227e5794fa
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-08 18:32:46 -04:00
54f676a501
Add ManufacturerId_onchange and ModelId_onchange to hide/show the text input for custom entry
2021-07-07 09:47:32 -04:00
bc11e6a95b
Include pre event count in min estimated ram use
2021-05-08 15:47:29 -04:00
9e6367c7c3
look for 264 instead of x264
2021-05-06 17:33:04 -04:00
b8f0d90000
Put back Estimated Ram Use. Rework it to provide min/max
2021-05-06 10:17:46 -04:00
0adc2d96d6
Revert "remove estimated ram use stuff as it is no longer possible"
...
This reverts commit 2e675a338b
2021-05-06 09:54:06 -04:00
f4bbacb3f4
add VideoWriter and Codec filters so that you can't select an h265 encoder for h264 etc
2021-05-05 16:48:49 -04:00
2e675a338b
remove estimated ram use stuff as it is no longer possible
2021-03-26 14:31:18 -04:00
613ed1faf2
Update estimated ram use when we use the dropdown to change resolution
2021-03-22 12:06:48 -04:00
75e2f526ae
WIP jquery conversion
2021-01-04 13:05:33 -06:00
c37433acfc
show/hide DecodingEnabled depending on function
2020-12-10 16:24:33 -05:00
b12f1cce5b
add Function help text to monitor view
2020-12-10 14:32:17 -05:00
9372b2ef8c
remove debug
2020-10-22 08:53:05 -04:00
a3f4837186
Use config options for tile datam access tokens and turning geolocation on/off
2020-09-24 20:30:57 -04:00
e4bbbce161
fix eslint
2020-09-24 09:13:44 -04:00
624bcdcde0
Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them
2020-09-24 09:01:30 -04:00
70be6bc84c
Add an estimated ram use to buffer tabs
2020-09-22 16:21:59 -04:00
ed6d5a55a5
put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button
2020-09-22 14:33:26 -04:00
990b5bd9dc
monitor view - convert links to buttons
2020-08-28 15:22:57 -05:00
d69b3e7f43
make cancel go back to console
2020-08-28 10:56:09 -05:00
1e78307735
add navigation buttons to monitor view
2020-08-27 16:30:49 -05:00
98f7fb63b9
fix eslint errors
2019-12-31 19:24:51 -06:00
714d304528
Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation
2019-12-31 19:10:29 -05:00
6c39fd133d
fix eslint
2019-09-20 10:44:38 -04:00
b9b52c964e
Upgrade monitor saving and viewing
2019-09-19 14:56:16 -04:00
1bd70319a9
Add a dimensions dropdown to ease entering monitor dimensions
2019-09-19 10:48:25 -04:00
ac8197f2e5
fix eslint errors in monitor.js
2019-05-27 11:25:49 -04:00
e2d56597bf
Don't use an onlick inline js to show the caution text
2019-05-24 12:40:02 -04:00
2eebdb094c
move chosen setup to initPage
2019-05-24 11:54:14 -04:00
a0dbb70af6
filter the form submit on enter to only affect input elements, not textareas
2019-04-26 10:40:11 -04:00
735a996e41
dsiable form submit on enter on the monitor view
2019-04-26 10:26:16 -04:00
e97751558f
eslint fix
2019-03-30 10:41:04 -05:00
ee4b452e42
Update monitor edit to not use inline js
2019-03-25 16:25:09 -04:00
19c272061a
Replace MooTools usage for adding window event listeners ( #2429 )
2019-01-21 11:14:32 -05:00
a1a42345e3
More eslint fixes; eslint in php; add eslint to travis ( #2419 )
...
* Add eslint to travis.yml
* Update eslint package versions and apply new indent rules
* Enable the brace-style and block-style eslint rules
* Enable the 'curly' eslint rule
* Enable the 'keyword-spacing' eslint rule
* Enable the 'key-spacing' eslint rule
* Enable the 'object-curly-spacing' eslint rule
* Enable the 'no-new-object' eslint rule
* Only disable the no-caller eslint rule in the one affected file
* Enable the 'no-unused-vars' eslint rule for local variables
* Add linting of JS in .php files
2019-01-19 10:32:40 -05:00
d1c61a252f
fix whitspace/braces
2017-05-18 13:50:56 -04:00
31a0762d9e
Fixed issues with remote method not being preserved.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2622 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:59:02 +00:00
59ba3d4782
Whitespace
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2620 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 14:04:35 +00:00
8326e0d62e
Fixed js issues with IE
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2571 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 16:20:25 +00:00
bfd67f69fd
Fixed to work properly with MPEG cameras and presets
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2537 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:40:21 +00:00
2824cb7355
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:54:50 +00:00
Isaac Connor
Isaac Connor
Jonathan Bennett
Andrew Bauer
Andrew Bauer
Andrew Bauer
Matt N
stan