Commit Graph

15855 Commits

Author SHA1 Message Date
Isaac Connor 11659249f0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-17 12:56:35 -04:00
Isaac Connor e4425d7565 Merge branch 'master' into filter_pre_post 2020-08-17 12:56:20 -04:00
Andrew Bauer 11afad5c92 add pagination on/off toggle 2020-08-17 11:02:25 -05:00
Isaac Connor 477152a4c4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-17 09:55:16 -04:00
Isaac Connor 87175ccd49 Use ZM_DB_HOST when altering user permissions 2020-08-17 09:55:09 -04:00
Isaac Connor f0fbf77726 Change TMP back to /var/tmp. This is used mostly for exports so it needs to not be ram-based. 2020-08-17 09:51:23 -04: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
Isaac Connor e5dda8d142 Include avutils/imgutils.h to support compile on libav-tools 2020-08-16 14:56:52 -04:00
Andrew Bauer ee31761627 cleanup & consolidate events view buttons 2020-08-16 13:44:18 -05:00
Isaac Connor 77c391fcae Add booleanvalues for operators support 2020-08-16 13:07:42 -04:00
Isaac Connor 77f9f4bffb Add ExistsInFileSystem support in Filters. This also includes limiting operators to IS/IS NOT 2020-08-16 13:07:21 -04:00
Isaac Connor 303154c690 Remove countSQL code that ran the sql query once to get the # of entries returned to be used in pagination. Now that we support POSTSQL Conditions it is no longer useful. Pagination has to happen later. Implement POSTSQLConditions in filtering results. 2020-08-16 13:06:37 -04:00
Isaac Connor d3cc4d589f Remove the parseFilter etc calls from getNavBarHTML code which was used to populate the filter link with the currently viewed events list. I think we can do this better with saving it to the sesssion or similar. 2020-08-16 13:04:42 -04:00
Isaac Connor 344f586f19 Add language entry for ExistsInFileSystem 2020-08-16 13:03:18 -04:00
Isaac Connor d1126b3007 Move term logic from parseFilter to FilterTerm class 2020-08-16 13:02:34 -04:00
Andrew Bauer 9be63f1d99 reorganize and init eventTable 2020-08-16 11:34:37 -05:00
Isaac Connor 82a1670d80 Rough in FilterTerm class, stealing code from functions.php and adapting it. 2020-08-15 17:49:59 -04:00
Isaac Connor 8a170f2841 Remove Debug 2020-08-15 17:49:26 -04:00
Isaac Connor b8433373b5 Rough in Pre and Post SQL Conditions in execute. Rough in ExistsInFileSystem support. Needs more work. 2020-08-15 17:49:11 -04: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 e5046803b0
fix missing eoan docker image 2020-08-13 13:53:51 -05:00
Andrew Bauer 7225281771 enlarge event thumbs on hover 2020-08-13 12:50:59 -05:00
Isaac Connor 49316244a8 Merge branch 'master' into filter_pre_post 2020-08-13 13:46:35 -04: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 ecc87948d0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-13 12:14:29 -04:00
Isaac Connor 4fee59208d Use str_replace and ltrim instead of preg_replace for efficiency 2020-08-13 12:14:18 -04:00
Andrew Bauer 09b12a7dac
Remove extra space in event name 2020-08-13 10:51:10 -05: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