Commit Graph

16248 Commits

Author SHA1 Message Date
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 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 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
Isaac Connor ecac5e051a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-28 09:34:14 -04:00
Isaac Connor 37b0fc4bbd bump version to pickup geolocation updates 2020-09-28 09:34:08 -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 3b46ebacae remove warning used for testing 2020-09-27 12:20:09 -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 2d8349073d redirect to controlcaps after saving a control 2020-09-26 14:31:59 -05:00
Andrew Bauer dc08319037 add navbar to error view 2020-09-26 14:29:02 -05:00