Commit Graph

2199 Commits

Author SHA1 Message Date
Isaac Connor 5a45835006 break up long lines 2019-12-20 16:11:10 -05:00
Isaac Connor 23dde04725 remove timeout on changing runstate. 2019-12-20 16:10:30 -05:00
Isaac Connor 3c59be9616 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-12-19 09:24:44 -05:00
Isaac Connor 958a6b8218 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-12-18 19:06:19 -05:00
Isaac Connor 67cc9faa8c remove contentForm id from form in state view which isn't used and conflicts if it is used anywhere else. 2019-12-18 19:05:06 -05:00
Isaac Connor 34354f5871 Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab. 2019-12-18 12:13:00 -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 0bbbbb302e add default for Units in new zone 2019-12-13 11:51:07 -05:00
Isaac Connor 3af6358314 fix & to & 2019-12-02 15:49:49 -05:00
Isaac Connor 72cb5bd1bb add missing </select> 2019-12-02 15:49:42 -05:00
Isaac Connor 09faa0a731 fix & to &amp; 2019-12-02 15:49:32 -05:00
Isaac Connor b686649589 fix &amp; instead of &. 2019-12-02 15:34:31 -05:00
Isaac Connor 8bf74d2f35 fix &amp; instead of &. 2019-12-02 15:34:23 -05:00
Isaac Connor 24022d157d use &amp; instead of &. Put inputs out of table where they belong 2019-12-02 15:33:58 -05:00
Isaac Connor f7e01aa999 switch to material icon for dot 2019-12-02 14:31:05 -05:00
Isaac Connor cf35db120d change to material icons, fix missing div 2019-12-02 14:21:51 -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 09a6e06132 change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already 2019-12-02 13:38:23 -05:00
Isaac Connor 7e92900542 Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code 2019-11-29 13:50:02 -05:00
Isaac Connor 5ebf929598 Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area. 2019-11-26 14:36:39 -05:00
Isaac Connor ab9f99bdbb Fix Width & Height rotation when scaling. Fixes #2760 2019-11-22 12:18:30 -05:00
Isaac Connor 5feeedf7f4 Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor 2019-11-20 09:31:58 -05:00
Isaac Connor ac96a19371 Fix filtering monitors by user's MonitorId restriction 2019-11-19 17:21:01 -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 54c11bc0d1 define monitor_options as an empty array instead of php implicitly dealing with it 2019-11-01 13:42:01 -04:00
Isaac Connor a20517a6db spacing 2019-11-01 13:41:37 -04: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 77118d55b2 add 4CIF aspect ratio padding. Fixes #2738 2019-10-23 09:50:49 -04:00
Isaac Connor 13b02284fe Merge branch 'master' into timezone_as_config 2019-10-18 13:58:22 -04:00
Isaac Connor 524a39a224 changeCodec no longer needs to be passed this 2019-10-18 13:40:29 -04:00
Isaac Connor fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
More filter options
2019-10-16 10:15:58 -04:00
Isaac Connor f25a823bc8 Fix event => zm_event 2019-10-16 08:53:40 -04:00
Isaac Connor 8ee567442e UPdate replay, scale, codec dropdown onchanges 2019-10-15 15:04:14 -04:00
Isaac Connor 1cf034ec5f fix inline js on the back/close button 2019-10-08 18:49:29 -04:00
Isaac Connor 5040d5b075 remove extra ( 2019-10-05 16:56:05 -04:00
Isaac Connor b1496643eb fix js error in onvif probe 2019-10-03 17:31:10 -04:00
Isaac Connor 5384b9345a fix errors on centos 7 with the functions view 2019-10-03 17:30:52 -04:00
Isaac Connor 11fe748154 Sort control capabilities by Name instead of Id 2019-10-03 17:30:31 -04:00
Isaac Connor 17611f2e4b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-02 19:38:21 -04:00
Isaac Connor 769717b571
Merge pull request #2715 from connortechnology/fix_2620
Add delete from logs ajax capability.  Make the clear button use it. …
2019-10-02 16:43:08 -04:00
Isaac Connor 95615fee35 fix eslint 2019-10-02 16:42:50 -04:00
Isaac Connor 6b65e9a60c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-02 16:41:20 -04:00