Isaac Connor
|
9148d3f7c4
|
Merge branch 'zone_point_buttons' into storageareas
|
2018-10-24 12:44:21 -04:00 |
|
Isaac Connor
|
15f89c4b50
|
Turn ffmpeg logging back on
|
2018-10-24 12:44:14 -04:00 |
|
Isaac Connor
|
9cf31eafa0
|
Use a button element instead of an anchor tag for plus and minus point buttons. Cleanup dead code
|
2018-10-24 12:43:43 -04:00 |
|
Isaac Connor
|
875bc3caf9
|
Merge branch 'master' into storageareas
|
2018-10-24 10:17:27 -04:00 |
|
Isaac Connor
|
ca8770bd5a
|
Merge branch 'fix_rce' into storageareas
|
2018-10-24 10:17:16 -04:00 |
|
Isaac Connor
|
6488122862
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-24 10:03:11 -04:00 |
|
Isaac Connor
|
115141bf9f
|
add caching to Group::find
|
2018-10-24 10:02:42 -04:00 |
|
Isaac Connor
|
2024df4393
|
use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272
|
2018-10-24 09:49:56 -04:00 |
raTmole
|
18850d8779
|
API getVersion Fix -> Undefined variable: eTagMatches... (#2268)
see https://github.com/cakephp/cakephp/issues/12536
|
2018-10-23 07:58:07 -04:00 |
|
Isaac Connor
|
86b0e4ea18
|
fix auth_hash. Should use generateAuthHash instead of accessing session directly
|
2018-10-22 18:32:39 -04:00 |
Isaac Connor
|
9938346752
|
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
|
2018-10-22 16:14:36 -04:00 |
|
Isaac Connor
|
7b69bc4292
|
Merge branch 'master' of github.com:/connortechnology/ZoneMinder
|
2018-10-22 16:13:55 -04:00 |
|
Isaac Connor
|
f4ddc0fe9b
|
ob_clcean and flush break outputting the image
|
2018-10-22 16:13:12 -04:00 |
|
Isaac Connor
|
ccd64b0fae
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-22 14:21:34 -04:00 |
|
Isaac Connor
|
7e4c54fec0
|
Use proper buttons and remove extra bootstrap styles from buttons so that they aren't all jammed together
|
2018-10-22 13:54:27 -04:00 |
|
Isaac Connor
|
0f14df64e2
|
google code style and whitespace
|
2018-10-22 10:41:27 -04:00 |
Isaac Connor
|
559f34a838
|
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
|
2018-10-20 14:33:09 -04:00 |
|
Isaac Connor
|
069f67a10f
|
Break some long lines
|
2018-10-20 14:32:58 -04:00 |
|
Isaac Connor
|
c9c46aa12d
|
User Monitor->Url() instead of Monitor->Server->Url() which will append port #
|
2018-10-20 14:32:25 -04:00 |
|
Isaac Connor
|
f5eca2da1e
|
No longer need to add thisUrl to monitorUrl
|
2018-10-20 11:37:36 -04:00 |
|
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
|
c47b4a5a04
|
Merge branch 'improve_config_efficiency' into storageareas
|
2018-10-19 15:03:00 -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
|
98579fc02a
|
Merge branch 'master' into storageareas
|
2018-10-19 11:27:43 -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 |
|
Isaac Connor
|
88b9a1b259
|
Don't auto enable show privacy
|
2018-10-18 08:49:13 -04:00 |
|
Isaac Connor
|
372c6b7f69
|
explicitly call ZoneMinder::Database::zmDbDisconnect
|
2018-10-17 20:57:24 -04:00 |
|
Isaac Connor
|
17726bbe38
|
Actually say how big the ImageBufferCOunt should be
|
2018-10-17 17:19:27 -04:00 |
|
Isaac Connor
|
b0078fb1d9
|
whitespace, get rid of redundant ajax startup
|
2018-10-16 17:20:10 -04:00 |
Pliable Pixels
|
f7de3a87e2
|
show event notes in same event view (#2259)
|
2018-10-16 12:11:25 -04:00 |
|
Isaac Connor
|
c2af380e29
|
Merge branch 'master' into storageareas
|
2018-10-16 11:39:26 -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 |
|
Isaac Connor
|
5fce783b65
|
Merge branch 'smarter_packetqueue' into storageareas
|
2018-10-15 11:34:05 -04:00 |
|
Isaac Connor
|
990c4b1b45
|
Add a warning when there are more videoframes in the packetqueue than image_buffers
|
2018-10-15 11:33:58 -04:00 |
|
Isaac Connor
|
dae31d226b
|
add GetImageBufferCount to monitor
|
2018-10-15 11:33:16 -04:00 |
|
Isaac Connor
|
33c903a644
|
properly initialize packet_counts
|
2018-10-15 11:13:10 -04:00 |
|
Isaac Connor
|
7149576a7c
|
Merge branch 'smarter_packetqueue' into storageareas
|
2018-10-15 10:59:50 -04:00 |