Commit Graph

17 Commits

Author SHA1 Message Date
Isaac Connor 23dde04725 remove timeout on changing runstate. 2019-12-20 16:10:30 -05:00
Isaac Connor c54fe7e89a fix state actions 2019-02-05 12:35:06 -05:00
Isaac Connor 604dbf8776 fix state changing/etc 2019-01-30 14:36:46 -05:00
Matt N 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
Matt N 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
Isaac Connor 16a731af1c fix path when changing status. 2017-10-02 11:55:17 -04:00
Isaac Connor 4763ace165 Merge branch 'master' into storageareas 2017-05-18 14:24:09 -04:00
Isaac Connor d1c61a252f fix whitspace/braces 2017-05-18 13:50:56 -04:00
Isaac Connor 3ec4e1bfe7 fix merge 2017-05-18 12:59:09 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Matthew Noorenberghe c7955cd1b6 Add eslint configuration files extending Google's rules 2017-03-18 00:02:17 -07:00
Isaac Connor e301eaf6e4 use instead of $ to reference jquery 2016-05-13 11:08:04 -04:00
Kyle Johnson 08fb74c992 Major rewrite of states view. Now a modal on every page.
Read: No longer an HTML popup window.

 * State html is now included toward the bottom of every page
 * The states.js has been rewritten in jquery
 * Applying, deleting or saving a state reloads the page after the POST is done
2016-04-24 00:48:16 -04:00
Pliable Pixels 02a6443c3b Cleaned up button handling 2015-08-26 11:21:29 -04:00
stan 0a9298dbbe Various web bugs fixed
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2651 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-07 09:02:17 +00:00
stan 8af774a98c Fixes and patches.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2641 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 08:41:23 +00:00
stan 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