e491f2ee76
Add id's to dropdowns to fix zone edit behaviour. Remove CSP violations
2020-09-17 20:58:53 -04:00
84bed1b16a
include MonitorStream, fix layout of image stream. Update buttons. start with a static image, MonitorStream will start the streaming
2020-09-02 14:46:45 -04:00
0b493cd85a
add svg circles for the points
2020-08-31 10:15:14 -04:00
04b3f5d294
Merge branch 'master' into improve_zone_editing
2020-08-28 09:43:48 -04:00
f04e1a0ba7
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-09 22:20:06 -04:00
f22f3e9262
use a scaled svg and replace inline js
2020-07-13 14:51:07 -04:00
6469300af5
fix some csp violations
...
y
2020-07-07 18:57:11 -04:00
33d4680f02
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
2020-07-07 16:35:37 -04:00
1860ad188b
Don't allow viewing of zones or zone if Monitor permissions are view
2020-07-03 19:18:36 -04:00
0bbbbb302e
add default for Units in new zone
2019-12-13 11:51:07 -05:00
6ae220f756
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
2019-10-29 18:06:32 -04:00
7e6b0058d2
Update Zone buttons. Fix double submit. Fixes #2671
2019-08-02 08:04:38 -04:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
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
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
99f1e23c5b
Replace usage of PHP_SELF in views/. Fixes #2450
2019-02-09 21:39:19 -08:00
f49dd93b6a
Merge branch 'master' into storageareas
2019-01-16 14:39:56 -05:00
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
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
87140ecdb5
white space and quiet warning
2018-11-17 10:39:42 -05:00
9cf31eafa0
Use a button element instead of an anchor tag for plus and minus point buttons. Cleanup dead code
2018-10-24 12:43:43 -04:00
54949db0b5
spacing/google code style
2017-10-04 10:48:37 -04:00
3db38eb474
limit points to the limits of the monitor
2017-04-19 16:12:12 -04:00
2b9a0f96d3
remove and break over multiple lines
2017-04-05 16:10:06 -04:00
9f99d34807
fix calls to getStreamHTML
2017-03-13 14:22:33 -04:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
8093470a2e
make only the editing polygon have a border. Set default for Type when creating a new zone
2016-08-02 12:19:55 -04:00
b522371080
include polygons for the other zones.
2016-08-02 12:02:07 -04:00
83ac4cd061
change the input handler from onchange to oninput. Disable form submit when hitting enter
2016-06-13 09:40:04 -04:00
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
be5f0cd4a9
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
2016-04-29 10:44:46 -04:00
851a81eff7
Merge pull request #1406 from ZoneMinder/svg_zones
...
replace the static zone image with a stream, and use SVG to draw the zones
2016-04-11 11:14:11 -04:00
39a30ff51b
refresh parent when cancel is clicked
2016-04-10 15:59:13 -05:00
988d611d03
remove unused code
2016-04-09 21:37:00 -05:00
e7d35d16bc
add monitor alarm state and fps to zone edit view
2016-04-09 21:34:30 -05:00
0c8e0ac220
change quotes to prevent php7 complaint
2016-04-09 11:24:59 -04:00
758a0341ce
convert monitor to object
2016-04-08 14:09:59 -04:00
7da6e1e5a1
use stream for image, add SVG polygon
2016-04-08 12:36:09 -04:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
35468af815
Merge pull request #338 from m-bene/extendPreclusive
...
add feature to extend preclusive zone alarm state by x frames
2014-04-08 08:04:37 -05:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
3393a63525
more updates
2013-12-17 12:53:15 -05:00
36c4fad644
remove extra quoets since dbEcape does quoting now
2013-10-17 15:35:23 -04:00
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
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
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
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
Matthew Noorenberghe
Andy Bauer
Isaac Connor
Andrew Bauer
SteveGilvarry
m-bene
stan