ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,549 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

40 Commits

Author SHA1 Message Date
Isaac Connor 8872b8be63 spacing 2021-11-12 15:11:48 -05:00
Andrew Bauer 4756a03b16 show alarm state and fps on zones view 2021-01-06 14:27:06 -06:00
Andrew Bauer 2b0badfebe add back and refresh buttons to zones 2020-09-25 13:44:55 -05:00
Andrew Bauer c73dbc480f unpopup the svg ploygon in zones 2020-09-25 12:34:04 -05:00
Andrew Bauer ae9139b00c unpopup zone view 2020-09-25 10:52:13 -05:00
Andrew Bauer 1ac5572d59 unpopup the zones view 2020-09-25 07:56:09 -05:00
Isaac Connor aa4e9600eb Update to use MonitorStream 2020-09-02 17:36:01 -04:00
Isaac Connor ab116a1a6f use xhtmlFooter as it now contains the javascript instead of xhtmlHeader 2020-09-02 14:47:00 -04:00
Isaac Connor 3d5ad4902a zones can now list multiple monitors 2020-08-31 10:14:53 -04:00
Isaac Connor f22f3e9262 use a scaled svg and replace inline js 2020-07-13 14:51:07 -04:00
Isaac Connor 1860ad188b Don't allow viewing of zones or zone if Monitor permissions are view 2020-07-03 19:18:36 -04:00
Isaac Connor 6ae220f756 improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript 2019-10-29 18:06:32 -04:00
Isaac Connor 627e9f74cf fix spacing 2019-02-25 15:24:25 -05:00
Isaac Connor cbd8ee80f8 add namespace for Monitor 2019-02-24 12:40:40 -05:00
Matthew Noorenberghe 99f1e23c5b Replace usage of PHP_SELF in views/. Fixes #2450 2019-02-09 21:39:19 -08:00
Matthew Noorenberghe a3e8fd4fd5 Fix zones.php self-xss. Fixes #2444 2019-01-24 23:40:41 -08: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
Matt N 083f284599 Replace onclick inline event handlers for createPopup (#2410) 
* Move <script> before </body>

* Change makePopupLink to not use onclick

* Change makePopupButton to not use onclick

* Use .popup-link in control_functions.php

* Use makePopupButton in controlcaps.php

* Prevent double-encoding in makePopup*

* Use makePopupButton in devices.php

* Use makePopupButton in logout.php

* Use makePopupLink in monitor.php

* Use makePopupLink and .popup-link in montage.php

* Use makePopupButton in options.php

* Use makePopupButton, makePopupLink, and .popup-link in zones.php
 2019-01-15 09:01:58 -05:00
Isaac Connor 54949db0b5 spacing/google code style 2017-10-04 10:48:37 -04:00
Isaac Connor 3db38eb474 limit points to the limits of the monitor 2017-04-19 16:12:12 -04:00
Isaac Connor 4fc0aead70 wip 2017-03-01 15:26:40 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 89f58daf89 Merge branch 'master' into fix_zone_edit 2016-05-24 15:30:56 -04:00
Andy Bauer e5bf2d245c quit the stream in zones.php when zone.php is called 2016-04-10 15:33:55 -05:00
Isaac Connor 6d27a857aa put a zones class on the svg 2016-04-08 14:38:50 -04:00
Isaac Connor c73e768f1f put in the onclick for the zone to open the edit page 2016-04-08 14:25:19 -04:00
Isaac Connor b10c6ee093 fix Monitor capitalisation 2016-04-08 14:23:44 -04:00
Isaac Connor 0ce85137dc remove points. Don't need them here 2016-04-08 13:39:31 -04:00
Isaac Connor 45d58c3ad6 convert points to circles, because squares are not centered on the point.. but a circle is 2016-04-08 11:17:16 -04:00
Isaac Connor 79552e5393 use new getStreamHTML 2016-04-08 11:11:09 -04:00
Isaac Connor 3be3a3ada2 convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones 2016-04-08 10:46:51 -04:00
Andrew Bauer 3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
Isaac Connor 2d0f4dffd1 Fix a missing NULL second paramter to dbFetchAll 2013-11-03 16:06:31 -05:00
Isaac Connor 93560652f1 make sortorder be asc or desc, not something arbitrary which needs to be escaped 
other fixes to use parameter passing to PDO instead of escaping them ourselves
 2013-11-01 12:30:07 -04:00
stan 1fad2d7ec9 Changed query separator to &amp; and miscellaneous html fixes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-16 17:09:16 +00:00
stan ef8f7b85fd Continuing development and bugfixes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-26 09:47:20 +00:00
stan ba788cc001 Fixed issues with creation, editing and deletion of monitors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2626 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 16:43:34 +00:00
stan 106882c161 Updated copyright notices 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:48:16 +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