Andrew Bauer
|
f3d3022323
|
Merge pull request #2250 from knight-of-ni/arm-pcs-vfp
check for __ARM_PCS_VFP instead of __armel__
|
2018-10-13 13:30:09 -05:00 |
Andrew Bauer
|
ba10c431f7
|
check for __ARM_PCS_VFP instead of __armel__
|
2018-10-12 09:34:16 -05:00 |
Andy Bauer
|
5b964ba3d5
|
create the upload folder if it does not exist
|
2018-10-11 15:57:25 -05:00 |
Andrew Bauer
|
71e150daae
|
add missing brackets around second expression in archImagePath
|
2018-10-11 14:32:40 -05:00 |
Isaac Connor
|
d1bef49d0b
|
Don't reload on a timeout when refreshing the navbar
|
2018-10-11 11:30:30 -04:00 |
Isaac Connor
|
ad71b0c626
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-11 11:28:17 -04:00 |
Isaac Connor
|
428b2506ec
|
Add .mp4 and snapshot files to glob for upload archive
|
2018-10-11 11:28:07 -04:00 |
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 |