Commit Graph

860 Commits

Author SHA1 Message Date
Isaac Connor dbdb13efd7 Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811 2020-01-20 11:02:43 -05:00
Garrett Scott ead52f30b1 Bug fix: Allows for inital/base install without the option MultiPort config value assigned 2020-01-20 00:44:20 -08:00
Andrew Bauer de5bf21d8a
fix eslint 2020-01-17 15:06:46 -06:00
Isaac Connor d0003215b1 Merge branch 'master' into rate_dropdown 2020-01-17 12:30:35 -05:00
Isaac Connor a398f33e68 fix delTerm button not being enabled because it is a button now, not an input 2020-01-17 09:17:29 -05:00
Isaac Connor 6a43c2deb5 fix zoom_range to zoomout_range 2020-01-16 14:17:40 -05:00
Andrew Bauer f13a7199e1
fix eslint 2020-01-07 21:53:55 -06:00
Isaac Connor c64de372a7 when auth_hash changes, update various CmdParms 2020-01-07 17:08:57 -05:00
Isaac Connor 1c197db619 Merge branch 'master' into rate_dropdown 2020-01-07 14:49:58 -05:00
Isaac Connor 6ac26ec1aa quotes 2020-01-05 17:33:53 -05:00
Isaac Connor 00f8a450de spaces and quotes 2020-01-05 14:59:25 -05:00
Isaac Connor 7fdf6165d5 Fix case in var name 2020-01-03 17:08:11 -05:00
Isaac Connor f572c4092a add checks for Zoom, Focus, White, Iris movement types 2020-01-03 15:58:57 -05:00
Andrew Bauer 98f7fb63b9 fix eslint errors 2019-12-31 19:24:51 -06:00
Isaac Connor 714d304528 Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation 2019-12-31 19:10:29 -05:00
Isaac Connor 42a724891b spacing 2019-12-20 16:11:38 -05:00
Isaac Connor 23dde04725 remove timeout on changing runstate. 2019-12-20 16:10:30 -05:00
Isaac Connor d87bf5a156 replace the rate display with a dropdown 2019-12-20 11:02:12 -05:00
Isaac Connor 3b12b67b4a fix eslint 2019-12-18 10:40:51 -05:00
Isaac Connor 5b7efb2b33 fix mouseover streaming in chrome when adblocker disabled 2019-12-13 17:48:22 -05:00
Isaac Connor 0dbc1ef15c Use multiport when talking monitor stream on montage 2019-12-13 11:51:55 -05:00
Isaac Connor 8e645e45e1 fix selecting Monitors by passing MonitorId as MonitorId[] 2019-12-02 14:21:25 -05:00
Isaac Connor b70b75421b quotes and spacing 2019-12-02 14:18:27 -05:00
Isaac Connor 9d0a416311 remove debugging code 2019-12-02 13:41:42 -05:00
Isaac Connor c9a324b7b3 improve the configureExportButton to look at specific inputs instead of just counting checkboxes 2019-12-02 13:40:02 -05:00
Isaac Connor ab9f99bdbb Fix Width & Height rotation when scaling. Fixes #2760 2019-11-22 12:18:30 -05:00
Isaac Connor 207e5918c8 fix lint, remove debug 2019-11-19 11:37:45 -05:00
Isaac Connor 56618aac32 Handle buttons not existing 2019-11-10 15:49:39 -05:00
Isaac Connor 5b02bc76f4 Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly 2019-11-05 10:07:42 -05:00
Isaac Connor 3653ad5ce3 update group editing, solving inline javascript problems and removing cruft 2019-11-01 13:37:52 -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 524a39a224 changeCodec no longer needs to be passed this 2019-10-18 13:40:29 -04:00
Isaac Connor f25a823bc8 Fix event => zm_event 2019-10-16 08:53:40 -04:00
Isaac Connor b1496643eb fix js error in onvif probe 2019-10-03 17:31:10 -04:00
Isaac Connor 95615fee35 fix eslint 2019-10-02 16:42:50 -04:00
Isaac Connor e4b5052fb4 Add delete from logs ajax capability. Make the clear button use it. Fixes #2620 2019-10-02 15:39:04 -04:00
Andrew Bauer 90b02beb94
fix eslint 2019-09-30 09:52:41 -05:00
Isaac Connor 393f0a369c Revamp timeline. Make it handle being full browser width. remove onclicks. 2019-09-28 14:23:23 -04:00
Isaac Connor e4265bd075 spaces 2019-09-26 16:13:49 -04:00
Isaac Connor 1b653e7e79 Add warnings for when SaveJPEGs and VideoWriter are both set to disabled 2019-09-25 10:14:41 -04:00
Isaac Connor 8d95b2f5f8 Don't select Layout when changing size in montage 2019-09-22 14:22:24 -04:00
Isaac Connor d7810bf9b3 fix eslint 2019-09-20 14:16:37 -04:00
Isaac Connor 6c39fd133d fix eslint 2019-09-20 10:44:38 -04:00
Isaac Connor b05ecd881e add onchange to scale 2019-09-19 14:57:21 -04:00
Isaac Connor 2da9edf0ff add onchange to scale 2019-09-19 14:57:17 -04:00
Isaac Connor b9b52c964e Upgrade monitor saving and viewing 2019-09-19 14:56:16 -04:00
Isaac Connor 1bd70319a9 Add a dimensions dropdown to ease entering monitor dimensions 2019-09-19 10:48:25 -04:00
Isaac Connor b3b7ec660b Add a test for the built-in layouts. Can't edit them. 2019-09-18 11:19:28 -04:00
Isaac Connor 9e8c17dfaf Merge branch 'master' into tolland-remove-extra-px 2019-09-18 11:17:50 -04:00
Isaac Connor d141632256 general clean of onvif probe view. Use buttons instead of inputs and use data-on-change-this instead of inline js. Also rename username and password to Username and Password to not conflict with authentication to ZM ui. 2019-09-11 09:18:03 -04:00
Isaac Connor dfb65d23bf Fix eslint warnings 2019-08-27 16:48:42 -04:00
Isaac Connor d7d2c140a0 Use index to server hosting storage where event is saved to talk to zms 2019-08-27 15:19:18 -04:00
Isaac Connor f01bedb33e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-26 18:49:12 -04:00
Isaac Connor 231c9c3902 move executeFilter to Filter->execute. If no changes have been made, don't make a tempfilter. 2019-08-26 18:48:34 -04:00
Isaac Connor 292b530f99 Allow montage review maxdatetime to be less than minDateTime. This allows us to set it first so that the reload does kill us 2019-08-26 16:20:23 -04:00
Isaac Connor 7768d39eb9 Add auth to streamParms so that multi-server event viewing works 2019-08-26 16:19:44 -04:00
Isaac Connor e707bd8e72 correct getting frame_id so we get images instead of nodata 2019-08-23 17:59:29 -04:00
Isaac Connor 7598654740 add auth hash to ajax streams, and use monitorUrl instead of thisUrl to talk to zms 2019-08-23 17:58:40 -04:00
Isaac Connor ca0b583007 Use material icons for sort because they look nicer 2019-08-19 08:59:15 -04:00
Isaac Connor d4b59211cd Merge branch 'master' into storageareas 2019-08-07 11:21:19 -04:00
Isaac Connor 962049fa31 Merge branch 'master' into filter_add_copy 2019-08-06 20:17:21 -04:00
Isaac Connor 7e6b0058d2 Update Zone buttons. Fix double submit. Fixes #2671 2019-08-02 08:04:38 -04:00
Isaac Connor 8167ff2143 fix eslint 2019-07-26 12:28:02 -04:00
Isaac Connor 547e80b1a9
Fix download and export button from events list. Fixes #2668 (#2670) 2019-07-24 12:31:43 -04:00
Isaac Connor a6a2239e5b
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists (#2662) 2019-07-24 11:39:21 -04:00
Isaac Connor 1a0beab703 add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key 2019-07-24 11:25:38 -04:00
Isaac Connor 0e040fc2fc Add click_autocopy function 2019-07-23 10:00:05 -04:00
Isaac Connor 46f3aabc25 Merge branch 'hwdecode' into storageareas 2019-06-25 15:35:56 -04:00
Tom Hodder 46c19c7efb fix for zone overlay scaling issues in montage (#2643)
* remove extra px in svg tag

* add js method to track liveStream img size for zones

* switch to using SVG scaling to deal with zone polygons

* update jsdoc for eslint

* fix blank lines eslint issue
2019-06-24 11:45:40 -04:00
Isaac Connor d026c61077 Don't allow saving to built in layouts 2019-06-20 13:48:14 -04:00
tolland ffaad88bf0 switch to using SVG scaling to deal with zone polygons 2019-06-20 17:11:22 +00:00
tolland edd52e7fbf add js method to track liveStream img size for zones 2019-06-20 12:46:04 +00:00
Isaac Connor d87f5e3276 Merge branch 'master' into storageareas 2019-06-11 14:39:08 -04:00
Isaac Connor ec7b373913 fix structure of events_by_monitor_id 2019-06-11 14:38:51 -04:00
Isaac Connor 1e7cf8c7cf fix eslint, Fix video not resuming after setting speed to 0. 2019-06-11 14:38:28 -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 1eadb814e2 Fix use of onclick and onchange. Fix bulk frame lookup. Make scanning events more efficient 2019-06-10 15:59:19 -04:00
Isaac Connor dfc60baf85 fix eslint spacing 2019-06-06 13:40:00 -04:00
Isaac Connor 9d6091e271 better fix for #2453. Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS 2019-06-04 10:32:54 -04:00
Isaac Connor 722411475d Fix +/- buttons on new line in filter not having onclick events bound 2019-05-29 09:23:56 -04:00
Isaac Connor ac8197f2e5 fix eslint errors in monitor.js 2019-05-27 11:25:49 -04:00
Isaac Connor e2d56597bf Don't use an onlick inline js to show the caution text 2019-05-24 12:40:02 -04:00
Isaac Connor 2eebdb094c move chosen setup to initPage 2019-05-24 11:54:14 -04:00
Isaac Connor a0dbb70af6 filter the form submit on enter to only affect input elements, not textareas 2019-04-26 10:40:11 -04:00
Isaac Connor 735a996e41 dsiable form submit on enter on the monitor view 2019-04-26 10:26:16 -04:00
Andrew Bauer 50dd63c21d fix eslint 2019-04-08 19:58:18 -05:00
Andrew Bauer 8af96e3c00 fix eslint errors 2019-04-08 18:40:52 -05:00
Isaac Connor 780f4f9b9a Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-04-06 09:27:44 -04:00
Andrew Bauer e97751558f eslint fix 2019-03-30 10:41:04 -05:00
Isaac Connor 90e97ff135 Merge branch 'master' into storageareas 2019-03-28 11:20:29 -04:00
Isaac Connor 49e3f0a68e eslint fixes 2019-03-28 09:43:31 -04:00
Isaac Connor ee4b452e42 Update monitor edit to not use inline js 2019-03-25 16:25:09 -04:00
Isaac Connor 16467595d4 Fix clicking in montage 2019-03-21 17:00:51 -04:00
Isaac Connor d4353af8af Fix eslint errors 2019-03-20 14:51:39 -04:00
Isaac Connor a5366d522d Fixup exporting 2019-03-20 14:29:05 -04:00
Isaac Connor 3f9564c10a Merge branch 'master' into storageareas 2019-03-19 10:37:35 -04:00
Isaac Connor 428f7e8e8f create setup_onclick and disable_onclick in the monitor object. Use it to setup and disable the click event when editing/cancelling layout editing 2019-03-19 10:24:30 -04:00
Isaac Connor 520c41da23 Merge ../ZoneMinder.connortechnology.bad into storageareas 2019-03-18 14:40:03 -04:00
Matthew Noorenberghe ac547e0d5d Don't scroll to the top of the page when force/cancel alarm is clicked 2019-03-10 20:58:24 -07:00
Matthew Noorenberghe e6220e9d07 Fix eslint issues in cycle.js 2019-03-10 20:56:08 -07:00