Commit Graph

3896 Commits

Author SHA1 Message Date
Isaac Connor 75ec13871d Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-10-29 09:40:49 -04:00
Isaac Connor 97f4d9e7a2 Make the event count and diskspace in the storage row be a link to events for that storage area. 2020-10-29 09:40:14 -04:00
Isaac Connor 368c1649fe Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-10-29 08:47:34 -04:00
Isaac Connor 858674c0b2 Merge branch 'master' into filter_locking 2020-10-28 12:52:52 -04:00
Isaac Connor 686f793d09 fix truth value for ZM_OPT_USE_GEOLOCATION 2020-10-28 12:49:39 -04:00
Isaac Connor df788f2810 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-28 12:40:00 -04:00
Isaac Connor c67b3c5a1f fix button disabled status. We now have checkboxes that aren't actions so we need to be more explicit 2020-10-26 18:49:41 -04:00
Isaac Connor a5bb2365b5 update auth_relay when we update auth_hash 2020-10-26 18:49:03 -04:00
Isaac Connor a2596505e9 add LockRows to Filters 2020-10-26 18:47:17 -04:00
Andrew Bauer fad4339713 no need for full page reload with server pagination 2020-10-26 12:12:50 -05:00
Isaac Connor 1f64a263eb give better log when jqxhr is empty 2020-10-26 13:06:41 -04:00
Isaac Connor 59cf5c33c2 reset search on events load 2020-10-26 13:06:22 -04:00
Andrew Bauer e5563dc901 remove unwanted # 2020-10-25 16:06:37 -05:00
Andrew Bauer 6d00924c9b deploy server pagination for events view 2020-10-25 12:11:34 -05:00
Andrew Bauer cb073950b9 events view server pagination WIP 2020-10-25 10:28:22 -05:00
Isaac Connor a2dc4b5f08 handle params.daa not existing 2020-10-24 09:45:38 -04:00
Isaac Connor efaf95beda dirty hack to rename data.filter to data.advsearch 2020-10-24 08:51:26 -04:00
Isaac Connor da080d44c1 rename filter from bootstrap-table to advsearch so as not to conflict with our existing filter 2020-10-23 16:44:50 -04:00
Isaac Connor 8a3e0e108c Put back filter query code 2020-10-23 14:02:27 -04:00
Isaac Connor ad137adb4c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-23 11:30:19 -04:00
Andrew Bauer d425d1006e push newevents.php to master 2020-10-23 10:21:32 -05:00
Isaac Connor 5d7e3b0510 handle no responseText in jqxhr 2020-10-23 11:12:57 -04:00
Isaac Connor d62a5caccd Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-23 09:35:13 -04:00
Isaac Connor 90e81c5774 Merge branch 'release-1.34' 2020-10-23 09:34:35 -04:00
Isaac Connor c8392feba3 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-10-22 16:35:44 -04:00
Andrew Bauer 29819d8044 fix copy/paste error with events.php 2020-10-22 13:27:47 -05:00
Andrew Bauer 230f35f0c0 comment out debug in events.js 2020-10-22 08:50:06 -05:00
Andrew Bauer 0d14dcfbfa WIP events view server pagination 2020-10-22 08:49:07 -05:00
Isaac Connor 9372b2ef8c remove debug 2020-10-22 08:53:05 -04:00
Isaac Connor 452416e72a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-20 19:23:12 -04:00
Isaac Connor d88fd5e4e0 Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name. 2020-10-20 19:23:03 -04:00
Andrew Bauer b5aa215e31 WIP events view server pagination 2020-10-20 12:59:30 -05:00
Andrew Bauer 6357c02ec9 WIP events view server pagination 2020-10-20 12:13:12 -05:00
Isaac Connor bb5646baac Load Logout modal content on click instead of every page load 2020-10-20 12:31:06 -04:00
Isaac Connor 5b27d77ea4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-20 11:52:25 -04:00
Isaac Connor 1a77958548 Make loading the function modal happen on click instead of every page load. 2020-10-20 11:52:18 -04:00
Andrew Bauer bfa45b0c43 continue work on event view server pagination 2020-10-20 08:10:43 -05:00
Andrew Bauer 4e391708f1 event view server pagination WIP 2020-10-19 14:18:21 -05:00
Isaac Connor 8a6aaa019f Bump version for release to 1.34.22 2020-10-19 14:29:18 -04:00
Isaac Connor 0e63874533 fix calling changeScale when scale is 0 instead of auto 2020-10-19 14:28:21 -04:00
Isaac Connor 127ef9a130 Fix scaling when using ScaleToFit 2020-10-19 14:28:02 -04:00
Isaac Connor 080557d580 add an id to buttons div so that we can use it when calling scaleToFit 2020-10-19 14:27:43 -04:00
Andrew Bauer 7ae7e05f14 roughin ajax call in event.js for server side pagination 2020-10-19 09:29:39 -05:00
Isaac Connor e2b76257eb Merge branch 'release-1.34' 2020-10-19 09:10:28 -04:00
Isaac Connor 14894dfb00 remove extra comma 2020-10-19 09:08:25 -04:00
Andrew Bauer 6f45de04f8 partial roughin ajax event view server side pagination 2020-10-19 07:50:11 -05:00
Andrew Bauer 97d05c2f88 move newlog ajax request to log 2020-10-18 07:20:59 -05:00
Isaac Connor 220a89b459 fix eslint 2020-10-17 16:17:30 -04:00
Andrew Bauer be63acdcc0 rollback bstable to 1.17.1git90f47e7 2020-10-17 11:49:17 -05:00
Andrew Bauer 442fadb585 link bstable locale to zoneminder's 2020-10-17 07:28:14 -05:00
Andrew Bauer 4044d60412 update bstable to 9fa4c82, add bstable locale extenstion 2020-10-17 07:23:26 -05:00
Andrew Bauer 1ed160866b add legacy watch view alarm buttons to toolbar 2020-10-16 15:47:42 -05:00
Isaac Connor 3fdbae7761 add 1440p to the resolution list 2020-10-16 14:54:54 -04:00
Isaac Connor c5cd617204 Load logoutModal on click instead of always 2020-10-16 14:51:47 -04:00
Isaac Connor d6dfde5630 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-16 12:21:22 -04:00
Isaac Connor 8c7c4c4b1b add a call to drawZonePoints to handle case where image doesn't load. Remove debug and dead code 2020-10-16 12:21:12 -04:00
Isaac Connor b9b45d8b9e definitionPanel shouldn't be floated, or relse should be set to 100% width 2020-10-16 12:14:58 -04:00
Isaac Connor c70493a43f Add clear: both to content div. In general the content div is 100% so should drop below floats 2020-10-16 12:14:31 -04:00
Andrew Bauer f98a885ed5 update the watch view header 2020-10-16 08:08:23 -05:00
Isaac Connor 4f56f9d82b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-15 17:20:10 -04:00
Isaac Connor 12b75e93b8 Merge branch 'release-1.34' 2020-10-15 17:19:56 -04:00
Isaac Connor 78cbacae2e When changing rates, if not using video.js, send CMD_VARPLAY to tell zms what to do 2020-10-15 17:18:38 -04:00
Isaac Connor 5869817e0d set playbackrates in video.js to match the ones offered by the zms player. Use the rates array set in includes/config.php 2020-10-15 17:17:20 -04:00
Isaac Connor 7bb227283d Update rates in includes/config.php 2020-10-15 17:15:54 -04:00
Andrew Bauer 2fbbe11079 make the filter button style consistent 2020-10-15 08:01:32 -05:00
Andrew Bauer f32a7aaff5 deploy insertModalHtml 2020-10-14 15:58:39 -05:00
Andrew Bauer ec040b1bfd don't set popup flag in event view 2020-10-14 13:59:15 -05:00
Andrew Bauer a60815a700 eslint 2020-10-14 11:20:37 -05:00
Andrew Bauer c3a98c1f44 replace shutdown form submit with ajax 2020-10-14 10:03:33 -05:00
Isaac Connor da948065bb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-14 10:39:31 -04:00
Isaac Connor 10c0a6617c Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php. 2020-10-14 10:39:25 -04:00
Andrew Bauer ba82088b99 make all the data-on-xxx js bindings functions 2020-10-14 08:51:44 -05:00
Isaac Connor ff14d11fef Don't output the filter, just log it! 2020-10-13 10:07:27 -04:00
Isaac Connor e4fec8c5ea code style cleanups, most defaulting to 'Id' as the term attr so that we can use an empty filter as a quick jump to event feature 2020-10-13 09:02:38 -04:00
Andrew Bauer c4ea27db8d fix buttons in shutdown modal 2020-10-12 14:51:33 -05:00
Andrew Bauer 49fec5142c remove popup code form skin.js 2020-10-12 13:34:40 -05:00
Andrew Bauer e5e1455f7a replace embedded popuplinks in watch view 2020-10-12 13:26:20 -05:00
Andrew Bauer 332ec2032a replace createPopup with location.assign 2020-10-12 12:37:23 -05:00
Andrew Bauer ed5f6b2625 convert shutdown popup to modal 2020-10-12 12:16:52 -05:00
Andrew Bauer 0f263407a5 make redirect conditional on previous view 2020-10-12 10:32:25 -05:00
Isaac Connor 3646a66168 translate unquoted literal Filter 2020-10-12 11:20:22 -04:00
Isaac Connor 1ffa1cc33b Add button update checks for AutoUnarchive 2020-10-12 10:56:01 -04:00
Isaac Connor 1854e02ab3 Accept both Id and filter[Id] when loading filters. 2020-10-12 10:55:42 -04:00
Isaac Connor 3fa0ef25f6 Add a link to the filter representing the events list 2020-10-12 10:55:03 -04:00
Isaac Connor 03c8e86908 update some quotes 2020-10-10 11:09:51 -04:00
Isaac Connor 9cc7f0d360 Merge branch 'release-1.34' 2020-10-08 09:28:25 -04:00
Isaac Connor c28ff1f2b4 Include loading EndTime when loading Events data so that we can determine if an event is in-progress
Keep track of last_id which is the last frame id that we have info for. Use it instead of Frame Count to prevent
accessing non-existent frame records
close ffmpeg_input on event change
include duration in status messages because it may change when playing an in-progress event.
when we hit the end of our frame data if it is an in-progress event, reload the event data instead of moving to the next event.
Include X-Timestamp in http headers to match live stream behaviour
Only send time to next event when mode=ALL
Fix scale behaviour on event view
2020-10-08 09:06:56 -04:00
Isaac Connor 95b09ad182 Add samesite=strict to all Cookie setting 2020-10-07 11:26:18 -04:00
Isaac Connor 7f67d09749 test for monitorIds value before calling explode because explode will return an array with an empty first element instead of an empty array 2020-10-07 11:14:57 -04:00
Isaac Connor ae7ed5a342 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-06 16:51:24 -04:00
Isaac Connor 9abde9ee06 Merge branch 'release-1.34' 2020-10-06 16:51:12 -04:00
Isaac Connor 044ce61ddb Always do event change detection whether we are paused or not. Because we might be single-stepping. Change progress to a double as that it what it should be. 2020-10-06 16:47:51 -04:00
Andrew Bauer 76af02cc76 whitespace 2020-10-05 16:31:26 -05:00
Andrew Bauer 01596ec26c whitespace 2020-10-05 15:53:46 -05:00
Andrew Bauer 9c7ebf8c9e unpopup video view 2020-10-05 15:44:07 -05:00
Andrew Bauer f93450f9ea remove plugin support for viewing downloads 2020-10-05 14:44:45 -05:00
Andrew Bauer 321de3c604 only update changed elements in video view 2020-10-05 13:59:44 -05:00
Andrew Bauer 862f0ca732 add xmlfooter to video view, replace mootools 2020-10-05 09:37:00 -05:00
Andrew Bauer 2e6efbb349 replace inlince onchange event in control view 2020-10-03 21:44:24 -05:00
Andrew Bauer d9b8a7ceb2 remove unused view 2020-10-03 21:35:38 -05:00
Andrew Bauer adb715c42c fix typo 2020-10-03 21:32:07 -05:00
Andrew Bauer a0ad52bac9 replace another inline onchange event 2020-10-03 21:30:48 -05:00
Andrew Bauer b4d2fa5e75 replace inline onchange event 2020-10-03 21:14:24 -05:00
Andrew Bauer 65b6dad48c eslint 2020-10-03 17:38:56 -05:00
Andrew Bauer 8d19cee811 unpopup the addnewuser button 2020-10-03 17:12:44 -05:00
Andrew Bauer aee5430bc8 only load preset and settings modals when needed 2020-10-03 17:00:20 -05:00
Andrew Bauer 1643fb686b convert settings popup to modal 2020-10-03 16:51:25 -05:00
Andrew Bauer 391ce88f05 eslint 2020-10-02 21:11:54 -05:00
Andrew Bauer a97e526298 fix save button in controlpreset modal 2020-10-02 16:10:32 -05:00
Andrew Bauer 802e439cb5 convert controlpreset view to a modal 2020-10-02 15:46:28 -05:00
Andrew Bauer 7b5090ceab move newlog view to log view 2020-10-02 13:26:35 -05:00
Andrew Bauer c5f69b9441 eslint 2020-10-02 13:24:30 -05:00
Andrew Bauer 950b04c659 convert popuplink 2020-10-02 12:51:17 -05:00
Andrew Bauer 6c0f61ebbd rework devices view, remove inline onclick 2020-10-02 12:39:05 -05:00
Andrew Bauer 1691e4321b don't log ajax response text if it is empty 2020-10-02 10:28:50 -05:00
Andrew Bauer a80b4b91fb fix x10 device edit 2020-10-01 16:03:58 -05:00
Andrew Bauer 186b8ac947 convert x10 device view to a modal 2020-10-01 15:52:33 -05:00
Andrew Bauer c61c111d9e modernize devices view 2020-10-01 12:52:20 -05:00
Andrew Bauer ef958b1649 enable mgmt of x10 device permissions 2020-10-01 10:51:59 -05:00
Andrew Bauer e26e36606f update version check logic in navbar 2020-10-01 08:46:58 -05:00
Andrew Bauer c4cf52c2bc new version notice is now part of the navbar 2020-10-01 08:15:20 -05:00
Andrew Bauer 591a30f1fe fix typo 2020-09-30 13:33:11 -05:00
Andrew Bauer 4bc373105d fix typo 2020-09-30 13:12:58 -05:00
Andrew Bauer 9b9138f113 replace popup calls in montagereview 2020-09-30 12:20:24 -05:00
Andrew Bauer d77b55d1d6 replace popup code in add_monitor 2020-09-30 10:40:13 -05:00
Andrew Bauer 9bb82f6e9a whitespace 2020-09-30 09:25:52 -05:00
Andrew Bauer 2d30d7aafa convert download view to modal 2020-09-30 09:12:54 -05:00
Isaac Connor 3024c46dbb Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-29 14:50:13 -04:00
Andrew Bauer 6eaa8aa211 whitespace 2020-09-29 13:05:00 -05:00
Andrew Bauer 4694ce59bb export event function does not need element 2020-09-29 12:55:57 -05:00
Andrew Bauer a12a870e2c download.js - replace mootools with jquery 2020-09-29 12:51:01 -05:00
Andrew Bauer 953a6e0785 more fixes to download view 2020-09-29 10:15:58 -05:00
Andrew Bauer 5200af8206 add missing return to download view 2020-09-29 09:50:15 -05:00
Isaac Connor 1af20cea6a Fix unarchive. The reload was killing the getJSON. Should only do that on success 2020-09-29 09:42:31 -04:00
Andrew Bauer fc366aa503 add missing echo 2020-09-28 15:41:07 -05:00
Andrew Bauer 1361f0936c clean up download view 2020-09-28 15:38:56 -05:00
Isaac Connor 3531b8a854 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-09-28 16:14:07 -04:00
Isaac Connor 26636e1172 calculate thumb height based on ratio for frames 2020-09-28 16:13:56 -04:00
Isaac Connor 58902c70d6 use output_script_if_exists to cache_bust most of the js 2020-09-28 09:49:07 -04:00
Isaac Connor ecac5e051a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-28 09:34:14 -04:00
Isaac Connor 0a4a144bbc Merge branch 'location' 2020-09-28 09:33:28 -04:00
Andrew Bauer 699cbed6af add back and refresh buttons to export view 2020-09-27 12:43:12 -05:00
Andrew Bauer 9ea58dc4a1 eslint 2020-09-27 12:16:04 -05:00
Andrew Bauer c1a0afef95 make group view into a modal 2020-09-27 12:12:01 -05:00
Andrew Bauer 784533ac07 clean up group view 2020-09-27 08:11:45 -05:00
Andrew Bauer 47e5a26da4 eslint 2020-09-27 07:41:05 -05:00
Andrew Bauer a6413ccd7f call modal when edit btn is clicked on event view 2020-09-27 07:12:32 -05:00
Andrew Bauer 2655118cbd change call to popup -> view in event.js 2020-09-26 21:21:29 -05:00
Andrew Bauer 9d2450d55d load export view, rather than popup 2020-09-26 21:15:50 -05:00
Andrew Bauer b2cf48a645 remove unused call to filter popup 2020-09-26 21:06:57 -05:00
Andrew Bauer 1260d7bbb2 convert controlcap tabs to pills 2020-09-26 17:05:13 -05:00
Andrew Bauer 935f73ad33 reconfig controlcap cancel button 2020-09-26 16:39:31 -05:00
Andrew Bauer dc08319037 add navbar to error view 2020-09-26 14:29:02 -05:00
Andrew Bauer 112003f9de eslint 2020-09-26 13:55:56 -05:00
Andrew Bauer 0c4fcbbe97 convert controlcaps view to bstable 2020-09-26 12:09:41 -05:00
Andrew Bauer 48a649a132 extend pill list bkgnd vertically in options 2020-09-26 07:30:15 -05:00
Andrew Bauer df5192a6b4 link to controlcaps from options view 2020-09-25 21:46:54 -05:00
Andrew Bauer b7efdebf9a dynamically find the Level col index 2020-09-25 21:26:22 -05:00
Andrew Bauer f4e7e264f0 fix makelink 2020-09-25 16:18:44 -05:00
Andrew Bauer 582d85f083 unpopup the controlcaps views 2020-09-25 16:12:05 -05:00
Andrew Bauer eedf18073f add navbar to controlcap views 2020-09-25 16:05:16 -05:00
Andrew Bauer 6a5610e404 add back and refresh buttons to user view 2020-09-25 15:49:18 -05:00
Andrew Bauer ea99bc173e add navbar to monitor probe views 2020-09-25 14:49:14 -05:00
Andrew Bauer 2b0badfebe add back and refresh buttons to zones 2020-09-25 13:44:55 -05:00
Andrew Bauer 8018bd4ed9 add back & refresh buttons to zone view 2020-09-25 13:37:06 -05:00
Andrew Bauer d66b0be1bb fix scalecontrol on frame view 2020-09-25 13:08:55 -05:00
Andrew Bauer c73dbc480f unpopup the svg ploygon in zones 2020-09-25 12:34:04 -05:00
Andrew Bauer ae9139b00c unpopup zone view 2020-09-25 10:52:13 -05:00
Andrew Bauer 1ac5572d59 unpopup the zones view 2020-09-25 07:56:09 -05:00
Andrew Bauer 493b9d0ef7 revert newlog row colors back to former 2020-09-25 07:21:14 -05:00
Isaac Connor f9d28ddabe stick a map on the location tab 2020-09-24 20:31:22 -04:00
Isaac Connor a3f4837186 Use config options for tile datam access tokens and turning geolocation on/off 2020-09-24 20:30:57 -04:00
Isaac Connor a109d7bba0 leaflet can't be cache busted so update output_link_if_exists and output_script_if_exists to take a cache_bust flag 2020-09-24 20:21:38 -04:00
Isaac Connor 386f991364 Merge branch 'master' into location 2020-09-24 19:28:57 -04:00
Isaac Connor bcb430d393 copy log.css to newlog and add a style for bg-danger 2020-09-24 16:03:26 -04:00
Andrew Bauer 310e52840d remove under construction banner 2020-09-24 12:29:28 -05:00
Andrew Bauer 89fddf3555 decrease refresh timing 2020-09-24 12:27:03 -05:00
Isaac Connor d58f776d9d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-24 12:13:01 -04:00
Isaac Connor e6d7a528d8 Use newer Filter object methods 2020-09-24 12:12:49 -04:00
Isaac Connor cdc07715b7 remove parseFilterToTre and fix filter['query'] to filter['querystring'] 2020-09-24 12:12:37 -04:00
Andrew Bauer e4a1bacbbf get adv search working in newlog view 2020-09-24 11:05:34 -05:00
Andrew Bauer 88f1dcca13 centralize bstable icon var, change table refresh icon 2020-09-24 08:25:39 -05:00
Isaac Connor e4bbbce161 fix eslint 2020-09-24 09:13:44 -04:00
Isaac Connor 9c7bbd4aa7 introduce output_script_if_exists, use it to link leaflet.js if it exists 2020-09-24 09:13:25 -04:00
Isaac Connor 624bcdcde0 Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them 2020-09-24 09:01:30 -04:00
Andrew Bauer b4450fecec init bootstrap-table only once 2020-09-23 14:32:40 -05:00
Andrew Bauer 16a593e904 eslint 2020-09-23 13:56:41 -05:00
Andrew Bauer 3f2f7359f0 rough in new log view - very rough 2020-09-23 13:09:19 -05:00
Isaac Connor 70be6bc84c Add an estimated ram use to buffer tabs 2020-09-22 16:21:59 -04:00
Isaac Connor eb736df405 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-22 15:51:49 -04:00
Isaac Connor fbc15c8109 Fix FPS Report Interval label 2020-09-22 15:51:44 -04:00
Andrew Bauer d2ba9c5234 load bs-table toolbar & autorefresh 2020-09-22 14:23:25 -05:00
Andrew Bauer 2bdbb48692 update to bootstrap-table 1.18.0 and more extensions 2020-09-22 14:09:02 -05:00
Isaac Connor ed6d5a55a5 put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button 2020-09-22 14:33:26 -04:00
Isaac Connor b1dd42dd8b Use bootstrap nav pills to just hide/show the tab instead of doing form submits in monitor editing 2020-09-22 14:05:11 -04:00
Isaac Connor 7196eaf0d0 Minimum value for label position is 0, not 1. 2020-09-22 13:14:25 -04:00
Isaac Connor 2457dcb16f Minimum value for label position is 0, not 1. 2020-09-22 13:12:39 -04:00
Isaac Connor b6541aa1ff Move log export to a generic modal 2020-09-21 13:01:58 -04:00
Isaac Connor cbbdfdbd43 Introduce generic getModal and manageModalBtns 2020-09-21 13:00:55 -04:00
Isaac Connor 2ff2fbecd9 Remove fieldset styling. We were conflicting with bootstrap 2020-09-21 13:00:29 -04:00
Andrew Bauer 1d1b0e58d2 consolidate getJson fail callbacks to one function 2020-09-20 08:41:16 -05:00
Andrew Bauer c75f5c68c1 unpopup the log view 2020-09-19 12:59:15 -05:00
Andrew Bauer 0a7848d9d2 remove uneeded state php and js files 2020-09-19 12:36:55 -05:00
Andrew Bauer a3c0e160a2 convert state modal to ajax request 2020-09-19 12:36:04 -05:00
Isaac Connor bf29357455 Merge branch 'release-1.34' 2020-09-19 12:01:21 -04:00
Isaac Connor 3492582b98 add missing css for settings popup 2020-09-19 12:00:32 -04:00
Andrew Bauer 7c1ec4f957 convert logout modal to ajax request 2020-09-19 10:44:05 -05:00
Andrew Bauer 03a0e849b8 remove unneeded js from console.js 2020-09-19 10:24:28 -05:00
Andrew Bauer ec20fdf3ad convert function modal to ajax request 2020-09-19 10:18:59 -05:00
Andrew Bauer d2963fe28f convert donate modal to ajax request 2020-09-19 08:55:08 -05:00
Andrew Bauer 467e75a11c convert eventdetail function to php file 2020-09-18 11:03:20 -05:00
Andrew Bauer 2757b74957 convert servermodal function to php file 2020-09-18 10:34:33 -05:00
Andrew Bauer 10119dc609 convert storage function to php file 2020-09-18 10:02:02 -05:00
Andrew Bauer 1b2f0514b9 convert delconfirm function to php file 2020-09-18 09:43:29 -05:00
Andrew Bauer 6e6b9a464b convert enoperm function to php file 2020-09-18 09:24:23 -05:00
Andrew Bauer bc7cadcc73 convert optionhelp function to php file 2020-09-18 08:35:21 -05:00
Isaac Connor e491f2ee76 Add id's to dropdowns to fix zone edit behaviour. Remove CSP violations 2020-09-17 20:58:53 -04:00
Isaac Connor 8f3b3466af setup onblur function for presetSelector 2020-09-17 20:58:18 -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 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 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
Andrew Bauer accfd1191f update eventdetail modal 2020-09-15 09:20:38 -05: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
Andrew Bauer ba900dd9dc change table type to increase row padding 2020-09-14 14:07:49 -05:00
Andrew Bauer fb85d6f79c rough in eventdetail modal 2020-09-14 13:47:09 -05:00