Isaac Connor
|
e101aed2d5
|
Remove IGNORE keyword, it is invalid
|
2016-05-05 15:10:30 -04:00 |
Isaac Connor
|
24bf91707f
|
Database module should really use DBI
|
2016-05-03 10:22:38 -04:00 |
Isaac Connor
|
e80db4c433
|
Use zmDbConnect instead of duplicated db connect code
|
2016-05-03 10:22:16 -04:00 |
Isaac Connor
|
49e3d3be7a
|
Turn the config loading code from a BEGIN to a function that could be called repeatedly.
|
2016-05-03 10:21:50 -04:00 |
Isaac Connor
|
9406a2337f
|
Add a BEGIN section to load things in the correct order.
|
2016-05-03 10:21:01 -04:00 |
Isaac Connor
|
30f34a6f49
|
instead of code duplication for opening the db, use zmDbConnect everywhere
|
2016-05-03 08:59:40 -04:00 |
Isaac Connor
|
55d58a140e
|
instead of code duplication for opening the db, use zmDbConnect everywhere
|
2016-05-03 08:57:51 -04:00 |
Isaac Connor
|
01aa2c9319
|
change permissions to stream permissions for view
|
2016-05-02 19:48:24 -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
|
75f9fde920
|
rough in Server object support
|
2016-05-02 10:41:25 -04: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 |
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
|
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
|
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
|
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
|
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 |
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 |
Andrew Bauer
|
fe9cb4b7ec
|
Merge pull request #1442 from ZoneMinder/fix_rotate
Fix rotate
|
2016-04-26 09:54:01 -05:00 |
Isaac Connor
|
2d8c484792
|
rotate dimensions when instantiating the Monitor object
|
2016-04-25 16:48:26 -04:00 |
Isaac Connor
|
8c53925fdc
|
redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions.
|
2016-04-25 16:00:34 -04:00 |
Isaac Connor
|
85798932ee
|
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
|
2016-04-25 14:10:26 -04:00 |
Isaac Connor
|
26a45d5fa9
|
Don't rotate dimensions when constructing the monitor because they are already rotated
|
2016-04-25 13:55:28 -04:00 |
Steve Gilvarry
|
4ca61b7bd8
|
Removed 180 lines of commented out code that has been hanging around
in here for a long time.
|
2016-04-25 22:12:49 +10:00 |
Andrew Bauer
|
1072327dd1
|
remove extra quote
|
2016-04-21 08:01:13 -05:00 |
Andrew Bauer
|
41a68bdc6d
|
Merge branch 'dreaddy-1128_ssmtp_mail_option'
|
2016-04-21 07:27:39 -05:00 |
Andrew Bauer
|
3a9ab7f685
|
Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option
|
2016-04-21 07:27:19 -05:00 |
Isaac Connor
|
02a56b811b
|
Don't be recursive when chowning /var/cache/zoneminder
|
2016-04-20 14:38:51 -04:00 |
Andrew Bauer
|
81757a0465
|
Merge pull request #1418 from pliablepixels/1417-clone-monitor
Clone feature added
|
2016-04-20 13:02:10 -05:00 |
Isaac Connor
|
67f38d07df
|
Merge branch 'master' into better_zmvideo
|
2016-04-20 12:04:15 -04:00 |
Isaac Connor
|
5a3978f9e8
|
Merge pull request #1422 from abishai/master
suppress warnings of killall for FreeBSD
|
2016-04-19 14:40:37 -04:00 |
Isaac Connor
|
b2d02a64f4
|
reload stream after error
|
2016-04-19 12:02:58 -04:00 |
Isaac Connor
|
e255fcc603
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-04-17 09:30:17 -04:00 |
Isaac Connor
|
d424a297c4
|
need php5-gd
|
2016-04-17 09:29:55 -04:00 |