Isaac Connor
|
b2435e3000
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-15 17:20:56 -05:00 |
|
Isaac Connor
|
5db6e8cbb3
|
add auto-uploading to zmrepo for jessie
|
2017-01-15 17:20:40 -05:00 |
Andy Bauer
|
4325e8f7ea
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
|
2017-01-15 15:49:46 -06:00 |
|
Andy Bauer
|
49c35d5733
|
packpack - f24,f25,el7 confirmed working
|
2017-01-15 15:48:57 -06:00 |
|
Isaac Connor
|
c5ad62b9fc
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-15 14:24:58 -05:00 |
|
Isaac Connor
|
29acad163c
|
Add some casts to quiet warnings. The warnings happen because we are doing arithmetic on pointers.
|
2017-01-15 14:24:50 -05:00 |
Isaac Connor
|
6be61403f5
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-01-15 14:07:55 -05:00 |
|
Isaac Connor
|
f16fdb8b21
|
Merge branch 'update_do_debian_release' into storageareas
|
2017-01-15 14:07:37 -05:00 |
|
Isaac Connor
|
b7ee64ff41
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-15 13:35:45 -05:00 |
|
Isaac Connor
|
a30af05bcf
|
change parameters to use -o= or --option= and add interactive flag
|
2017-01-15 12:18:51 -05:00 |
|
Andrew Bauer
|
418995df84
|
rpm specfile changes
need to put this back in to maintain compatibility with packpack
|
2017-01-15 09:59:17 -06:00 |
|
Isaac Connor
|
052807aaf5
|
remove extra my
|
2017-01-15 10:57:39 -05:00 |
|
Isaac Connor
|
c79dfb6a16
|
fix typos
|
2017-01-15 10:56:57 -05:00 |
|
Isaac Connor
|
4973d8c74c
|
add support for connect options
|
2017-01-15 10:54:46 -05:00 |
|
Isaac Connor
|
d24d151f53
|
Slurp db update file in and do() it instead of calling mysql
|
2017-01-15 10:54:23 -05:00 |
|
Andrew Bauer
|
b3ee97ad11
|
Merge pull request #1753 from jbehrends/docker_apache_fix
Docker - Fixed broken cgi-bin path in apache site conf.
|
2017-01-14 20:38:33 -06:00 |
Josh Behrends
|
41f5ee5032
|
Fixed broken cgi-bin path
|
2017-01-14 16:35:46 -08:00 |
|
Andy Bauer
|
08d4d0c5c2
|
packpack - auto retrieve zmrepo rpm
|
2017-01-14 16:35:56 -06:00 |
|
Andy Bauer
|
7d91b4cdc7
|
minor changes to packpack patch
|
2017-01-14 16:24:55 -06:00 |
|
Isaac Connor
|
899b1b82b9
|
Merge branch 'filter_by_runstate' into storageareas
|
2017-01-14 17:07:20 -05:00 |
|
Isaac Connor
|
8d02607a90
|
add an update script to add StateId to Events table
|
2017-01-14 16:58:22 -05:00 |
|
Isaac Connor
|
242e5a56d8
|
rough in the ability to filter on RunState
|
2017-01-14 16:55:28 -05:00 |
|
Isaac Connor
|
80c948b61e
|
Merge pull request #1751 from knnniggett/pp_files
initial commit for packpack support
|
2017-01-14 16:44:05 -05:00 |
Andrew Bauer
|
3ae7038e3b
|
make the build script executable
|
2017-01-14 14:15:54 -06:00 |
|
Andrew Bauer
|
105e43fafd
|
initial commit for packpack support
|
2017-01-14 14:14:41 -06:00 |
|
Isaac Connor
|
5df5698e7a
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-14 10:54:15 -05:00 |
|
Isaac Connor
|
babe4f07fb
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-14 10:53:49 -05:00 |
|
Isaac Connor
|
27d764909f
|
Merge branch 'update_do_debian_release' into storageareas
|
2017-01-14 10:53:11 -05:00 |
|
Isaac Connor
|
d7f81393a8
|
fixes to detect and use environment variables for AUTHOR and debsign keys
|
2017-01-14 10:53:05 -05:00 |
|
Isaac Connor
|
b8dcebadd5
|
remove iconnor references
|
2017-01-14 10:01:55 -05:00 |
|
Isaac Connor
|
01e75a746d
|
Merge branch 'update_do_debian_release' into storageareas
|
2017-01-14 09:59:02 -05:00 |
|
Isaac Connor
|
e3f073b275
|
update to add binary options, dput to ppa and use alternate fork. Also support newer distros and wheezy.
|
2017-01-14 09:58:36 -05:00 |
|
Isaac Connor
|
2ce4bad39b
|
fix Event being undefined when called by path
|
2017-01-13 14:42:10 -05:00 |
|
Isaac Connor
|
21c1e1d26f
|
add a call to av_interleaved_write_Frame to clear out the queues in the destructor
|
2017-01-13 14:37:18 -05:00 |
|
Isaac Connor
|
ac32b001e9
|
use a real variable for the file handle so that it sticks around.
|
2017-01-12 13:05:39 -05:00 |
|
Isaac Connor
|
c97ecc2a38
|
remove debug line
|
2017-01-12 13:04:44 -05:00 |
|
Isaac Connor
|
a5cdfd2932
|
call loadMonitors at the beginning. Otherwise we may not know about a monitor while handling a message from it.
|
2017-01-12 13:03:53 -05:00 |
|
Isaac Connor
|
513cd68c20
|
remove the verified caching. It makes calling zmMemVerify useless.
|
2017-01-12 13:02:16 -05:00 |
|
Isaac Connor
|
ed5c3c4ed4
|
remove debug stautement
|
2017-01-12 12:58:09 -05:00 |
|
Isaac Connor
|
d9ce1a68c6
|
restore defaults
|
2017-01-12 12:56:55 -05:00 |
|
Isaac Connor
|
e94a797a5e
|
remove debug stautement
|
2017-01-12 12:56:20 -05:00 |
|
Isaac Connor
|
65f7350313
|
remove debug stautement
|
2017-01-12 12:55:27 -05:00 |
|
Isaac Connor
|
82eaacc624
|
switch quotes
|
2017-01-12 12:54:46 -05:00 |
|
Isaac Connor
|
42484f7680
|
switch quotes, load monitors at the beginnign
|
2017-01-12 12:54:40 -05:00 |
|
Isaac Connor
|
0197c550ae
|
Use a real variable for file handle so that it sticks around
|
2017-01-12 12:54:14 -05:00 |
|
Isaac Connor
|
0f67d9847e
|
remove caching of verified status of an mmap.
|
2017-01-12 12:53:57 -05:00 |
|
Andrew Bauer
|
c50cbc2b9e
|
Merge pull request #1749 from jbehrends/1747-docker-apache-config-fix
Fixed apache documentroot, and fixed permissions for "/" in the project's Dockerfile
|
2017-01-12 07:58:15 -06:00 |
|
Josh Behrends
|
2104561eca
|
Fixed apache documentroot, and fixed permissions for "/"
|
2017-01-11 19:49:29 -08:00 |
|
Andrew Bauer
|
2e730f0426
|
Merge pull request #1746 from connortechnology/fix_else
fix else behaviour by adding braces
|
2017-01-11 19:38:59 -06:00 |
|
Isaac Connor
|
251264ac92
|
bump ffmpeg version required to use codecpar
|
2017-01-11 14:31:30 -05:00 |