Andrew Bauer
|
627b838fc4
|
Merge pull request #1565 from SteveGilvarry/avdict
Enable local and travis ccache
|
2016-07-29 09:34:11 -05:00 |
Steve Gilvarry
|
e0e49a2734
|
Merge pull request #1511 from TJC/feature/improve_docker
Improve Docker features
|
2016-07-30 00:30:49 +10:00 |
|
Steve Gilvarry
|
1a684b7709
|
Remove whitespace
|
2016-07-28 23:22:34 +10:00 |
|
Steve Gilvarry
|
71e3789bd0
|
Use av_dict_parse_string to split ffmpeg options, and remove creating strings to split them in next step for rtsp_transport
|
2016-07-28 23:15:01 +10:00 |
|
Steve Gilvarry
|
e7aed10f77
|
Merge pull request #1564 from pliablepixels/api-config-edit-example
Added example of configs API edit
|
2016-07-28 11:45:26 +10:00 |
Isaac Connor
|
45fadaf297
|
Use Monitor Id instead of Name when writing diag images. The name symlink might not exist
|
2016-07-26 13:08:32 -04:00 |
|
Isaac Connor
|
541f879b26
|
when time_base is not set in codec, set it to video_st->time_base
|
2016-07-25 21:42:50 -04:00 |
|
Isaac Connor
|
c58c3efcf5
|
fix to
|
2016-07-25 15:34:53 -04:00 |
|
Isaac Connor
|
b9bba6bde5
|
fix to
|
2016-07-25 15:32:57 -04:00 |
Isaac Connor
|
8db20a4543
|
change test for prevDTS >= dts to just prevDTS > dts
|
2016-07-25 13:23:44 -04:00 |
Jon Gerdes
|
ee720c4561
|
Control script for Keekoon cameras. Tested with KK002.
|
2016-07-25 11:20:49 +01:00 |
|
Steve Gilvarry
|
0234e82396
|
Enable local and travis ccache
|
2016-07-24 09:26:10 +10:00 |
|
Isaac Connor
|
b9a15d1465
|
fix missed to conversion
|
2016-07-23 13:37:00 -04:00 |
Pliable Pixels
|
dc916bba2c
|
case typo
|
2016-07-23 08:04:46 -04:00 |
|
Pliable Pixels
|
45a62dc8d8
|
Added example of configs API edit
|
2016-07-23 08:03:15 -04:00 |
|
Isaac Connor
|
4c1c95e3a5
|
only include the state if canEdit(system) otherwise it gives an auth error
|
2016-07-22 16:04:42 -04:00 |
|
Isaac Connor
|
32f9b2755e
|
add more height to the logout popup
|
2016-07-22 16:04:18 -04:00 |
|
Isaac Connor
|
8194876454
|
always put popup links in a, even if it is disabled
|
2016-07-22 16:03:57 -04:00 |
|
Isaac Connor
|
6d1f85bcd6
|
fix spacing and code style, and when logging in, change view to console
|
2016-07-22 16:03:39 -04:00 |
|
Isaac Connor
|
9262d9d14e
|
remove debug messages on css changing
|
2016-07-22 16:02:55 -04:00 |
|
Isaac Connor
|
3504c1d8f5
|
Add Id to the title for each monitor
|
2016-07-21 15:02:01 -04:00 |
|
Isaac Connor
|
440f8fafdd
|
implement object based versions of getImageSrc and creatListThumbnail
|
2016-07-20 15:21:23 -04:00 |
|
Isaac Connor
|
8c8461a88e
|
Update to use Event object and object based createListThumbnail function
|
2016-07-20 15:20:51 -04:00 |
|
Isaac Connor
|
b1d0223c30
|
implement human_filesize
|
2016-07-20 15:20:21 -04:00 |
|
Isaac Connor
|
bce7369984
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-07-19 17:36:15 -04:00 |
|
Isaac Connor
|
cd43d1fa7a
|
Rough in Event disk space reporting
|
2016-07-19 17:34:01 -04:00 |
|
Isaac Connor
|
a089f11014
|
add more NULL columns
|
2016-07-19 17:17:11 -04:00 |
|
Steve Gilvarry
|
14437189ca
|
Merge pull request #5 from knnniggett/patch-1
Update zoneminder.init
|
2016-07-18 21:04:51 +10:00 |
|
Steve Gilvarry
|
d9292319fd
|
Merge pull request #1563 from SteveGilvarry/feature-h264-videostorage
Merge Master to feature-h264-videostorage
|
2016-07-17 10:02:14 +10:00 |
|
Steve Gilvarry
|
b9a48eb464
|
Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.
|
2016-07-17 08:11:53 +10:00 |
|
Isaac Connor
|
4caa20821a
|
fix
|
2016-07-14 11:57:06 -04:00 |
|
Isaac Connor
|
eb0ddc4e32
|
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
|
2016-07-14 11:55:27 -04:00 |
|
Isaac Connor
|
be1083e007
|
add more fields that can be NULL
|
2016-07-14 10:28:00 -04:00 |
|
Isaac Connor
|
14d8496972
|
add NULL test for RTSPDesribe
|
2016-07-14 10:27:24 -04:00 |
|
Isaac Connor
|
b6c02b563b
|
turn off host validation
|
2016-07-14 10:22:09 -04:00 |
|
Isaac Connor
|
b7096b742d
|
implement some checks for valid values when opening the output file
|
2016-07-13 15:29:29 -04:00 |
|
Isaac Connor
|
df6aaf5dec
|
bump to 1.30.4
|
2016-07-13 12:45:35 -04:00 |
|
Isaac Connor
|
f68527674a
|
merge Steve's tree, which allegedly fixes the header problems
|
2016-07-13 12:38:12 -04:00 |
Dmitry Smirnov
|
aed3c3d29a
|
reduce noise on "zmupdate.pl" invocation
|
2016-07-14 00:43:32 +10:00 |
|
Dmitry Smirnov
|
f1acc52913
|
spellcheck/codespell
|
2016-07-14 00:30:39 +10:00 |
|
Isaac Connor
|
8eac8a1e1a
|
Merge branch 'master' into storageareas
|
2016-07-13 09:50:30 -04:00 |
|
Steve Gilvarry
|
b05eabfe1d
|
Forgot that I was trying to solve case of stream is true and record_audio
is false.
|
2016-07-13 08:31:10 +10:00 |
|
Andrew Bauer
|
59cc952cef
|
Merge pull request #1557 from ZoneMinder/fix_zmvideo
restore the behaviour where the generated file names are printed to stdout
|
2016-07-12 15:06:57 -05:00 |
|
Isaac Connor
|
85c0377280
|
When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it
|
2016-07-12 14:21:54 -04:00 |
|
Isaac Connor
|
1e2ec7028e
|
better debugging. add back deleting of zmswap files. detaint them so that they can be deleted. Use Objects to fix up deleting events
|
2016-07-12 14:16:20 -04:00 |
|
Isaac Connor
|
91ef963738
|
add case for no rotation to get rid of log message
|
2016-07-12 12:06:12 -04:00 |
|
Isaac Connor
|
26369268bb
|
merge Steve's updates, work on zmaudit
|
2016-07-12 11:27:25 -04:00 |
|
Isaac Connor
|
a30610fbda
|
Merge branch 'master' into storageareas
|
2016-07-12 10:31:10 -04:00 |
|
Isaac Connor
|
7ff7684da6
|
add back deban install docs
|
2016-07-12 10:31:05 -04:00 |
|
Isaac Connor
|
410e154b7f
|
code style
|
2016-07-12 10:29:40 -04:00 |