Commit Graph

3147 Commits

Author SHA1 Message Date
Andrew Bauer b88f0c3991 display user:port@ip when controladdress is empty 2020-07-28 10:08:24 -05:00
Andrew Bauer 45f88ee04a float web console statusBreakdown left then down 2020-07-28 08:59:28 -05:00
Andrew Bauer 85dec6194d when maxmimize, rebuild jqeury chosen fields 2020-07-28 08:38:06 -05:00
Andrew Bauer 47b35e97fb implement minimize chevron for filterbar 2020-07-27 16:14:15 -05:00
Isaac Connor 767f5ebb03 navbar closes the form, and doesn't need to be in the form. 2020-07-27 12:40:46 -04:00
Isaac Connor 5d883d696b give a better error message when submitThisForm fails 2020-07-27 12:40:25 -04:00
Isaac Connor ca07602414 fix html structure when not logged in. Move version class down to where we use it. add parenthesis to quiet php deprecation errors 2020-07-27 12:15:37 -04:00
Andrew Bauer cec5d7ea06 w-100 class not needed 2020-07-27 10:22:23 -05:00
Andrew Bauer ffa3415318 when collapsed, force the menu button to the right 2020-07-27 10:13:02 -05:00
Andrew Bauer bc19ae604a fix alignment of top navbar 2020-07-27 09:18:02 -05:00
Isaac Connor 1e76679820 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-26 22:33:34 -04:00
Isaac Connor 5f9c62f266 spacing and slightly improve nav item code in options 2020-07-26 22:33:29 -04:00
Isaac Connor 003abfea29 Update class so that Submit button is hidden under new bootstrap 2020-07-26 22:32:36 -04:00
Andrew Bauer 941c074a8e add carriage returns to generated html for readability 2020-07-26 10:50:32 -05:00
Andrew Bauer 6486f59383 fix colorization of navbar widgets 2020-07-26 10:41:05 -05:00
Andrew Bauer eaed5abcd3 add missing bootstrap.bundle.js.map 2020-07-25 16:56:17 -05:00
Isaac Connor 3ec7952c31 apply cache_busting to bootstrap, overlay anda reset 2020-07-25 15:05:12 -04:00
Isaac Connor 4af343e833 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-25 14:28:32 -04:00
Isaac Connor e3b339e72e add missing globals 2020-07-25 14:28:26 -04:00
Andrew Bauer c48fa83c6d upgrade to bootstrap 4.5 2020-07-25 13:18:09 -05:00
Andrew Bauer bda7e1a2b7 minor cleanup of getNavBarHTML 2020-07-23 12:52:21 -05:00
Andrew Bauer e9323f96a5 additional cleanup of getNavBarHTML 2020-07-23 10:52:12 -05:00
Isaac Connor 1416bc547e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-22 17:37:52 -04:00
Isaac Connor e746f0babe Use 0 instead of the word auto for scale 2020-07-22 17:28:41 -04:00
Andrew Bauer 062ae675c8 partial cleanup of getNavBarHTML 2020-07-22 13:12:59 -05:00
Isaac Connor 495cd56b8b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-21 14:39:51 -04:00
Isaac Connor 64e4363302 update code populating DeviceChannel, DeviceFormat, CapturePalette 2020-07-21 13:40:04 -04:00
Isaac Connor 855efd57fd
Merge pull request #2977 from roddone/fix_events_table_responsive
make events table (events view) responsive
2020-07-15 10:44:34 -04:00
Romain ODDONE 785ab58a80 make events table (events view) responsive 2020-07-13 11:33:26 +02:00
Andrew Bauer cfd57a851f fix eslint 2020-07-08 20:53:12 -05:00
Isaac Connor 880219bb0f Merge branch 'release-1.34' 2020-07-07 18:58:32 -04:00
Isaac Connor 6469300af5 fix some csp violations
y
2020-07-07 18:57:11 -04:00
Isaac Connor 89f975e646 remove code to play a sound on alarm. Not going to support that when editing a zone. 2020-07-07 16:40:33 -04:00
Isaac Connor 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
Isaac Connor 2db65d3821 Merge branch 'release-1.34' 2020-07-04 09:09:24 -04:00
Isaac Connor 8a35ae2daf Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-07-04 09:04:38 -04:00
Isaac Connor d6d70ab06d Put a list of cameras to cycle through on the left 2020-07-04 09:04:26 -04:00
Isaac Connor ff265d2f17 replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs 2020-07-04 09:00:30 -04:00
Isaac Connor e2a38268a0 replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs 2020-07-04 08:59:41 -04:00
Isaac Connor fd10f545bd if width/height don't evaluate to an integer, set to auto. 2020-07-04 08:58:09 -04:00
Isaac Connor cc0624eb3f Don't allow viewing of monitor setting if monitor permissions are set to View 2020-07-03 19:19:13 -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 343d8d832e handle scale values of '' and 'auto' 2020-07-03 19:18:05 -04:00
Isaac Connor 2026788e7a Turn close link into a button 2020-07-03 19:17:26 -04:00
Isaac Connor 66b155008c Fix scale defaulting to monitor default Scale 2020-07-03 19:17:11 -04:00
Isaac Connor 9f821c74f6 Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor 2020-07-03 19:16:41 -04:00
Isaac Connor 697f117ecd Make width of content 100% instead of 96%. 2020-07-02 17:22:34 -04:00
Isaac Connor 346fe63ef0 Add styles for inputs on monitor view 2020-06-30 19:19:17 -04:00
Isaac Connor 4d8d926c89 minor code updates. Use user_row instead of generic row variable name. 2020-06-23 22:19:46 -04:00
Isaac Connor e778ea0918 Update saving Users. Don't allow restrictions on admin user. Fix CSP violations. 2020-06-23 22:19:04 -04:00