Isaac Connor
|
3237a10d0a
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2018-10-20 11:36:45 -04:00 |
|
Isaac Connor
|
8878397622
|
fix spacing
|
2018-10-20 11:36:25 -04:00 |
Isaac Connor
|
530a53f138
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-19 15:02:31 -04:00 |
|
Isaac Connor
|
3723f7acb3
|
comment out redundatn code increasing load on server
|
2018-10-19 15:02:10 -04:00 |
|
Isaac Connor
|
4c7fe8741b
|
Load the complete config info only for options
|
2018-10-19 15:00:47 -04:00 |
|
Isaac Connor
|
e30b100e8e
|
Don't load & process categories in initial config loading
|
2018-10-19 15:00:30 -04:00 |
|
Isaac Connor
|
17a5519dd6
|
Include the remoteAddr in the session authhash cache, so that a change of ip won't allow the same useless auth hash. (#2264)
|
2018-10-19 13:39:37 -04:00 |
|
Isaac Connor
|
f9b1453705
|
Include SERVER_PORT when not doing multi-server or multi-port but are running on a port other than 80.
|
2018-10-19 10:59:16 -04:00 |
|
Isaac Connor
|
23fd5db5c8
|
fix #2265 extra graphics in url
|
2018-10-19 10:06:51 -04:00 |
|
Isaac Connor
|
e7ec2faccd
|
monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url
|
2018-10-18 20:33:50 -04:00 |
|
Isaac Connor
|
4fdac25ae1
|
remove blank last line
|
2018-10-18 09:20:15 -04:00 |
|
Isaac Connor
|
37a48550e5
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-18 08:57:29 -04:00 |
Pliable Pixels
|
f7de3a87e2
|
show event notes in same event view (#2259)
|
2018-10-16 12:11:25 -04:00 |
|
Isaac Connor
|
1b9b2811b3
|
remove ? from streamCmdParms. Mootools adds it in so this gives us a double ?
|
2018-10-16 11:39:16 -04:00 |
|
Isaac Connor
|
5b4afcc169
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-16 09:47:38 -04:00 |
|
Isaac Connor
|
37065d15ac
|
fix url to api in monitor restart.
|
2018-10-16 09:47:24 -04:00 |
Verdi R-D
|
6a748e0978
|
Fixed cambozola typo (#2252)
|
2018-10-15 17:15:31 -04:00 |
|
Verdi R-D
|
325405b0b8
|
Added monitor preset for D-link DCS-930L (#2255)
* added monitor preset for d-link dcs-930l
* moved update to new database update version
|
2018-10-15 17:14:57 -04:00 |
Andy Bauer
|
5b93b77499
|
bump verion to 1.32.2
|
2018-10-13 13:36:15 -05:00 |
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 |
Erik Schoepplenberg
|
8e132a4f3f
|
Merge pull request #1 from ZoneMinder/master
Update from master
|
2018-10-09 16:51:25 -04:00 |
|
Isaac Connor
|
ff00f15b58
|
add missing ;
|
2018-10-09 11:10:09 -04:00 |