Commit Graph

16577 Commits

Author SHA1 Message Date
Isaac Connor eefbed04c1 Add debugging for min_section_length keeping us in ALERT 2020-10-19 13:24:30 -04:00
Isaac Connor df2f5f814b fix case in mocord where cause would not contain motion 2020-10-19 13:24:08 -04:00
Isaac Connor cc24df9593 init shared_data in the purpose=QUERY case to prevent crash. Also don't load zones if we don't need them 2020-10-19 13:23:40 -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 5bf0524bdc chinese locale designation was backwards, fixing... 2020-10-17 07:29:32 -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
Isaac Connor 06c8ce57c2 Make zm_terminate available to anyone who includes zm.h 2020-10-16 20:06:53 -04:00
Isaac Connor 2f06a79ad8 fix compiler warnings 2020-10-16 20:04:26 -04: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 3c5dc8e8b3 Add line breaks in select options 2020-10-15 17:16:14 -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
Isaac Connor 9c943fb079 Merge branch 'release-1.34' 2020-10-14 16:48:01 -04:00
Isaac Connor ba3b19d89a Clean up DiskSpace option. Doesn't need to be there and shouldn't set HashDiskPercent 2020-10-14 16:45:03 -04:00
Andrew Bauer ec040b1bfd don't set popup flag in event view 2020-10-14 13:59:15 -05:00
Andrew Bauer e69b3800c7 set return status for cancel and restart commands 2020-10-14 12:22:21 -05:00
Andrew Bauer a60815a700 eslint 2020-10-14 11:20:37 -05:00
Andrew Bauer bea95bca68 use ZM\Debug 2020-10-14 10:33:40 -05:00
Isaac Connor 57a1a383ad Merge branch 'release-1.34' 2020-10-14 11:32:50 -04:00
Isaac Connor e9fb150880 Improve error message when a row doesn't exist in the Monitor_Status table 2020-10-14 11:32:33 -04: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 e8c9845e08 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-13 09:02:47 -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 031b41f78a remove the english word popup from lang files 2020-10-13 07:59:34 -05:00
Isaac Connor cd2e96eaec Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-13 08:42:28 -04:00
Isaac Connor 908c20e959 add ZM prefix to Warning 2020-10-13 08:42:22 -04:00
Andrew Bauer 89c76ec140 no need to clare $view as global 2020-10-12 14:52:57 -05:00