ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,984 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

11984 Commits

Author SHA1 Message Date
Andrew Bauer 1aed120b23
Merge pull request #2191 from jof/control_plugin_psia 
Add Control plugin for PTZ cameras supporting the PSIA IP Media Device API
 2018-10-11 09:32:45 -05:00
Andrew Bauer 7ffc5ab266
Merge branch 'master' into control_plugin_psia 2018-10-11 09:32:06 -05:00
Pliable Pixels a76e33bd48 rough in for alarmed frame retrieval (#2248) 
* rough in for alarmed frame retrieval

* add sorting
 2018-10-11 10:07:56 -04:00
Andrew Bauer c7f9ffa521
Merge pull request #2217 from connortechnology/touch_lockfile 
Touch lockfile
 2018-10-11 08:45:09 -05:00
Isaac Connor f2b38f175d Update Frame::find_one so that we can specify an ordering for find_one and so that semantics match other objects find methods 2018-10-11 09:14:40 -04:00
Isaac Connor c4c8a728f2 Handle no controls found more gracefully 2018-10-10 19:04:00 -04:00
Isaac Connor be78cb1b34 correct falsepi=> false 2018-10-10 16:08:48 -04:00
Andrew Bauer 2fbe1be02b implement loadMonitor sub (#2244) 
* implement loadMonitor sub

* remove carriabe returns from Info, Warning, Debug statements
 2018-10-10 14:27:05 -04:00
Isaac Connor 3f9360fa50 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-10 14:22:59 -04:00
Isaac Connor b84234cdf1 Remove debug line at INF level 2018-10-10 14:22:48 -04:00
Andrew Bauer 4d5b0ca864
Merge pull request #2247 from connortechnology/turn_off_navbar 
Turn off navbar
 2018-10-10 13:21:46 -05:00
Isaac Connor bf3e783c42 remove link to zones_overview that I never got around to creating 2018-10-10 14:13:12 -04:00
Isaac Connor 4d617f0f78 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-10 14:12:26 -04:00
Isaac Connor c58f043998 Add a mouseover tooltip saying Toggle Filters on up arrow 2018-10-10 14:12:16 -04:00
Andrew Bauer ad70648cb3 don't build neon instructions on armel (#2246) 2018-10-10 14:10:02 -04:00
Isaac Connor 031c96c71d Merge branch 'master' into turn_off_navbar 2018-10-10 14:04:29 -04:00
Isaac Connor a46c9a8a7a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-10 14:03:35 -04:00
Isaac Connor 63a5211789 use url instead of server_url in Monitor object 2018-10-10 14:03:27 -04:00
Isaac Connor a1ab0855db if navbar=0 is given in the url, don't output the navbar 2018-10-10 14:02:46 -04:00
Isaac Connor 6ed146b4dd Use Hostname instead of Url in test for CORS access. 2018-10-10 14:01:36 -04:00
Andrew Bauer 0c9843690b
Merge pull request #2245 from connortechnology/header_flips_persistent 
Make header flips persistent based on cookie
 2018-10-10 12:22:37 -05:00
Isaac Connor 48e805c09f Make header flips perisisent based on cookie 2018-10-10 13:11:27 -04:00
Isaac Connor ff00f15b58 add missing ; 2018-10-09 11:10:09 -04:00
Isaac Connor 90ea6aa076 remove : from labels on monitor filters. They can be put back in css 2018-10-09 11:09:42 -04:00
Pliable Pixels 4d626dfb4e allow username&password even if AUTH_HASH is enabled (#2231) 2018-10-08 17:28:03 -04:00
Isaac Connor 8bbb4dae69 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2018-10-08 09:56:19 -04:00
Isaac Connor 52b1439d51 fix the lack of /zm/index.php in url in Server->Url() and multiport 2018-10-08 09:55:47 -04:00
Isaac Connor 1eb8e9ed9e Include PHP_SELF in url to Server. This will assume that all servers in a multi-server setup use the same path 2018-10-08 09:45:03 -04:00
Andrew Bauer c1de20a081 use $Event rather than $event (#2240) 2018-10-08 09:25:17 -04:00
Isaac Connor 4a642e1a9d pass Event instead of event to executeCommand 2018-10-08 08:31:16 -04:00
Pliable Pixels fc4a84011b added note on auth hash logins (#2237) 
* added note on auth hash logins

* code inline escape fix
 2018-10-06 15:38:30 -04:00
Isaac Connor 9275a1d046 fix missing spaces after 'to' and some spacing and quotes 2018-10-05 09:45:47 -04:00
Isaac Connor 1b1d420bc5 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-04 10:47:49 -04:00
Isaac Connor 56b31becb2 Add explicit db disconnect in Fatal(). If we don't disconnect then we leave sockets hanging around in TIME_WAIT (I think). 2018-10-04 10:47:38 -04:00
Andrew Bauer 409fd6aa6f
Merge pull request #2232 from connortechnology/fix_2229_getDiskPercent 
Fix 2229 get disk percent
 2018-10-03 18:11:28 -05:00
Isaac Connor 633fbfc5b4 rework release mode. When doing a release, we cannot regenerate the .orig tarball for each distro. It has to be the same or else the ppa will reject any further uploads. So now the distro command line parameter can be a comma separated list of distros to build for and will default to xenial,bionic,trusty 2018-10-03 13:03:44 -04:00
Isaac Connor 04c06d0893 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-03 11:23:01 -04:00
Isaac Connor 66221e39ab rough in a StorageController for api 2018-10-03 11:22:51 -04:00
Isaac Connor 12bed9b6ac Use alternate, working test for relative ZM_DIR_EVENTS. Don't use human output from du when specifying mid to be consistent. 2018-10-03 11:11:33 -04:00
Isaac Connor 03f09bdc48 Use defined CONFIG constants instead of looking up config from db 2018-10-03 10:56:02 -04:00
Dhanika Bulathsinhala e7790ebeef Documentation Improvements + Fixes (#2230) 
* get

* get
 2018-10-03 10:29:10 -04:00
Isaac Connor efda26121b allow login by username&password in request 2018-10-02 16:59:05 -04:00
Isaac Connor 5f89931774 Add grabbing original source tarball from github and overwriting the generated tarball with it. 2018-10-02 15:53:32 -04:00
Isaac Connor d2c2fbbfb9 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-02 15:19:31 -04:00
Isaac Connor 246f3755a2 Update docs regarding ppa for 1.32 and 1.32 not needing mysql config changes 2018-10-02 15:19:19 -04:00
Andy Bauer 5c6cf88d93 bump version to 1.32.1 2018-10-02 07:37:55 -05:00
Isaac Connor c9423aa902 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-01 10:40:20 -04:00
Isaac Connor 592f55a550 do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out. 2018-10-01 10:39:00 -04:00
Andrew Bauer 1978882825 dim x264 encode when on arm (#2227) 2018-10-01 09:17:22 -04:00
Isaac Connor 613d885930 != E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than != 2018-09-30 10:15:04 -04:00