Andrew Bauer
|
5c2e5d89ed
|
fix gpl mailing address
This makes rpmlint & lintian complain less
|
2018-11-15 19:53:45 -06:00 |
Isaac Connor
|
f72651da5a
|
Add auth hash to ajax fps and status calls in zone edit
|
2018-11-15 12:22:35 -05:00 |
|
Isaac Connor
|
aa8ac9c31c
|
spaces and quotes
|
2018-11-14 15:54:45 -05:00 |
|
Isaac Connor
|
3a409b26aa
|
Use buttons instead of anchor tags for Prev/Next/FIrst/Last buttons
|
2018-11-14 15:54:34 -05:00 |
|
Isaac Connor
|
3be31020b7
|
Automatically add width to frames view when thumbnails are turned on.
|
2018-11-14 15:54:01 -05:00 |
|
Isaac Connor
|
246765ced9
|
Add tooltip for sorting monitors
|
2018-11-11 16:23:19 -05:00 |
|
Isaac Connor
|
82abd04f36
|
Add type=button to buttons so they don't act like submit buttons
|
2018-11-07 13:19:42 -05:00 |
Andrew Bauer
|
a50c2bae35
|
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg
Audio only with ffmpeg
|
2018-11-03 20:39:18 -05: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
|
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
|
3723f7acb3
|
comment out redundatn code increasing load on server
|
2018-10-19 15:02:10 -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 |
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
|
be78cb1b34
|
correct falsepi=> false
|
2018-10-10 16:08:48 -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
|
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 |
|
Andrew Bauer
|
1978882825
|
dim x264 encode when on arm (#2227)
|
2018-10-01 09:17:22 -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
|
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
|
7ffb46302f
|
When events have the same starttime, sort secondly by Id
|
2018-09-26 14:10:49 -04:00 |
|
Andrew Bauer
|
b8a2e71bb6
|
use base64_encode for monitor probe
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
|
2018-09-21 12:00:03 -05:00 |
Andy Bauer
|
f53533e61e
|
fix populating onvif probe data
|
2018-09-20 10:30:23 -05:00 |
|
Isaac Connor
|
6181e52c47
|
gracefully handle non-existence of imageFeed
|
2018-09-20 09:07:28 -04:00 |
|
Isaac Connor
|
8a5c989cac
|
fix warning when editing users after a monitor has been deleted
|
2018-09-18 08:52:43 -04:00 |
|
Isaac Connor
|
b5b71edbf6
|
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
|
2018-09-14 14:26:45 -04:00 |
|
Andrew Bauer
|
c66dd25ebb
|
implement collapsible headers (#2203)
|
2018-09-11 17:39:40 -04:00 |
|
Isaac Connor
|
eef928a742
|
fix find_all => find
|
2018-09-11 14:31:03 -04:00 |
|
Isaac Connor
|
684f48979a
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-11 14:30:19 -04:00 |
|
Isaac Connor
|
8608fc97be
|
fix trms=>terms
|
2018-09-10 15:11:57 -04:00 |
|
Isaac Connor
|
0ee261fae3
|
get rid of code that hid the close/back button on events if there was no history.
|
2018-09-10 15:11:41 -04:00 |
|
Isaac Connor
|
534aebb21f
|
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
|
2018-09-09 16:36:09 -04:00 |
|
Isaac Connor
|
b8f6617db3
|
fix another instance of find_all
|
2018-09-09 12:15:06 -04:00 |
|
Isaac Connor
|
dfdac2ed70
|
make find and find_one functions consistent across Objects
|
2018-09-07 16:31:11 -04:00 |
|
Isaac Connor
|
f4c2d8adea
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-03 12:29:09 -04:00 |
|
Andrew Bauer
|
e5a2581dcc
|
optionhelp - support links markdown style (#2198)
|
2018-09-03 09:56:52 -04:00 |