Commit Graph

14260 Commits

Author SHA1 Message Date
Isaac Connor 3bd0525e64 escape column names for mysql8 2019-12-08 14:27:07 -05:00
Isaac Connor ed417a49b4 increase logspopup width to eliminate scrollbars 2019-12-08 11:21:38 -05:00
Isaac Connor 2aef547f37 add changelog about bump to 1.33.15 2019-12-08 11:01:46 -05:00
Isaac Connor 86fc852621 bump version in zoneminder.spec 2019-12-08 10:59:50 -05:00
Isaac Connor e421866c50
Merge pull request #2776 from connortechnology/fixes_for_php7.4
Test for null in user before testing for access in CanEdit et all
2019-12-07 12:41:42 -05:00
Isaac Connor 0de6396a5b Test for null in user before testing for access in CanEdit et all 2019-12-07 12:39:28 -05:00
Isaac Connor 957d34e9a8
Merge pull request #2775 from connortechnology/fixes_for_php7.4
Apply relevant changes to deal with php7,4 deprecations
2019-12-07 11:46:41 -05:00
Isaac Connor 4632bbd124 Apply relevant changes to deal with php7,4 deprecations 2019-12-07 11:45:32 -05:00
Isaac Connor cc6d40d67e Missing -> 2019-12-07 10:38:51 -05:00
Isaac Connor bda4e95c7a Add irc to badges 2019-12-06 17:51:06 -05:00
Isaac Connor 3f8092a430 Add funding.yml 2019-12-06 17:25:41 -05:00
Isaac Connor e123e689ca fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in 2019-12-06 14:32:59 -05:00
Isaac Connor df9f6103e4 fix syntax error 2019-12-04 09:00:20 -05:00
Isaac Connor 78912584e1 re-arrange code to hopefully get rid of syntax error reported by some people 2019-12-04 07:10:33 -05:00
Isaac Connor 3af6358314 fix & to & 2019-12-02 15:49:49 -05:00
Isaac Connor 72cb5bd1bb add missing </select> 2019-12-02 15:49:42 -05:00
Isaac Connor 09faa0a731 fix & to &amp; 2019-12-02 15:49:32 -05:00
Isaac Connor b686649589 fix &amp; instead of &. 2019-12-02 15:34:31 -05:00
Isaac Connor 8bf74d2f35 fix &amp; instead of &. 2019-12-02 15:34:23 -05:00
Isaac Connor 24022d157d use &amp; instead of &. Put inputs out of table where they belong 2019-12-02 15:33:58 -05:00
Isaac Connor 9f49e4f367 make Mark column text-align left so that checkboxes line up 2019-12-02 15:07:35 -05:00
Isaac Connor 1add3a4bb4 Add an update to Storage DiskSpace. 2019-12-02 15:04:01 -05:00
Isaac Connor f7e01aa999 switch to material icon for dot 2019-12-02 14:31:05 -05:00
Isaac Connor cf35db120d change to material icons, fix missing div 2019-12-02 14:21:51 -05:00
Isaac Connor 8e645e45e1 fix selecting Monitors by passing MonitorId as MonitorId[] 2019-12-02 14:21:25 -05:00
Isaac Connor b70b75421b quotes and spacing 2019-12-02 14:18:27 -05:00
Isaac Connor 16698b8a82 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-12-02 13:42:07 -05:00
Isaac Connor 9d0a416311 remove debugging code 2019-12-02 13:41:42 -05:00
Isaac Connor c9a324b7b3 improve the configureExportButton to look at specific inputs instead of just counting checkboxes 2019-12-02 13:40:02 -05:00
Isaac Connor 09a6e06132 change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already 2019-12-02 13:38:23 -05:00
Isaac Connor 2713565c84 using bootstrap layout instead of a table, so text-align: right 2019-12-02 13:34:53 -05:00
Isaac Connor 80d0d037b5 add a style for inline form not supported by bootstrap 3 2019-12-02 13:34:11 -05:00
Isaac Connor d39193cb6b convert flip to material icons 2019-12-02 12:33:13 -05:00
Isaac Connor 576dd23907 test for existence of filter in query 2019-12-02 12:30:15 -05:00
Isaac Connor 355fceccb4 test for existence of default 2019-12-02 12:30:03 -05:00
Isaac Connor caefcc2f7a increase size of export popup 2019-12-02 12:17:33 -05:00
Isaac Connor 03d7bcdd11 better debug logging when on-click-this function isn't defined 2019-12-02 12:17:18 -05:00
Isaac Connor c19632e114
Merge pull request #2769 from connortechnology/fix_api_alarm_auth
Fix api alarm auth
2019-12-02 07:53:50 -05:00
Isaac Connor 76d795f413 add rendering of enums for Events Controller 2019-12-01 12:32:14 -05:00
Isaac Connor 0b2853095e cleanup auth in monitors alarm method 2019-12-01 12:30:27 -05:00
Isaac Connor 0947c3ef24 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-30 15:37:09 -05:00
Isaac Connor 927165a934 debug the recording_started timestamp and warning when we can't fine a frame before the requested time 2019-11-30 15:37:05 -05:00
Isaac Connor e096e0a7fe improve error logging when running as root as can't chown log file 2019-11-30 15:35:09 -05:00
Isaac Connor 00b67ec352
Merge pull request #2768 from selvanair/fix-video-start
Correct video buffer length when analysis and capture fps differ
2019-11-30 14:53:22 -05:00
Isaac Connor eedb31730e fix saving Monitor values that don't get passed when empty, like Enabled 2019-11-29 14:49:43 -05:00
Isaac Connor cab1056328 improve debugging in recursive_array_diff 2019-11-29 14:49:10 -05:00
Isaac Connor 393c25b4f2 fix array keys 2019-11-29 14:26:03 -05:00
Isaac Connor d6a414a1a4
Merge pull request #2767 from connortechnology/fix_2692
Fix 2692
2019-11-29 14:24:00 -05:00
Isaac Connor aaa570ed68 bump version for update 2019-11-29 14:23:28 -05:00
Isaac Connor a49d97a526 bump version 2019-11-29 14:07:50 -05:00