Commit Graph

83 Commits

Author SHA1 Message Date
Andrew Bauer 70689acf8d remove data-mobile-responsive, use table-responsive-sm instead 2020-12-02 07:47:57 -06:00
Andrew Bauer 93f11bbc82 set responsive breakpoint for small screens on watch & events views 2020-12-01 09:50:32 -06:00
Andrew Bauer 8d8054bc0f deploy bstable to watch view 2020-11-26 17:00:05 -06:00
Andrew Bauer 1ed160866b add legacy watch view alarm buttons to toolbar 2020-10-16 15:47:42 -05:00
Andrew Bauer f98a885ed5 update the watch view header 2020-10-16 08:08:23 -05:00
Andrew Bauer 1643fb686b convert settings popup to modal 2020-10-03 16:51:25 -05:00
Isaac Connor 1659bb2116 Add id to scale dropdown 2020-09-06 12:12:26 -04:00
Isaac Connor b0eacba0ee use xhtmlFooter 2020-09-02 18:14:45 -04:00
Isaac Connor 04b3f5d294 Merge branch 'master' into improve_zone_editing 2020-08-28 09:43:48 -04:00
Isaac Connor b5ef7b08b9 settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth. 2020-08-25 12:40:22 -04:00
Isaac Connor f22f3e9262 use a scaled svg and replace inline js 2020-07-13 14:51:07 -04:00
Isaac Connor 8195223a86 merge some php 2020-05-08 17:54:51 -04:00
Isaac Connor 0085e3d34f Don't warn about image for WebSite Monitors 2020-05-01 18:15:19 -04:00
Isaac Connor 1bd340d602 spacing in watch.php 2020-05-01 13:30:00 -04:00
Isaac Connor daa08e8740 Always just default to scale from monitor 2020-05-01 13:03:17 -04:00
Isaac Connor 775b0d1ccd fix XSS in monitor Name 2020-04-23 18:16:38 -04:00
Isaac Connor 1cf034ec5f fix inline js on the back/close button 2019-10-08 18:49:29 -04:00
Isaac Connor fdaee75310 Use material icons for buttons. Hide the stop button because it does nothing. 2019-09-26 16:26:18 -04:00
Isaac Connor b936fbac6a Don't import Monitor.php unless we need to 2019-09-25 10:16:16 -04:00
Isaac Connor 2da9edf0ff add onchange to scale 2019-09-19 14:57:17 -04:00
Isaac Connor b84e3499f4 Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message 2019-07-07 17:25:49 -04:00
Isaac Connor 268bc2264b Merge branch 'storageareas' 2019-07-02 10:19:03 -04:00
Isaac Connor 1161c251fc Add a warning when the monitor is not capturing in live view 2019-06-28 10:28:53 -04:00
Isaac Connor 1241761683 Add a title popup telling people about the zoomin/out/pan functions. Add ctrl-click to zoomout 2019-06-11 10:58:54 -04:00
Isaac Connor fd310c0f0a Merge branch 'master' into storageareas 2019-02-22 11:33:47 -05:00
Isaac Connor 8dd8888975
Php namespace (#2537)
* experiment with namespaces on the Server class

* experiment with namespaces on the Server class

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects

* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
Isaac Connor 533d021dea Merge branch 'master' into storageareas 2019-01-30 15:17:27 -05:00
Isaac Connor 7ea8be3fa8 spacing, remove non html5 elements 2019-01-25 09:22:08 -05:00
Isaac Connor f49dd93b6a Merge branch 'master' into storageareas 2019-01-16 14:39:56 -05:00
Matt N d33fec9c3f Add a CSP script-src policy with nonce-source and convert more inline event handlers (#2413)
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy

* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'

Only handle ones that don't return a value.

* Use @data-on-click to attach inline click event handlers with no args and no return value

* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument

* Enforce a script-src CSP on views without inline JS

* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
Isaac Connor 7d90a56561 Merge branch 'master' into storageareas 2018-11-30 14:46:42 -05:00
Isaac Connor 5e0d742e26 Use history.go(-1) which works on safari 2018-11-29 14:04:35 -05:00
Isaac Connor 328b804465 spacing and quotes 2018-09-14 16:20:00 -04:00
Isaac Connor ba8dc2059d spacing 2018-07-09 12:33:21 -04:00
Isaac Connor d271d8bf1d Fix my botched change to generateAuthHash 2018-06-25 14:50:54 -04:00
Andrew Bauer 86b2f6a12e New Monitor Type - Website (#2065)
* implement website monitor

* don't check certain fields when using website monitor

* continue to fix javascript errors for website monitors

* check $monitor, not $new_monitor here

* add website monitor documentation

was somehow left out of the initial commit

* fix corruption of functions.php

* add missing comma

* remove errors by testing for existence of key.  If it's a new monitor, then none of the keys will be valid

* If the monitor type is WebSite, then default Status to Running.

* put back start function that got lost in merge.  Don't start StreamCmd's if it's a WebSite

* Add midding comma

* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite

* Don't show control or any of the status fields for WebSite type monitors

* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor 61249ccf2a Show pause/play/stop when no stream buffer 2018-04-18 12:30:18 -04:00
Isaac Connor d621222ead fix assignment when should be test 2017-12-05 13:26:21 -08:00
digital-gnome 6edb0247ef Fix popup detection 2017-12-05 13:27:39 -05:00
digital-gnome 34b708bace Handle popups that should remain popups 2017-12-05 09:40:03 -05:00
digital-gnome 66d6e1a4a4 Add header to watch 2017-12-02 12:28:06 -05:00
digital-gnome f02cd2e615 Remove watch popup 2017-12-02 12:28:04 -05:00
Isaac Connor eb2ee76f57 disable and re-enabled onclick action when editing layout/cancelling edit 2017-11-01 13:08:01 -04:00
Isaac Connor 6d46b36c80 Hide close button if not in a popup 2017-08-01 14:21:50 -04:00
Isaac Connor f4008e2c6a Merge branch 'master' into storageareas 2017-05-19 11:20:33 -04:00
Isaac Connor 94f7194e4f Update frmo SA. Use Monitor object, still hide Controls by default. 2017-05-18 21:48:21 -04:00
Isaac Connor 9f99d34807 fix calls to getStreamHTML 2017-03-13 14:22:33 -04:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 6c3a3d3d50 store the scale value for watch and event views in a cookie, differentiated by monitorId. 2016-09-27 09:46:04 -04:00