Commit Graph

7153 Commits

Author SHA1 Message Date
Isaac Connor 8f3b3466af setup onblur function for presetSelector 2020-09-17 20:58:18 -04:00
Isaac Connor 29880cdab3 handle width options['width'] and options['height'] aren't set 2020-09-17 20:57:14 -04:00
Isaac Connor 006cc079c4 Rework action to use Zone class and just take a list of Zid's so that technically we can delete zones from multiple monitors at once. 2020-09-17 20:56:56 -04:00
Isaac Connor 1701089211 Add MonitorId to Zone fields and add Monitor() method 2020-09-17 20:56:21 -04:00
Isaac Connor 42dc4e46b1 add canEdit method to Monitor object 2020-09-17 20:56:04 -04:00
Isaac Connor f61a21fec4 Add modals dir with filterdebug modal 2020-09-17 15:17:53 -04:00
Isaac Connor 6aa4302fe0 Add EventDiskSpace as a term and add a Debug modal button 2020-09-17 15:17:29 -04:00
Isaac Connor bb4bd935d6 use getBodyTopHTML as it include an error message div. Show db errors with the error message 2020-09-17 15:17:06 -04:00
Isaac Connor 6a77591237 Add lang for Event DiskSpace and FileSystem ISKSpace 2020-09-17 15:15:28 -04:00
Isaac Connor 4a6743be3f turn off debug 2020-09-17 15:15:13 -04:00
Isaac Connor 123b2a4747 Change Event Diskspace case to not interfere with Filesystem DiskSpace 2020-09-17 15:14:54 -04:00
Isaac Connor 1caaf01502 Add code to the default case to include a file in ajax/modals/.php so that the modals template can be kept out of functions.php. We don't need the auth stuff. Also turn off error reporting as we should only return json. 2020-09-17 15:14:09 -04:00
Isaac Connor ef8fb774df Handle no data in setNavBar 2020-09-17 13:51:31 -04:00
Andrew Bauer b64bd97a64 whitespace 2020-09-16 18:22:37 -05:00
Andrew Bauer c8c3b75e33
Reload the page after table refresh
This wasn't needed on my machine, but might be on others
2020-09-16 18:21:06 -05:00
Isaac Connor 6b2773ad8c Handle invalid eid more gracefully. 2020-09-16 14:21:03 -04:00
Isaac Connor 9268db14a7 Fix xss reported by Noccolo Picca relating to not sanitizing connkey 2020-09-16 14:14:31 -04:00
Isaac Connor 147238027c Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-16 09:59:28 -04:00
Isaac Connor bea23e2241 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-16 09:58:49 -04:00
Isaac Connor c1f872c9aa Reinit chosen on log filters after updating them 2020-09-16 09:58:15 -04:00
Andrew Bauer e5cf74c3d8 remove unused and potentially conflicting id's 2020-09-16 08:54:13 -05:00
Andrew Bauer afdd4702a2 add server modal 2020-09-16 08:30:45 -05:00
Isaac Connor 4fa9237048 Fix eslint 2020-09-16 08:57:44 -04:00
Isaac Connor a430fe1f7a correct EndTime to End Date/Time. EndTime and EndDate terms are also effective 2020-09-15 21:19:10 -04:00
Isaac Connor 32f60631b3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-15 18:53:42 -04:00
Isaac Connor 81306928b8 Fix scale width and height dropdown actions on cycle 2020-09-15 18:53:39 -04:00
Andrew Bauer 21d4773da9 fix badly formatted line 2020-09-15 13:08:44 -05:00
Andrew Bauer da73ecee08 delete commented line 2020-09-15 13:05:05 -05:00
Andrew Bauer 5f361094bb unpopup frames and alarmframes in export view 2020-09-15 13:01:35 -05:00
Andrew Bauer 40eb60f644 unpopup monitor config from export view 2020-09-15 12:52:13 -05:00
Andrew Bauer fd7d5317af create getCSRFinputHTML function 2020-09-15 11:06:16 -05:00
Andrew Bauer 798557604f
remove old pagination var from events.php 2020-09-15 10:58:42 -05:00
Andrew Bauer 845815b566 unpopup call to image view 2020-09-15 10:51:45 -05:00
Andrew Bauer be150479a1 unpopup Max Score link in events view 2020-09-15 10:37:05 -05:00
Andrew Bauer df443326ea unpopup monitor link in events view 2020-09-15 10:31:14 -05:00
Andrew Bauer b9d95f0833 fix typo 2020-09-15 09:50:53 -05:00
Andrew Bauer 33ef700dda Cause links in events use eventdetail modal 2020-09-15 09:49:03 -05:00
Isaac Connor d39beb5714 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-15 10:22:36 -04:00
Andrew Bauer accfd1191f update eventdetail modal 2020-09-15 09:20:38 -05:00
Isaac Connor fa1ade6b7b Fix obr getting cbr value 2020-09-15 10:11:07 -04:00
Isaac Connor 9e12090348 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-09-15 10:00:24 -04:00
Andrew Bauer 121671327c call eventdetail modal rather than popup 2020-09-15 08:55:32 -05:00
Andrew Bauer 1d3ce1c916
must define sortQuery as a global in export view 2020-09-15 08:27:44 -05:00
Isaac Connor ad0f8d674d sort_asc is a boolean. ZM_WEB_EVENT_SORT_ORDER is asc|desc 2020-09-14 15:13:41 -04:00
Andrew Bauer ba900dd9dc change table type to increase row padding 2020-09-14 14:07:49 -05:00
Andrew Bauer 508967ffe9 fix typo on modal.php 2020-09-14 13:51:24 -05:00
Andrew Bauer fb85d6f79c rough in eventdetail modal 2020-09-14 13:47:09 -05:00
Isaac Connor 691be74304 fix th text-align on tables in options 2020-09-14 14:09:41 -04:00
Isaac Connor ab8e2d2e6c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-14 14:05:02 -04:00
Isaac Connor 77fb533e48 Fix default value for AutoExecuteCmd 2020-09-14 14:04:36 -04:00
Isaac Connor d02a61e715 change will to might 2020-09-14 14:03:55 -04:00
Andrew Bauer cc7b65e8aa eslint 2020-09-14 10:31:44 -05:00
Andrew Bauer d2bc39f65f replace storage popup with modal 2020-09-14 09:50:04 -05:00
Pliable Pixels 8ad62b8905 another try at fixing Eventcontroller 2020-09-13 16:43:49 -04:00
Andrew Bauer 0a0b555c4c refresh table after archive or unarchive 2020-09-13 11:32:28 -05:00
Andrew Bauer 29710f67ac fix table refresh after delete 2020-09-13 11:25:31 -05:00
Andrew Bauer c4c4551436 replace no permission alerts with enoperm() 2020-09-13 11:09:15 -05:00
Andrew Bauer 54e8d1352a add enoperm js function 2020-09-13 11:04:04 -05:00
Andrew Bauer 096f4a446f Use Ajax to load delete confirm modal 2020-09-13 10:39:51 -05:00
Andrew Bauer 7e55dd14a2 eslint 2020-09-13 08:52:52 -05:00
Andrew Bauer 951afc669f eslint 2020-09-13 08:33:47 -05:00
Andrew Bauer 1599bc4c14 load stats on deman via ajax 2020-09-13 07:32:49 -05:00
Andrew Bauer 56aa906dd8 call getStatsTableHTML in frames view 2020-09-12 11:55:24 -05:00
Andrew Bauer 5d914d8b01 convert stats table to a function 2020-09-12 11:53:53 -05:00
Andrew Bauer f31b3bfc59 add xhtmlFooter to stats view 2020-09-12 11:48:33 -05:00
Andrew Bauer 0ad41fc8d4 rough in error no permisson modal 2020-09-12 08:37:57 -05:00
Andrew Bauer 547e1d6cc4 rough in error no permisson modal 2020-09-12 08:36:19 -05:00
Andrew Bauer 0557d847f0 fix ajax archive/unarchive 2020-09-11 17:01:56 -05:00
Andrew Bauer 0c8bb25889 eslint 2020-09-11 16:49:36 -05:00
Andrew Bauer 2ee70442c0 use done() and fail() callbacks for getJSON 2020-09-11 14:30:36 -05:00
Andrew Bauer 26cefda712 deploy optionhelp to option view 2020-09-11 13:23:14 -05:00
Andrew Bauer d2b2291721 deploy optionhelp to monitor view 2020-09-11 13:10:18 -05:00
Andrew Bauer aa6bf31cbd pass OLANG as a function parm 2020-09-11 07:51:00 -05:00
Andrew Bauer 4f94c63102 pass OLANG as a function parm 2020-09-11 07:50:03 -05:00
Isaac Connor 3fb62b7904 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-10 19:26:23 -04:00
Andrew Bauer 25df968f10 remove erroneous file 2020-09-10 17:29:59 -05:00
Andrew Bauer da46ab0882 eslint nanny strikes again 2020-09-10 17:11:31 -05:00
Isaac Connor 3b7bde755e
Merge pull request #3041 from mnoorenberghe/unsafe_inline_backcompat
Drop support for CSP 1 browsers (with no nonce-* support)
2020-09-10 18:09:44 -04:00
Andrew Bauer 46d4f55b80 add makeHelpLink helper function 2020-09-10 17:06:27 -05:00
Andrew Bauer cd09ec8fef rough in Modal Ajax framework 2020-09-10 16:56:58 -05:00
Matthew Noorenberghe f031ce9934 Drop support for CSP 1 browsers (with no nonce-* support)
This gets rid of console spew in modern browsers.
2020-09-10 16:25:43 -04:00
Matthew Noorenberghe 46e69f8c27 Show correct enabled/disabled status in the function dialog
monitor.Enabled is a string and 0 is truthy in JS
2020-09-10 15:12:31 -04:00
Isaac Connor 2cd9c8e232 Update api Zone Saving. Fixes #3037 2020-09-10 13:32:15 -04:00
Isaac Connor 7dbbb24db4 Update api Zone Saving. Fixes #3037 2020-09-10 13:31:39 -04:00
Isaac Connor 2e5a897355
Merge pull request #3038 from mnoorenberghe/fix_function_save
Fix saving function changes
2020-09-10 11:52:38 -04:00
Isaac Connor e37c5ac385 Use FrameId instead of FramesId 2020-09-10 11:10:19 -04:00
Isaac Connor 4dc00ebe09 spacing, only add extra sort by Id column if we aren't already sorting by Id 2020-09-10 11:05:22 -04:00
Isaac Connor 1f837c1718 Hide eventId not FrameId 2020-09-10 11:04:18 -04:00
Matthew Noorenberghe f046b565c6 Fix saving function changes
Wait for the request to complete before reloading.
2020-09-10 11:01:44 -04:00
Isaac Connor 013e007141 run parseRows on init so that datetime fields get their popups etc 2020-09-09 15:40:44 -04:00
Isaac Connor b34c6dcfc2 correct log, code docs 2020-09-07 13:29:36 -04:00
Isaac Connor 74dc8af76f add global 2020-09-07 13:29:21 -04:00
Isaac Connor fc06b440ad remove debug 2020-09-07 13:28:55 -04:00
Isaac Connor 1659bb2116 Add id to scale dropdown 2020-09-06 12:12:26 -04:00
Isaac Connor 034bee9bb2 fix errors due to selects no longer having an id by default 2020-09-05 17:33:17 -04:00
Isaac Connor c5e4a964cd quotes, spacing fix some functions that clearly no one uses 2020-09-05 12:49:14 -04:00
Isaac Connor 23505159da put scale code together with itself. Get rid of unneeded generateConnKey 2020-09-05 12:23:00 -04:00
Isaac Connor d1dc3d6864 remove Error debug 2020-09-05 09:45:44 -04:00
Isaac Connor b3b6445d60 Fix application of scales to montage streams 2020-09-05 09:15:33 -04:00
Isaac Connor bf895f8f12 Make Zones a link to view/edit all zones 2020-09-05 09:15:09 -04:00
Isaac Connor 778fdb9ab0 fix lack of id's on width,height,scale dropdowns making their selection break 2020-09-05 08:56:00 -04:00
Isaac Connor 7e6fbe1ab4 Fix ControlTypes dropdown. 2020-09-05 08:46:18 -04:00
Isaac Connor 62f78bfeb7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-04 14:58:48 -04:00
Isaac Connor ae56a1f363 Turn off output buffering in view_video 2020-09-04 14:58:43 -04:00
Matthew Noorenberghe bd829f8aa1 Specify a function name for data-on-click to fix the Back/Close button for Events. Fixes #3033 2020-09-04 10:25:05 -04:00
Matthew Noorenberghe 77cca7efac eslint --fix 2020-09-04 10:02:43 -04:00
Isaac Connor 46790bf401 Add monitor json data 2020-09-03 18:25:00 -04:00
Isaac Connor 1f810c8947 Populate the function modal from the javascript monitors array before viewing. 2020-09-03 18:24:45 -04:00
Isaac Connor 1e4d80ee7b Make the function modal monitor-agnostic . It will get populated before being made visisble 2020-09-03 18:24:09 -04:00
Isaac Connor ea5d19412c Only include the function modal once at the end as it will get populated with data before being made visible 2020-09-03 18:23:26 -04:00
Isaac Connor 240f4ceabd Fix code warning if no value is selected in htmlSelect 2020-09-03 18:21:38 -04:00
Isaac Connor 47971bb8f5 Update function action to use Monitor object 2020-09-03 18:21:08 -04:00
Isaac Connor 6f5acece66 FIx Record Entry 2020-09-03 18:20:51 -04:00
Isaac Connor 98874cb6d1 provide error message when trying to delete Archived events. 2020-09-03 17:04:52 -04:00
Isaac Connor c934dee233 Do not allow the deleting of Archived Events 2020-09-03 17:02:48 -04:00
Isaac Connor 94c7708df5 Warn when the specified selected value isn't in the passed options. Don't default to adding id in htmlSelect. Shouldbe passed in behaviours 2020-09-03 10:42:33 -04:00
Isaac Connor fb9129a4d3 Add missing Mocord option 2020-09-03 10:40:10 -04:00
Isaac Connor d4d0a971d1 get rid of errant fo 2020-09-03 10:19:59 -04:00
Isaac Connor dd5e342196 use xhtmlFooter 2020-09-02 18:17:12 -04:00
Isaac Connor b0eacba0ee use xhtmlFooter 2020-09-02 18:14:45 -04:00
Isaac Connor 22a40edd71 spacing 2020-09-02 18:12:35 -04:00
Isaac Connor 6abad06db2 increase width of frames view 2020-09-02 18:12:26 -04:00
Isaac Connor 70b73048cc add csrf checks to frames view 2020-09-02 18:11:53 -04:00
Isaac Connor 18671b7c19 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:57:32 -04:00
Isaac Connor 69bee20ef5 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:56:30 -04:00
Isaac Connor 5b53289fee fix html structure 2020-09-02 17:55:34 -04:00
Isaac Connor 7623733840 use xhtmlFooter and fix spacing 2020-09-02 17:55:23 -04:00
Isaac Connor b1d4115df8 Handle case where IN operator is used with 1 value 2020-09-02 17:55:06 -04:00
Isaac Connor aa4e9600eb Update to use MonitorStream 2020-09-02 17:36:01 -04:00
Isaac Connor e25708ce99 use getBodyTopHTML and xhtmlFooter 2020-09-02 17:35:46 -04:00
Isaac Connor fa780c5020 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:35:24 -04:00
Isaac Connor f38692795e use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:35:13 -04:00
Isaac Connor cf1f408e96 Don't need pauseString and playStream anymore 2020-09-02 17:34:09 -04:00
Isaac Connor c6bc6704b3 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:33:56 -04:00
Isaac Connor bc710bc826 use xhtmlFooter instead of html since it now contains all the javascript 2020-09-02 17:33:09 -04:00
Isaac Connor a6ad57b393 fix html validation errors 2020-09-02 17:32:24 -04:00
Isaac Connor c2760ef768 add needed js stuff for streaming 2020-09-02 17:28:08 -04:00
Isaac Connor d243d798ff add needed js stuff for streaming 2020-09-02 17:27:59 -04:00
Isaac Connor 5b0123e710 Not necessary to specify type=text/css 2020-09-02 17:27:31 -04:00
Isaac Connor 0d07f93cd7 fix layout of svg 2020-09-02 16:37:39 -04:00
Isaac Connor 0cd35518c3 Fix id on nav 2020-09-02 14:47:07 -04:00
Isaac Connor ab116a1a6f use xhtmlFooter as it now contains the javascript instead of xhtmlHeader 2020-09-02 14:47:00 -04:00
Isaac Connor 84bed1b16a include MonitorStream, fix layout of image stream. Update buttons. start with a static image, MonitorStream will start the streaming 2020-09-02 14:46:45 -04:00
Isaac Connor 7b4569392c use xhtmlFooter as it now contains the javascript instead of xhtmlHeader 2020-09-02 14:46:08 -04:00
Isaac Connor 3d3966b1ea use xhtmlFooter as it now contains the javascript instead of xhtmlHeader 2020-09-02 14:45:40 -04:00
Isaac Connor 5aef5e2312 populate monitorData for MonitorStream use 2020-09-02 14:45:10 -04:00
Isaac Connor 02d056b277 Fix left column positioning 2020-09-02 14:44:52 -04:00
Isaac Connor 8d2ced0fbb use MonitorStream to handle the video streaming. update buttons. Add onload event to streaming image so that we redraw the points where they should be. Handle padding in locating points. 2020-09-02 14:44:11 -04:00
Isaac Connor 4f90f37f0e add back request queue 2020-09-02 14:42:47 -04:00
Isaac Connor 9d84b8bd83 remove datetimepickers from static html. They get added later by javascript 2020-09-02 14:42:23 -04:00
Isaac Connor e32d3ba05a Move javascript includes to xhtmlFooter so they don't delay content loading 2020-09-02 14:38:38 -04:00
Isaac Connor 5d11644664 Fix various sizes and paddings to make zone editing work perfectly 2020-09-02 14:38:13 -04:00
Isaac Connor a88dcfe78c During start, switch from mode=single if required. Add play/stop/pause 2020-09-02 14:37:48 -04:00
Isaac Connor 31e8270470 Do not set width and height of stream based on monitor size 2020-09-02 14:37:28 -04:00
Isaac Connor 29ab186a7e put generating the view html into an ob_start/ob_end_flush so that we can do things like re-open sessions in the middle of generating content. Only send CSP headers on html content. 2020-09-02 13:58:24 -04:00
Isaac Connor c0b54ee790 introduce connKey method. Use it to generate a connKey if one hasn't been assigned yet. 2020-09-02 13:56:55 -04:00
Isaac Connor 5544057a8d Merge branch 'master' into improve_zone_editing 2020-08-31 18:47:24 -04:00
Isaac Connor 762bea0761 Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot. 2020-08-31 18:30:05 -04:00
Isaac Connor 9b36b68ccc Introduce a Group_Monitor class to ease loading this relationship 2020-08-31 18:28:53 -04:00
Isaac Connor 5a9cbdaa3f Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-08-31 16:43:41 -04:00
Isaac Connor e120e21b11 fix off-by 1 in limiting results 2020-08-31 10:37:35 -04:00
Isaac Connor 73cdb510b2 Rough in an events ajax request for deleting events 2020-08-31 10:37:22 -04:00
Isaac Connor 0995708b5b Use ajax request instead of webui to delete events. The reason is that the web ui will spit out the events view after performing the action. Without a filter it will try to list every event. 2020-08-31 10:37:03 -04:00
Isaac Connor cce0ab1464 pass params when loading Objects_Indexed_By_Id 2020-08-31 10:16:35 -04:00
Isaac Connor 4fcece6b69 Fixes to generating SQL for postSQL conditions. Now we will add the AND with a value of TRUE and a comment with the attr 2020-08-31 10:16:10 -04:00
Isaac Connor 0b493cd85a add svg circles for the points 2020-08-31 10:15:14 -04:00
Isaac Connor 3d5ad4902a zones can now list multiple monitors 2020-08-31 10:14:53 -04:00
Isaac Connor 3f4f28f322 Move monitor class into js/MonitorStream for use elsewhere 2020-08-31 10:13:58 -04:00
Isaac Connor fa18887f5c zones can now list multiple monitors so populate a listof monitors with json data 2020-08-31 10:13:30 -04:00
Isaac Connor f00f9ead79 Move monitor class into js/MonitorStream for use elsewhere 2020-08-31 10:12:47 -04:00
Isaac Connor f5e659f395 Change #zones into .zones because we may list zones for multiple monitors now 2020-08-31 10:10:50 -04:00
Isaac Connor af8d7fc3fa Style svg circle point 2020-08-31 10:10:21 -04:00
Isaac Connor 3e09840995 Merge branch 'master' into improve_zone_editing 2020-08-28 17:43:07 -04:00
Andrew Bauer 990b5bd9dc monitor view - convert links to buttons 2020-08-28 15:22:57 -05:00
Andrew Bauer 9c56cd223f move header right to shift pill list up 2020-08-28 13:32:46 -05:00
Andrew Bauer 47732e2469 right align monitor item names 2020-08-28 13:18:01 -05:00
Andrew Bauer a919be7b2d replace tabs with vert pills 2020-08-28 13:09:49 -05:00
Andrew Bauer d69b3e7f43 make cancel go back to console 2020-08-28 10:56:09 -05:00
Isaac Connor d0f1a2af80 Since monitor edit is no longer a popup, we need to redirect to console instead of none. 2020-08-28 10:22:28 -04:00
Isaac Connor 079d1be3b3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-28 09:52:34 -04:00
Isaac Connor 04b3f5d294 Merge branch 'master' into improve_zone_editing 2020-08-28 09:43:48 -04:00
Andrew Bauer 2b6090d8c6 console.js - change all createPopup to window.location.assign 2020-08-28 07:58:42 -05:00
Andrew Bauer a288a54fbe make form id unique on logout view 2020-08-28 07:42:33 -05:00
Andrew Bauer 1e78307735 add navigation buttons to monitor view 2020-08-27 16:30:49 -05:00
Isaac Connor b458a7c893 Redirect after save so that a reload doesn't redo the post 2020-08-27 17:20:24 -04:00
Isaac Connor f294d099c9 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-27 17:16:18 -04:00
Isaac Connor 3d9557c5a4 Implement limit on returned events. Free ram in cache if post_condition fails 2020-08-27 17:16:10 -04:00
Isaac Connor 10d0ccf0ce fix use of ->value instead of ->val. Return 1 for the sql for a post-condition term 2020-08-27 17:15:33 -04:00
Isaac Connor d0f6f8755c Implement a remove_from_cache function so we can free mem for objects we are not interested in 2020-08-27 17:14:47 -04:00
Isaac Connor a5cef3e6d1 Need to put a 1 in the sql for post-sql conditions due to the cnj term 2020-08-27 17:14:16 -04:00
Andrew Bauer 1f5f964ae3 add navbar to monitor view 2020-08-27 15:53:24 -05:00
Andrew Bauer 948836ed96 enable jump-to feature on frames 2020-08-27 14:58:21 -05:00
Isaac Connor 9fef228636 remove debug Warning 2020-08-27 13:38:13 -04:00
Isaac Connor e9cef72d9f Use ViewWdith/ViewHeight to get rotated dimensions when calculating thumbnail size 2020-08-27 12:44:56 -04:00
Isaac Connor 103004ac34 Remove these functions. Superseded by more recent work 2020-08-27 12:16:11 -04:00
Isaac Connor 1ad084c052 Remove parse 2020-08-27 12:14:17 -04:00
Isaac Connor 69be26213a Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-08-27 11:55:26 -04:00
Isaac Connor dc15663030 Fix scales after applying layout 2020-08-27 10:55:14 -04:00
Isaac Connor ccaea26928 Fix logic on MonitorFlip Cookie value 2020-08-27 10:54:54 -04:00
Isaac Connor 6173890a45 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-27 10:34:00 -04:00
Isaac Connor 702ea365c2 Remove cruft and fix the filter bar toggle 2020-08-27 10:33:52 -04:00
Isaac Connor 4c1446d856 Fixes to scale selection and remove code that altered width&height in zms url. zms doesn't honour them. Calculate new scale and alter that parameter. 2020-08-27 10:33:08 -04:00
Isaac Connor 62eddfdf2b reorganize code a bit for better logical grouping 2020-08-27 10:31:27 -04:00
Isaac Connor c0d543cd47 Add code to handle monitorsfilterbar on montage 2020-08-27 10:31:06 -04:00
Isaac Connor dd3d315964 A a.flip float right and put a clear:both after the contents of #header so that it has space after content has been toggled 2020-08-27 10:30:27 -04:00
Isaac Connor 11f165a99f remove width and height from zms url. zms doesn't support them and having them in the url is confusing 2020-08-27 10:29:50 -04:00
Andrew Bauer 4bacb136c9 enable page-jump-to table extension 2020-08-27 07:46:52 -05:00
Andrew Bauer e8a2bbf6e0 continue to fix corrupted merge conflict 2020-08-27 07:42:39 -05:00
Andrew Bauer 9b69eb5762 fix corrupted merge conflict 2020-08-27 07:35:05 -05:00
Isaac Connor b451c323e9 remove debug code at Warning level 2020-08-26 18:40:31 -04:00
Andrew Bauer 367c060790 remove unwanted patch files 2020-08-26 17:07:58 -05:00
Andrew Bauer 280964f33f reapply commit d3cc4d5 2020-08-26 17:06:01 -05:00
Andrew Bauer 8ba91db1fb make logout view a modal 2020-08-26 16:28:11 -05:00
Andrew Bauer 8d202aeef0 eslint 2020-08-26 15:36:38 -05:00
Isaac Connor ab68bef39a Merge branch 'master' into filter_pre_post 2020-08-26 15:28:48 -04:00
Isaac Connor 99472242af Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-26 15:16:36 -04:00
Isaac Connor 0ced21dda7 Persist video volume in a cookie so that subsequent events remember the volume level.
Fixes #3013
2020-08-26 15:15:57 -04:00
Isaac Connor 74d2ba56db Persist video volume in a cookie so that subsequent events remember the volume level. 2020-08-26 15:15:10 -04:00
Andrew Bauer 67fe9d0cb4 un-popup the users views 2020-08-26 13:52:10 -05:00
Andrew Bauer 8c4f89c099 requested dark skin changes 2020-08-26 13:31:58 -05:00
Isaac Connor 24d1ba3a00 fix eslint 2020-08-26 13:41:40 -04:00
Andrew Bauer 1c7bddf96e monitor config no longer a popup 2020-08-26 12:22:19 -05:00
Andrew Bauer ac7867eab3 make function view a modal 2020-08-26 11:39:48 -05:00
Isaac Connor 06942746d6 Merge branch 'release-1.34' 2020-08-25 12:41:33 -04:00
Isaac Connor b5ef7b08b9 settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth. 2020-08-25 12:40:22 -04:00
Isaac Connor 6587cdd3de Handle failure to get v4l settings. Fix assignment of values to monitor object. 2020-08-25 12:39:44 -04:00
Isaac Connor b0f5f3617a Always set auth_hash and always set auth_relay, using our handy new get_auth_relay function 2020-08-25 12:39:14 -04:00
Isaac Connor f1fab6361f fix dimensions of v4l settings popup 2020-08-25 12:38:46 -04:00
Isaac Connor 98dce06d6b Introduce get_auth_relay to return an auth string to use in urls. 2020-08-25 12:38:31 -04:00
Isaac Connor e3a48c2db4 Handle the case where the layout has invalid json 2020-08-25 12:07:45 -04:00
Isaac Connor 6fbe7457ff Add missing globals 2020-08-25 11:47:49 -04:00
Isaac Connor 626e892b33 add global 2020-08-25 11:43:55 -04:00
Isaac Connor 3d3dde22c4 Use zm_session_start 2020-08-25 11:31:06 -04:00
Isaac Connor 278be59c86 Use zm_session_start 2020-08-25 11:30:51 -04:00
Isaac Connor 3c29228df5 Use zm_session_start 2020-08-25 11:30:22 -04:00
Isaac Connor 586f9f3e52 Use zm_session_start 2020-08-25 11:27:25 -04:00
Isaac Connor 981439cbd9 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-24 17:42:37 -04:00
Isaac Connor fe5e005d8e Calculate scale to pass to getStreamSrc for thumbnail still and stream 2020-08-24 17:42:23 -04:00
Andrew Bauer 0879ecf9a5 update timeline header 2020-08-24 14:33:01 -05:00
Isaac Connor 2d05fbda8d simplify debug line 2020-08-24 14:36:36 -04:00
Isaac Connor 3c1651d98f in getStreamSrc if scale isn't set figure it out from width and height if passed 2020-08-24 14:35:59 -04:00
Andrew Bauer 8c32511c83 whitespace 2020-08-24 12:05:31 -05:00
Isaac Connor bce38ae2c6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-24 12:05:25 -04:00
Isaac Connor 56e2ac5baa add scale to query params because zms doesn't wupport width&height 2020-08-24 12:05:14 -04:00
Andrew Bauer e5e2c3b347 fix stats off by 1 frame, don't alert on score 0 2020-08-24 10:57:54 -05:00
Andrew Bauer c6e3107a50 make donate view a modal 2020-08-24 09:31:21 -05:00
Isaac Connor 67f2e3c1a0 Merge branch 'master' into filter_pre_post 2020-08-24 10:30:01 -04:00
Isaac Connor b5cdc5c32d Set width and height on image tag so browser knows how to lay them out. Fixes flickering. 2020-08-24 10:26:07 -04:00
Isaac Connor 0e9c8a35e6 fix thumbnail height style. Make thumbnail clickable. 2020-08-24 09:32:49 -04:00
Isaac Connor 0f27243007 Merge branch 'master' into filter_pre_post 2020-08-24 09:23:24 -04:00
Andrew Bauer 8ea806e264 eslint 2020-08-23 18:40:58 -05:00
Andrew Bauer 699b20b961 whitespace 2020-08-23 17:54:57 -05:00
Andrew Bauer 65181c84ee update frame top toolbar 2020-08-23 17:53:47 -05:00
Andrew Bauer 773557ee8a set view to stats rather than popup 2020-08-23 13:25:09 -05:00
Andrew Bauer 86f0d41d8e autoinit changeScale in frame view 2020-08-23 13:17:03 -05:00
Andrew Bauer 63fc59568f pad frames cells to account for detail view 2020-08-23 13:12:54 -05:00
Andrew Bauer 4b144dea74 whitespace 2020-08-23 13:02:35 -05:00
Andrew Bauer f06bfe7cbb use bootstrap-table on stats view 2020-08-23 12:23:58 -05:00
Andrew Bauer 69ba9e6d0e eslint 2020-08-23 12:14:09 -05:00
Isaac Connor 2a7ea52330 Merge branch 'release-1.34' 2020-08-23 11:51:54 -04:00
Andrew Bauer 4cbac47d6d add navbar to stats view 2020-08-22 21:09:58 -05:00
Andrew Bauer de1d1c2ac6 change close link to back link 2020-08-22 14:43:53 -05:00
Andrew Bauer ad67f74ba4 add formatting to stats table 2020-08-22 14:12:11 -05:00
Andrew Bauer afc3d2c548 fix horizontal scroll issues events 2020-08-22 13:00:53 -05:00
Andrew Bauer e69e767878 fix horizontal scroll nonsense 2020-08-22 12:56:31 -05:00
Andrew Bauer 61f89e3306 rough in frames detail view 2020-08-22 12:45:19 -05:00
Andrew Bauer 5d09ae91ab move div tag into $imgHTML 2020-08-22 07:14:47 -05:00
Andrew Bauer 8ea7b783b5 generate thumbnails when monitor is connected 2020-08-21 21:18:55 -05:00
Andrew Bauer c8e40eb5b3 don't generate tumbnails when not running 2020-08-21 21:14:16 -05:00
Andrew Bauer 39d538d5cf add missig } 2020-08-21 20:57:05 -05:00
Andrew Bauer 73a01855f8 rough in thumbnail animation 2020-08-21 20:44:20 -05:00
Andrew Bauer 79fa257a4a rough in tumbnail animation to web console 2020-08-21 20:43:36 -05:00
Isaac Connor ac0976324f Fix case of filterQuery. Fixes #3017 2020-08-21 11:22:47 -04:00
Isaac Connor fe425302ad Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-21 10:46:13 -04:00
Isaac Connor 63ef15d247 spacing and quotes 2020-08-21 10:46:10 -04:00
Isaac Connor 80a6608733 Make values in conf.d files override values in db. Also handle the fact that they would already be defined in this case. 2020-08-21 10:36:49 -04:00
Andrew Bauer 9357017a39 add export fx to tables 2020-08-21 07:11:57 -05:00
Isaac Connor 519bfae1da Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-08-20 17:12:41 -04:00
Andrew Bauer bec77c9ce3 change pointer when over frames table 2020-08-20 10:39:55 -05:00
Andrew Bauer de4d144cd4 fix scale dropdown in frame view 2020-08-20 10:16:28 -05:00
Andrew Bauer 72d95275c3 add navbar for frame view 2020-08-20 09:19:04 -05:00
Andrew Bauer 247ace7fa2 process clicks per cell in frames 2020-08-20 09:13:11 -05:00
Andrew Bauer 7175fa3d86 no padding on frames outermost div 2020-08-20 08:19:53 -05:00
Andrew Bauer c9de30d427 click any row to load frame 2020-08-19 17:54:39 -05:00
Andrew Bauer b2a632a3f8 reinit thumbnail ani on click events 2020-08-19 16:16:27 -05:00
Andrew Bauer 8f70ae192d enable thumbnail zoom on frames view 2020-08-19 15:42:35 -05:00
Andrew Bauer a903a885b6 whitepsace 2020-08-19 14:07:00 -05:00
Isaac Connor c2d6b8f493 revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors. 2020-08-19 14:39:15 -04:00
Isaac Connor d0c21995cd Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-19 14:14:32 -04:00
Isaac Connor efec1e7d4f remove debug 2020-08-19 14:13:48 -04:00
Isaac Connor 177df46113 Apply min=0 to filterX and Y so that we don't get negative values 2020-08-19 14:11:16 -04:00
Isaac Connor d366d41297 Update parseFilter to Filter::parse 2020-08-19 14:07:51 -04:00
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
Isaac Connor b38c5e98a8 Merge branch 'master' into filter_pre_post 2020-08-18 16:33:04 -04: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 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
Isaac Connor 0a3ad719cd Merge branch 'master' into filter_pre_post 2020-08-17 18:30:44 -04:00
Andrew Bauer 1dd0b44334 eslint nanny strikes again 2020-08-17 16:59:57 -05:00
Isaac Connor dc451cbc85 Use filter class 2020-08-17 17:42:22 -04:00
Isaac Connor e3fe75f21b fix case on filterQuery 2020-08-17 17:42:03 -04:00
Isaac Connor e5dd10fc04 use filter class instead of parseFilter 2020-08-17 17:41:50 -04:00
Isaac Connor 0f90b999c0 use filter class instead of parseFilter 2020-08-17 17:41:38 -04:00
Isaac Connor 6649a30bbb Use querystring instead of query 2020-08-17 17:41:13 -04:00
Isaac Connor 5078a69c81 move pre and post condition testing into the Filter class so we can use it everywhere 2020-08-17 17:40:58 -04:00
Andrew Bauer 80b92573b8 set the icons used in bstable toolbar 2020-08-17 16:18:18 -05:00
Isaac Connor f4594f06d1 Add in pre_condition checks. 2020-08-17 16:58:37 -04:00
Isaac Connor 479768a2a4 implement disk_used_blocks in Storage. Also use Type() instead of ->{Type} to get default value. 2020-08-17 16:57:53 -04:00
Isaac Connor 72cad5f6d6 Move more code from parseFilter to Filter object. 2020-08-17 16:57:14 -04:00
Isaac Connor e9b0c4fbf5 add ->filter to FilterTerm so that we can access other terms in testing pre and post conditions. rename hidden_fields_string to hidden_fields. Add in DiskPercent DiskBlocks, SystemLoad Pre and Post conditions 2020-08-17 16:56:54 -04:00
Isaac Connor d2b7aa3e90 Populate Scheme of default Storage Area when event Storage is not valid 2020-08-17 16:55:29 -04:00
Isaac Connor ae91e9c58f add functions to Filter class to build up the sql, hidden_fields and query_string from the list of terms 2020-08-17 16:55:05 -04:00
Andrew Bauer 3e5bfc445f fix checkbox column disappearing 2020-08-17 12:10:35 -05:00
Isaac Connor e452c23c4d Merge branch 'master' into filter_pre_post 2020-08-17 12:56:43 -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
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
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