Commit Graph

3354 Commits

Author SHA1 Message Date
Andrew Bauer 842efc1574 remove <a> tags from col headers 2020-08-19 12:31:13 -05:00
Andrew Bauer 74b0ad2cb3 get rid of horizontal scrollbar in frames 2020-08-19 12:20:57 -05:00
Andrew Bauer f317bf1722
fix copy/paste typo 2020-08-19 12:07:31 -05:00
Andrew Bauer e38a532b78 rough new frames view 2020-08-19 12:04:08 -05:00
Andrew Bauer ad9b9d91cc disable the back button when new page 2020-08-18 16:57:03 -05:00
Andrew Bauer 3664a9b42c set the pagination list 2020-08-18 15:12:07 -05:00
Andrew Bauer 1e41bd0823 whitespace 2020-08-18 13:48:18 -05:00
Andrew Bauer 6eb7b6d51c set the right toolbar btn class to match 2020-08-18 13:13:32 -05:00
Andrew Bauer df02d84a56 don't go back if not referred 2020-08-18 13:08:17 -05:00
Andrew Bauer 2c9caeb348 whitespace 2020-08-18 12:40:27 -05:00
Isaac Connor 2d5522df14 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-18 13:25:21 -04:00
Isaac Connor c837a17aea Add a warning about missing EndTime term on UpdateDiskSpace 2020-08-18 13:25:18 -04:00
Andrew Bauer bf63500b08 fix thumbnail animation after user event 2020-08-18 12:00:20 -05:00
Isaac Connor e6d6ee1b67 Merge branch 'filter_warnings' 2020-08-18 11:17:46 -04:00
Isaac Connor 16efa9dbb2 Add extra checks for Deleting without an Archived State term and Running in the background without any actions. 2020-08-18 11:17:22 -04:00
Andrew Bauer 1627b1d0d1 privacy view page formatting 2020-08-18 09:08:26 -05:00
Andrew Bauer 287c585d3d use translated text for delete confirmation 2020-08-18 08:26:45 -05:00
Andrew Bauer b32bcab91f add a delete confirmation modal 2020-08-18 08:06:58 -05:00
Isaac Connor 610f73a835 Merge branch 'release-1.34' 2020-08-17 19:30:32 -04:00
Andrew Bauer 1dd0b44334 eslint nanny strikes again 2020-08-17 16:59:57 -05:00
Andrew Bauer 80b92573b8 set the icons used in bstable toolbar 2020-08-17 16:18:18 -05:00
Andrew Bauer 3e5bfc445f fix checkbox column disappearing 2020-08-17 12:10:35 -05:00
Andrew Bauer 11afad5c92 add pagination on/off toggle 2020-08-17 11:02:25 -05:00
Andrew Bauer 9bc1b6a34e change icon color on hover 2020-08-17 08:37:03 -05:00
Andrew Bauer e19d1f507e fix bootstrap-table-cookie correctly 2020-08-17 08:05:50 -05:00
Andrew Bauer 7fed6f9c29 shift thumbnail animation away from edge 2020-08-16 21:08:07 -05:00
Isaac Connor 1a6154752a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-16 20:08:49 -04:00
Isaac Connor a8455d4ecf Add necessary globals 2020-08-16 20:08:42 -04:00
Isaac Connor 2021f561fa Import as a global 2020-08-16 20:08:26 -04:00
Andrew Bauer de0a4a18ee fix checkbox column 2020-08-16 18:00:11 -05:00
Andrew Bauer 5468c0322e appease the eslint nanny 2020-08-16 16:30:35 -05:00
Andrew Bauer 0cbf559821 only hide cols if cookie not exist 2020-08-16 16:02:43 -05:00
Andrew Bauer 33ea9de8cf better spacing archived & emailed tinytext 2020-08-16 15:19:08 -05:00
Andrew Bauer f27f6e6394 fix archive buttons, remove asterisk from event name 2020-08-16 14:46:56 -05:00
Andrew Bauer 94d666b296 tiny text under event name, add emailed column 2020-08-16 14:41:50 -05:00
Andrew Bauer ee31761627 cleanup & consolidate events view buttons 2020-08-16 13:44:18 -05:00
Andrew Bauer 9be63f1d99 reorganize and init eventTable 2020-08-16 11:34:37 -05:00
Andrew Bauer 93475bef7e eslint nanny 2020-08-15 16:08:53 -05:00
Andrew Bauer 252bf7995a eslint nannt 2020-08-15 15:54:58 -05:00
Andrew Bauer 1c558b66e7 add font-awesome stylesheet 2020-08-15 15:44:54 -05:00
Andrew Bauer 45fde13535 rough in new events view 2020-08-15 15:27:58 -05:00
Isaac Connor c87886f5a5 Fix v4l2 channel and palette dropdowns allowing the saving of local monitors. 2020-08-15 12:31:30 -04: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 &amp; instead of & in urls 2020-08-04 17:05:33 -04:00
Isaac Connor c0f21ab55d Fix globals 2020-08-04 16:36:24 -04:00
Isaac Connor 82542c569c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-04 10:47:41 -04:00
Isaac Connor 6e9559df53 Put xhtmlHeaders in an ob_start ob_get_clean section so that calls to open session in view js php files don't cause a problem. Basically delay output. Fixes problems with logging in redirect. Also need to global cspNonce since we use it. 2020-08-04 10:47:37 -04:00
Andrew Bauer a575b16278
set a target to about menu items 2020-08-03 15:45:27 -05:00
Andrew Bauer 9d88f8ee73 implement zm about menu 2020-08-03 15:22:46 -05:00
Andrew Bauer ab9a135759
fix inability to stop zm from the web console 2020-08-03 12:10:34 -05:00
Isaac Connor 283d8557e6 remove the extra(globals). There are a LOT of globals. WE don't seem to actually use any in this function. 2020-08-03 12:50:36 -04:00
Andrew Bauer a3e6fe5522 make the eslint nanny happy 2020-08-03 11:47:31 -05:00
Andrew Bauer ce810320a2
bump right margin on storage widget 2020-08-03 11:02:30 -05:00