Steve Gilvarry
|
02013cef94
|
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue
|
2016-05-03 21:15:46 +10:00 |
|
Steve Gilvarry
|
8aa1cb6bf6
|
WIP packetqueue shared memory
|
2016-05-03 20:07:45 +10:00 |
Isaac Connor
|
01aa2c9319
|
change permissions to stream permissions for view
|
2016-05-02 19:48:24 -04:00 |
|
Isaac Connor
|
e53bd1292e
|
increase events list width to accomodate thumbnails
|
2016-05-02 14:30:54 -04:00 |
|
Isaac Connor
|
240d08133d
|
implement caching of scaled images.
|
2016-05-02 14:12:30 -04:00 |
|
Isaac Connor
|
fe63e4af80
|
remove extra semi colon
|
2016-05-02 13:42:42 -04:00 |
|
Isaac Connor
|
550fdc9295
|
change thumbnail path to specify eid and fid instead of path to the jpg.
|
2016-05-02 13:42:15 -04:00 |
|
Isaac Connor
|
b8c8ff3807
|
fix if structuring
|
2016-05-02 13:36:19 -04:00 |
Isaac Connor
|
5321fe35bd
|
Merge pull request #1321 from SteveGilvarry/ffmpeg3_deprecation
FFMPEG 3.0 deprecation fixes
|
2016-05-02 12:44:16 -04:00 |
Isaac Connor
|
341ebc7b45
|
Merge branch 'master' into bind_fixes
|
2016-05-02 12:39:55 -04:00 |
|
Isaac Connor
|
b38aa60209
|
fix height of function popup
|
2016-05-02 11:56:42 -04:00 |
|
Isaac Connor
|
79572270d3
|
bump version
|
2016-05-02 10:46:23 -04:00 |
|
Isaac Connor
|
75f9fde920
|
rough in Server object support
|
2016-05-02 10:41:25 -04:00 |
|
Isaac Connor
|
9d6a7541c8
|
add Id column to storage areas
|
2016-05-02 10:40:42 -04:00 |
|
Isaac Connor
|
00f38cdd1b
|
version bump
|
2016-05-02 10:39:41 -04:00 |
|
Isaac Connor
|
272e1da958
|
rough in Server object support
|
2016-05-02 10:37:19 -04:00 |
|
Steve Gilvarry
|
bdbc7a9d94
|
Merge pull request #1454 from SteveGilvarry/h264-fixes
h264 Fix dropped part of sql query.
|
2016-05-01 16:09:05 +10:00 |
|
Steve Gilvarry
|
b9a6273f32
|
Fix dropped part of sql query.
|
2016-05-01 15:59:53 +10:00 |
|
Steve Gilvarry
|
97a4cf0852
|
Add the changes...doh
|
2016-05-01 15:06:45 +10:00 |
|
Steve Gilvarry
|
d7f7a0f074
|
Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
|
2016-05-01 13:46:09 +10:00 |
|
Isaac Connor
|
943bce788c
|
Merge pull request #1452 from SteveGilvarry/feature-h264-videostorage
Merge master to feature-h264-videostorage
|
2016-04-30 19:31:41 -04:00 |
|
Isaac Connor
|
4aafd1d417
|
Make api use zm.conf
|
2016-04-30 13:50:09 -04:00 |
Isaac Connor
|
408fba8d24
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-30 10:09:52 -04:00 |
|
Steve Gilvarry
|
da157f5a1a
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-04-30 22:27:10 +10:00 |
|
Isaac Connor
|
ce69f24bdd
|
use zm.conf values for database connection
|
2016-04-30 08:11:39 -04:00 |
|
Isaac Connor
|
532fb77ecb
|
As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes
|
2016-04-30 08:09:56 -04:00 |
|
Isaac Connor
|
0044161b9c
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-04-29 10:46:37 -04:00 |
|
Isaac Connor
|
be5f0cd4a9
|
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
|
2016-04-29 10:44:46 -04:00 |
|
Isaac Connor
|
819dad455e
|
whitespace/tabs
|
2016-04-29 09:11:14 -04:00 |
|
Isaac Connor
|
b41a3b1b25
|
fix tabs/shiftwidth
|
2016-04-29 09:01:28 -04:00 |
|
Isaac Connor
|
5eebc50bfb
|
tabs to spaces
|
2016-04-29 08:57:31 -04:00 |
|
Isaac Connor
|
728bffa6a0
|
Check and set audio to mono
|
2016-04-29 08:52:25 -04:00 |
|
Isaac Connor
|
af66105c37
|
Merge branch 'master' into storageareas
|
2016-04-29 08:28:53 -04:00 |
|
Steve Gilvarry
|
513d1568d0
|
Merge pull request #1444 from ZoneMinder/handle_disk_free_space_error
handle disk_free_space error
|
2016-04-29 21:36:29 +10:00 |
|
Steve Gilvarry
|
e73935a15b
|
Clean up extraneous avutil include
|
2016-04-29 21:29:07 +10:00 |
|
Steve Gilvarry
|
8452c4bce5
|
Fix tab to spaces merge issues
|
2016-04-29 21:27:28 +10:00 |
|
Steve Gilvarry
|
66a3fef61e
|
Merge pull request #1384 from ZoneMinder/tabs_to_spaces
tabs to spaces and use 2space indenting
|
2016-04-29 19:27:12 +10:00 |
|
Isaac Connor
|
097e7f3906
|
Merge branch 'master' into storageareas
|
2016-04-28 16:40:44 -04:00 |
|
Isaac Connor
|
0dc2987b84
|
add some error checking, but fix the call to bind which really should have a +1 in it.
|
2016-04-28 16:32:50 -04:00 |
|
Isaac Connor
|
d06a0cf2a4
|
2016042801 build
|
2016-04-28 12:58:09 -04:00 |
|
Isaac Connor
|
30b3fa8a8b
|
add a cast to help the compile figure out which function to use
|
2016-04-28 12:57:38 -04:00 |
|
Isaac Connor
|
1096461793
|
Need a cast to handle old avformat
|
2016-04-28 12:57:14 -04:00 |
|
Isaac Connor
|
1282e36bb2
|
av_get_media_type_string is not available in trusty
|
2016-04-28 12:56:40 -04:00 |
|
Isaac Connor
|
337d8a748c
|
simplify the separator stuff
|
2016-04-28 12:56:19 -04:00 |
|
Isaac Connor
|
a141064aad
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-28 11:34:49 -04:00 |
|
Isaac Connor
|
c4410c512a
|
Merge branch 'master' into fix_event_menubars
|
2016-04-28 09:35:58 -04:00 |
|
Isaac Connor
|
fac07cba6d
|
Merge branch 'master' into tabs_to_spaces
|
2016-04-28 09:31:40 -04:00 |
|
Isaac Connor
|
629f141734
|
Merge pull request #1441 from SteveGilvarry/remove_commented_code
Delete large commented out code segment
|
2016-04-28 09:30:43 -04:00 |
|
Isaac Connor
|
5e20831030
|
Don't return of disk_free_space returns false, just log it.
|
2016-04-28 09:29:40 -04:00 |
|
Isaac Connor
|
59406fd03a
|
Merge branch 'master' into storageareas
|
2016-04-28 09:24:36 -04:00 |