Commit Graph

6523 Commits

Author SHA1 Message Date
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 a92a16f13e Merge branch 'update_users_controller' into release-1.34 2020-08-17 19:33:31 -04:00
Isaac Connor 7e679809f2 Merge branch 'update_users_controller' 2020-08-17 19:31:30 -04: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
Isaac Connor ea4edcbc94 Make a global so tht we can use it in export_functions 2020-08-16 20:08:14 -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 7c72e1fa08 fix cookie issue with bootstrap-table 2020-08-16 15:39:20 -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 50a1ceb48a add bootstrap-table.min.css 2020-08-15 15:37:02 -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 4fee59208d Use str_replace and ltrim instead of preg_replace for efficiency 2020-08-13 12:14:18 -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