Commit Graph

16766 Commits

Author SHA1 Message Date
Isaac Connor 5d0c812dfb fix resource leak on error 2020-10-02 12:46:53 -04:00
Isaac Connor f01cf9cd51 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-02 12:45:59 -04:00
Isaac Connor db7cfede4a Put back dependency install only using sudo now 2020-10-02 12:45:49 -04:00
Andrew Bauer 1691e4321b don't log ajax response text if it is empty 2020-10-02 10:28:50 -05:00
Isaac Connor 7f06920f4a convert polkit FATAL_ERROR to a WARNING so that codeQL will build 2020-10-02 10:33:42 -04:00
Isaac Connor 0bcf7cc3c5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-02 09:04:10 -04:00
Isaac Connor 06519895d4 FATAL_ERROR to WARNING. The purpose is to allow codeQL to build cpp even though the perl deps havn't been installed. 2020-10-02 09:04:03 -04:00
Isaac Connor 9fec7c8e5a
Update codeql-analysis.yml
remove dependencies, need to figure out how to make it install them. Just do submodule init for now.
2020-10-01 17:11:20 -04: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
Isaac Connor 42debf5392 Rough in a Zone class 2020-10-01 16:50:50 -04:00
Isaac Connor 3091759162 Add missing fields and impleent a control function 2020-10-01 16:50:39 -04:00
Isaac Connor 160520b3bf
Update codeql-analysis.yml
install dependencies before auto build
2020-10-01 15:50:35 -04:00
Isaac Connor bf66903e2e
Update codeql-analysis.yml
Add submodule init
2020-10-01 14:10:55 -04:00
Isaac Connor fbded3eb20
Update codeql-analysis.yml
Add some build dependencies
2020-10-01 14:07:11 -04:00
Andrew Bauer c61c111d9e modernize devices view 2020-10-01 12:52:20 -05:00
Isaac Connor d139dc010b prefer libjpegturbo to libjpeg8 or 9 2020-10-01 13:47:39 -04:00
Isaac Connor 5f93941755
Create codeql-analysis.yml
Let's try out github code scanning
2020-10-01 13:34:52 -04:00
Isaac Connor 63e42ca651 Still need libjpeg 2020-10-01 12:57:46 -04:00
Andrew Bauer ef958b1649 enable mgmt of x10 device permissions 2020-10-01 10:51:59 -05:00
Andrew Bauer 928fa67fce redirect to previous view after user perm changes 2020-10-01 10:45:44 -05:00
Andrew Bauer b8d95dfa05 fix array to string php warning 2020-10-01 09:13:50 -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 3eae356ed7 Bump to 1.35.8. Change table engine to InnoDb for Monitor_Status. 2020-09-30 09:39:31 -04:00
Isaac Connor 02d4785e71 Split out user creation/updating into it's own function 2020-09-29 17:26:55 -04:00
Isaac Connor aa7ba44ed9 Use ->zmaControl instead of invalid zmaControl(). the old zmaControl takes a mid, not a monitor object 2020-09-29 16:48:22 -04:00
Isaac Connor 24d8b99eea test for property_exists to quiet errors 2020-09-29 16:47:49 -04:00
Isaac Connor f2e4d1dd5c Handle PostSQL Conditions when generating SQL 2020-09-29 15:02:46 -04: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 a118e52f30 Add 2>&1 to ffmpeg command line to get stderr as well 2020-09-28 16:13:06 -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 0c7cb58c38 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-09-28 09:36:34 -04:00
Isaac Connor 08273221a3 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-09-28 09:36:15 -04:00