Isaac Connor
|
1f6425b1b7
|
Fix for SQL to load next and previous event
|
2016-05-05 14:50:15 -04:00 |
|
Isaac Connor
|
0e74778dda
|
add find and find_all functions
|
2016-05-05 14:49:57 -04:00 |
|
Isaac Connor
|
df960bb1ea
|
rework image.php view to properly handle fid being the FrameId instead of fid. Fix scaling.
|
2016-05-05 14:49:40 -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
|
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
|
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 |
|
Isaac Connor
|
4aafd1d417
|
Make api use zm.conf
|
2016-04-30 13:50:09 -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
|
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
|
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
|
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 |
|
Isaac Connor
|
24e3306955
|
master master
|
2016-04-28 09:20:56 -04:00 |
|
Steve Gilvarry
|
af361042ef
|
Merge pull request #1446 from ZoneMinder/stdstring_instead_of_c_string
use std::string instead of C strings. Mostly this will quiet build wa…
|
2016-04-28 22:13:44 +10:00 |
|
Steve Gilvarry
|
6bf43631e2
|
Merge pull request #1428 from ZoneMinder/better_zmvideo
Better zmvideo
|
2016-04-28 22:00:52 +10:00 |
|
Steve Gilvarry
|
6549f7bf29
|
Merge pull request #1403 from ZoneMinder/fix_grant
Fix grant
|
2016-04-28 21:49:21 +10:00 |
|
Steve Gilvarry
|
ac5fdb8956
|
Merge pull request #1421 from connortechnology/fix_events_pagination
remove the if(pages>1) so that the if > line always happens
|
2016-04-28 21:43:54 +10:00 |
|
Steve Gilvarry
|
d9fd0faa32
|
Merge pull request #1447 from ZoneMinder/simplify_zm_signal
Simplify zm signal
|
2016-04-28 21:37:55 +10:00 |
|
Isaac Connor
|
386afc3546
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-26 20:02:04 -04:00 |
|
Isaac Connor
|
69d5065ebf
|
move ip down as well
|
2016-04-26 16:05:37 -04:00 |
|
Isaac Connor
|
5d88acb8a6
|
re-arrange a few lines to remove some duplicate ifdef's. And move the cr2 def into the area that uses it to remove build warnings on freebsd
|
2016-04-26 16:03:26 -04:00 |
|
Isaac Connor
|
7d7249f328
|
use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows
|
2016-04-26 15:48:21 -04:00 |
|
Isaac Connor
|
ff3e9c85d9
|
Merge pull request #1445 from abishai/master
unbreak build under FreeBSD 32 bit II
|
2016-04-26 15:09:22 -04:00 |
|
Isaac Connor
|
010f748016
|
fix clone merge
|
2016-04-26 15:02:34 -04:00 |
abi
|
9aff84fbbb
|
unbreak build under FreeBSD 32 bit II
|
2016-04-26 21:53:50 +03:00 |
|
Isaac Connor
|
d847d66e99
|
handle disk_free_space error
|
2016-04-26 14:40:40 -04:00 |
|
Isaac Connor
|
0adbaafd98
|
Merge branch 'master' into storageareas
|
2016-04-26 13:10:37 -04:00 |
Andrew Bauer
|
fe9cb4b7ec
|
Merge pull request #1442 from ZoneMinder/fix_rotate
Fix rotate
|
2016-04-26 09:54:01 -05:00 |