Commit Graph

15841 Commits

Author SHA1 Message Date
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
Isaac Connor dbb2535a6b Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-08-14 13:08:04 -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
Isaac Connor 19fff95079 Remove default from LabelFormat 2020-08-11 17:31:32 -04:00
Isaac Connor ac9432edf4 Older cameras don't have that file. It's ok for it to return a 404. 2020-08-11 15:17:27 -04:00
Isaac Connor bf1c27e20a Add db update to drop default value for LabelFormat. Fixes #2896 2020-08-11 14:14:31 -04:00
Isaac Connor 56fbfa0dd2 Add db update to drop default value for LabelFormat. Fixes #2896 2020-08-11 14:14:16 -04: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 6918461c3e Bump version to 1.34.19 for release 2020-08-11 11:03:20 -04:00
Isaac Connor afae319c94 Fix MOCORD not going into ALARM state. 2020-08-11 11:02:26 -04:00
Isaac Connor 12dbd267bf Add devuan beowulf support 2020-08-11 09:21:48 -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
Isaac Connor 81296bbe31 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-10 17:31:08 -04:00
Isaac Connor c2dfaa1b65 create a distro build dir for devuan beowulf 2020-08-10 17:30:59 -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 63da7f0074 Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent. 2020-08-10 14:02:25 -04:00
Isaac Connor 81b55589db Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent. 2020-08-10 13:59:47 -04:00