Isaac Connor
|
1dac088000
|
Merge branch 'audio_only_with_ffmpeg' into storageareas
|
2018-10-31 14:48:24 -04:00 |
|
Isaac Connor
|
589b6f3eef
|
add further note about needing h264 passthrough
|
2018-10-31 11:35:06 -04:00 |
|
Isaac Connor
|
69f7d36729
|
Make it clear that audio recording is only for ffmpeg input type
|
2018-10-31 11:34:30 -04:00 |
|
Isaac Connor
|
80cfb02570
|
Merge branch 'warn_colour_when_disabled' into storageareas
|
2018-10-30 12:05:47 -04:00 |
|
Isaac Connor
|
f95379742b
|
Use a warning colour when motion detection is disabled.
|
2018-10-30 12:04:05 -04:00 |
|
Isaac Connor
|
9148d3f7c4
|
Merge branch 'zone_point_buttons' into storageareas
|
2018-10-24 12:44:21 -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
|
ca8770bd5a
|
Merge branch 'fix_rce' into storageareas
|
2018-10-24 10:17:16 -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 |
|
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
|
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
|
c47b4a5a04
|
Merge branch 'improve_config_efficiency' into storageareas
|
2018-10-19 15:03:00 -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
|
98579fc02a
|
Merge branch 'master' into storageareas
|
2018-10-19 11:27:43 -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
|
37a48550e5
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-10-18 08:57:29 -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
|
7149576a7c
|
Merge branch 'smarter_packetqueue' into storageareas
|
2018-10-15 10:59:50 -04:00 |
|
Isaac Connor
|
be78cb1b34
|
correct falsepi=> false
|
2018-10-10 16:08:48 -04:00 |
|
Isaac Connor
|
2881d2af3f
|
Merge branch 'master' into storageareas
|
2018-10-10 14:13:27 -04: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
|
c58f043998
|
Add a mouseover tooltip saying Toggle Filters on up arrow
|
2018-10-10 14:12:16 -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
|
48e805c09f
|
Make header flips perisisent based on cookie
|
2018-10-10 13:11:27 -04:00 |
|
Isaac Connor
|
229315fc92
|
Merge branch 'add_archive_filter_to_montagereview' into storageareas
|
2018-10-09 11:10: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 |
|
Isaac Connor
|
217d1e44ba
|
Rough in an archived status filter in montagereview.
|
2018-10-09 11:06:54 -04:00 |
|
Isaac Connor
|
015890a509
|
Merge branch 'master' into storageareas
|
2018-10-02 15:27:12 -04:00 |
Andrew Bauer
|
1978882825
|
dim x264 encode when on arm (#2227)
|
2018-10-01 09:17:22 -04:00 |
|
Isaac Connor
|
33bd30fbbd
|
Merge branch 'master' into storageareas
|
2018-09-28 13:40:18 -04:00 |
|
Isaac Connor
|
c88dc690a6
|
Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order.
|
2018-09-28 13:24:50 -04:00 |
|
Isaac Connor
|
c481fc868f
|
be more robust when curFrames is empty.
|
2018-09-28 11:25:19 -04:00 |
|
Isaac Connor
|
da6a142d12
|
Merge branch 'master' into storageareas
|
2018-09-27 14:21:43 -04:00 |
|
Isaac Connor
|
c5c01d56be
|
fix unsetting fixed width/height/layout. Since they are actually controlled by cookies, the session will overwrite when we try to unset the cookie. Also fix some missing ;'s
|
2018-09-27 14:20:41 -04:00 |
|
Isaac Connor
|
e0dc8a5f6b
|
Merge branch 'master' into storageareas
|
2018-09-27 13:54:53 -04:00 |
|
Isaac Connor
|
7ffb46302f
|
When events have the same starttime, sort secondly by Id
|
2018-09-26 14:10:49 -04:00 |
|
Isaac Connor
|
2399615a0a
|
When events have the same starttime, sort secondly by Id
|
2018-09-26 14:10:21 -04:00 |
|
Isaac Connor
|
438b582d35
|
Merge branch 'add_export_to_filter' into storageareas
|
2018-09-25 16:11:19 -04:00 |
Isaac Connor
|
53f4276cb7
|
add thumbnails and an mp4 download in the events list
|
2018-09-25 16:00:01 -04:00 |
|
Isaac Connor
|
6aaa0fe39f
|
Merge branch 'add_export_to_filter' of github.com:/connortechnology/ZoneMinder into add_export_to_filter
|
2018-09-25 14:57:13 -04:00 |