Commit Graph

2749 Commits

Author SHA1 Message Date
Isaac Connor 3cfc1a0a6d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-02 16:45:39 -05:00
Isaac Connor 60d45d967f test for existence of selected checkboxes in post data because if none are selected, the array won't exist 2020-01-02 10:17:07 -05:00
Andrew Bauer 98f7fb63b9 fix eslint errors 2019-12-31 19:24:51 -06:00
Isaac Connor 6a39893c1d include i elements in data-on-click 2019-12-31 19:11:14 -05: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 2c76c12664 Fix export to include files when using DEEP scheme. Also make it more efficient 2019-12-30 22:18:55 -05:00
Isaac Connor 845f35fe00 Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name() 2019-12-26 15:57:25 -05:00
Isaac Connor 1977e48ddd DefaultScale is a member of the Monitor, not the event 2019-12-26 15:21:27 -05:00
Isaac Connor 42a724891b spacing 2019-12-20 16:11:38 -05:00
Isaac Connor 63d20a1514 Move hidden inputs to top of form 2019-12-20 16:11:24 -05:00
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 689956bba7 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-12-13 17:49:00 -05:00
Isaac Connor 5b7efb2b33 fix mouseover streaming in chrome when adblocker disabled 2019-12-13 17:48:22 -05:00
Isaac Connor 18ed90d147 remove second hit to db to load storage areas with no serverid 2019-12-13 17:47:51 -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 ed417a49b4 increase logspopup width to eliminate scrollbars 2019-12-08 11:21:38 -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 9f49e4f367 make Mark column text-align left so that checkboxes line up 2019-12-02 15:07:35 -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 2713565c84 using bootstrap layout instead of a table, so text-align: right 2019-12-02 13:34:53 -05:00
Isaac Connor 80d0d037b5 add a style for inline form not supported by bootstrap 3 2019-12-02 13:34:11 -05:00
Isaac Connor d39193cb6b convert flip to material icons 2019-12-02 12:33:13 -05:00
Isaac Connor caefcc2f7a increase size of export popup 2019-12-02 12:17:33 -05:00
Isaac Connor 03d7bcdd11 better debug logging when on-click-this function isn't defined 2019-12-02 12:17:18 -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