Commit Graph

3184 Commits

Author SHA1 Message Date
Andrew Bauer 45fde13535 rough in new events view 2020-08-15 15:27:58 -05:00
Andrew Bauer 7225281771 enlarge event thumbs on hover 2020-08-13 12:50:59 -05:00
Andrew Bauer b45c4fac1f tighten up event column spacing 2020-08-13 12:33:13 -05:00
Isaac Connor 6550876a92 fix css so that the background colour of the dropdown divs is set 2020-08-13 12:40:11 -04:00
Isaac Connor c674cb7b55 Move the dropdown id's to the a element where they should be. Remove duplicated id on storage_dropdown. 2020-08-13 12:39:51 -04:00
Isaac Connor 047d69ace7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-13 11:28:00 -04:00
Andrew Bauer c4ee4fb307 split start & end times into sep cols & wrap 2020-08-13 09:24:42 -05:00
Andrew Bauer 27c80cedac
set small screen breakpoint on table-responsive
This gets rid of the ugly horizontal scroll bars on the table on larger screens
2020-08-12 10:10:55 -05:00
Isaac Connor 6cbc54ef87 When storage area has been deleted, say so 2020-08-11 14:11:48 -04:00
Isaac Connor 5f0da93c6e turn off debug 2020-08-11 13:47:48 -04:00
Isaac Connor 303cec92f6 Add globals, fixing timeline view 2020-08-11 13:47:37 -04:00
Isaac Connor 0a7df075ae Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-11 11:41:15 -04:00
Isaac Connor d42424d6d8 Merge branch 'release-1.34' 2020-08-11 11:41:11 -04:00
Isaac Connor 355428e93e direct settings view to the monitor that is actually recording the stream 2020-08-10 21:32:23 -04:00
Isaac Connor e8bf2aa386 Update settings view. Were assigning to a function. More work to be done. 2020-08-10 21:20:23 -04:00
Andrew Bauer 4a31ebe045
Update options.php 2020-08-10 15:48:20 -05:00
Andrew Bauer b5553c968b
expand options to full width 2020-08-10 15:41:25 -05:00
Andrew Bauer 4097693b38
appease the eslint nanny 2020-08-10 13:38:53 -05:00
Andrew Bauer 3fa97f2bc1 reogranize state.php 2020-08-10 13:35:12 -05:00
Isaac Connor bafffdb486 Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message 2020-08-10 12:26:37 -04:00
Isaac Connor 5ee086bbfe Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message 2020-08-10 12:25:44 -04:00
Isaac Connor e64e786c5b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-09 22:20:08 -04:00
Isaac Connor f04e1a0ba7 Apply min=0 to filterX and Y so that we don't get negative values 2020-08-09 22:20:06 -04:00
Isaac Connor ec707acdd1 Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-09 22:19:43 -04:00
Andrew Bauer 42fe024681
Update skin.js 2020-08-09 17:43:39 -05:00
Andrew Bauer 9a03a2c7d4
Update skin.js 2020-08-09 17:43:07 -05:00
Andrew Bauer 15005a2f17
fix typo 2020-08-09 14:25:11 -05:00
Andrew Bauer d0e7443a3c rough in update reminder dropdown 2020-08-09 14:18:44 -05:00
Andrew Bauer b22f12dadb rough in new zmversion widget 2020-08-09 12:20:11 -05:00
Andrew Bauer a6ae4aee01 eslint nanny 2020-08-08 12:26:42 -05:00
Andrew Bauer fd4b9ba4f4 move jquery in functions.php to skin.js 2020-08-08 12:06:57 -05:00
Andrew Bauer b626e0de1c eslint nanny strikes again 2020-08-08 11:19:29 -05:00
Isaac Connor a001c93321 fix zone editing globals and inputs being too big 2020-08-08 11:41:24 -04:00
Andrew Bauer 96bd6397c6 eslint nanny 2020-08-08 10:38:58 -05:00
Isaac Connor 8533ce7018 fix CSP on polygons 2020-08-08 11:38:54 -04:00
Isaac Connor 82357a0675 reapply click function to bandwidth dropdown entries after getNavBar 2020-08-08 11:17:26 -04:00
Andrew Bauer 3792043707 implement bw widget as dropdown 2020-08-08 10:07:26 -05:00
Isaac Connor fc5fabf1c5 fix zone editing globals and inputs being too big 2020-08-06 12:24:51 -04:00
Isaac Connor a19990f4d7 Merge branch 'release-1.34' 2020-08-06 11:57:35 -04:00
Isaac Connor ef2ad12846 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-05 20:00:45 -04:00
Isaac Connor ddeef6f031 Fix globals and a Fatal without ZM\ prefix 2020-08-05 20:00:39 -04:00
Isaac Connor 76e0d155d3 declare globals 2020-08-05 19:15:01 -04:00
Isaac Connor 90671cd4e5 Add missing globals 2020-08-04 18:07:01 -04:00
Isaac Connor 97096d87f9 Add mx-2 classes to be consistent 2020-08-04 18:06:49 -04:00
Isaac Connor 5b8ff10a34 style the storage dropdown better using css. rename it from dropdown01 to dropdown_storage. Put the text-warning class on the a content in the dropdown instead of the dropdown nav-item so that it takes effect. Rename Stor to Storage 2020-08-04 17:53:39 -04:00
Isaac Connor 1ab828c110 Add globals 2020-08-04 17:35:52 -04:00
Isaac Connor dd627d9234 Update cycle monitorlist sidebar to bootstrap4 2020-08-04 17:35:41 -04:00
Isaac Connor ba4d6dff64 Add globals definitions 2020-08-04 17:05:58 -04:00
Isaac Connor 9a06d6cab6 Fix some spacing 2020-08-04 17:05:44 -04:00
Isaac Connor 79c9671ef2 Use & instead of & in urls 2020-08-04 17:05:33 -04:00