284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
3c79204592
replace mootools in add_monitors
2020-12-23 08:54:11 -06:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
d77b55d1d6
replace popup code in add_monitor
2020-09-30 10:40:13 -05:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05: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
deaf651aad
Fix eslint violations ( #2416 )
...
* Add more JS libraries to eslintignore
* eslint . --fix
Automatic fixes only
* frame.js: eslint fixes
* events.js: manual eslint fixes
* skin.js: manual eslint fixes
* watch.js: manual eslint fixes
* Remove some tabs used for indentation in JS
* state.js: Fix new-cap eslint violation
* Disable guard-for-in eslint rule to get everything passing
2019-01-18 10:00:55 -05:00
a82e17ff4b
Merge branch 'storageareas' into zma_to_thread
2018-02-12 17:16:33 -05:00
cb9eef8563
show No streams found if none were found
2018-02-09 07:30:12 -08:00
67b365948e
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
2018-01-29 15:53:26 -05:00
984d3a2dd1
add Monitor Name to the response listing the available camera feeds
2018-01-29 07:30:46 -08:00
1e3cf9bbf8
handle no streams better
2018-01-25 09:14:21 -08:00
778942b928
improve add_monitors
2017-11-16 17:39:48 -08:00
c16e101120
rough in add monitors import wizard
2017-10-27 20:52:08 -07:00
Isaac Connor
Andrew Bauer
Isaac Connor
Matt N
Isaac Connor
Isaac Connor