Isaac Connor
|
273229858f
|
Merge branch 'master' into storageareas
|
2017-04-16 11:26:18 -04:00 |
Isaac Connor
|
432a38720a
|
Merge pull request #1788 from knnniggett/travis_test1
packpack nightly builds
|
2017-04-15 10:21:42 -04:00 |
Isaac Connor
|
0bbe5d19a6
|
add libavresample to build depends
|
2017-04-13 09:59:35 -04:00 |
Isaac Connor
|
b03d0d09da
|
fix typo
|
2017-04-13 09:08:15 -04:00 |
Isaac Connor
|
d039227f79
|
Merge branch 'master' into storageareas
|
2017-04-12 13:51:10 -04:00 |
Isaac Connor
|
a58259c60e
|
include other libjpeg alternatives. Include a libpcre dependency
|
2017-04-10 21:55:52 -04:00 |
Isaac Connor
|
8c2e8defab
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2017-03-28 20:52:36 -04:00 |
Isaac Connor
|
74eed2ac29
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-03-28 20:06:12 -04:00 |
Isaac Connor
|
769af661e9
|
Merge branch 'fix_x10' into storageareas
|
2017-03-28 20:05:52 -04:00 |
Isaac Connor
|
6f26a9585a
|
add libswscale3 for jessie
|
2017-03-27 15:43:18 -04:00 |
Isaac Connor
|
113f4b2bfe
|
add libx264-142 for jessie
|
2017-03-24 18:00:18 -04:00 |
Isaac Connor
|
7c86bcdfce
|
add the link from /usr/share/zoneminder/www/api/app/tmp to /var/tmp
|
2017-03-24 11:52:55 -04:00 |
Isaac Connor
|
f082183fd6
|
add the cache directories used by cake php under /var/tmp
|
2017-03-24 11:52:29 -04:00 |
Isaac Connor
|
feb9d55613
|
fix syntax
|
2017-03-20 13:52:10 -04:00 |
Isaac Connor
|
d5312ce21f
|
fix libswscale for 1604
|
2017-03-13 15:37:55 -04:00 |
Isaac Connor
|
1cbcd3612f
|
add libswscale4
|
2017-03-13 14:28:13 -04:00 |
Isaac Connor
|
e04cc1be05
|
add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604.
|
2017-03-11 10:41:39 -05:00 |
Isaac Connor
|
fdcb93eacc
|
Merge branch 'master' into storageareas
|
2017-03-06 16:22:28 -05:00 |
Andy Bauer
|
5ea9f695de
|
Merge branch 'master' into travis_test1
|
2017-03-05 13:02:59 -06:00 |
Andy Bauer
|
ca71ee8e71
|
remove rules.new
|
2017-03-05 12:40:27 -06:00 |
Andy Bauer
|
4fe70f0e7d
|
recreate patch
|
2017-03-05 12:39:03 -06:00 |
Andy Bauer
|
c6fc6cb0ca
|
change patch method
|
2017-03-05 11:46:45 -06:00 |
Andy Bauer
|
f66408b998
|
update the path to zm.conf
|
2017-03-05 10:50:09 -06:00 |
Andy Bauer
|
cfeb12fc73
|
fix permissions on zm.conf in deb pkg scripts
|
2017-03-05 10:37:44 -06:00 |
Isaac Connor
|
78612e3925
|
use format 1.0
|
2017-02-15 11:25:11 -05:00 |
Isaac Connor
|
c58b44bd9e
|
try out the git format
|
2017-02-14 11:45:13 -05:00 |
Isaac Connor
|
d1ed472db0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-05 10:09:11 -05:00 |
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
klemens
|
0d549f1db3
|
spelling fixes
|
2016-12-29 10:31:05 +01:00 |
Isaac Connor
|
708f52beda
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-12-13 13:36:18 -05:00 |
Andrew Bauer
|
e72a76fe33
|
Update control
|
2016-12-12 12:09:47 -06:00 |
Isaac Connor
|
1cb8d6baba
|
enable apache cgi
|
2016-11-28 11:45:30 -05:00 |
Isaac Connor
|
859d361373
|
turn off libswresample
|
2016-11-27 17:06:12 -05:00 |
Isaac Connor
|
921205216d
|
turn off libswresample
|
2016-11-27 17:00:16 -05:00 |
Isaac Connor
|
b3f2b13718
|
Merge branch 'apache_indexes' into storageareas
|
2016-11-22 13:29:30 -05:00 |
Isaac Connor
|
9cc1b23460
|
put back mizzing F
|
2016-11-22 13:25:52 -05:00 |
Isaac Connor
|
b059ca83da
|
Rremove Index from options to prevent directory listings
|
2016-11-22 13:25:52 -05:00 |
Isaac Connor
|
aa0a4d1f5a
|
put back mizzing F
|
2016-11-22 13:13:09 -05:00 |
Isaac Connor
|
e8da04df56
|
Merge branch 'apache_indexes' into storageareas
|
2016-11-22 13:09:44 -05:00 |
Isaac Connor
|
2df6cd17fa
|
add libswresample to build depends
|
2016-11-11 22:30:35 -05:00 |
Isaac Connor
|
6361f14387
|
Rremove Index from options to prevent directory listings
|
2016-11-08 09:30:24 -05:00 |
Isaac Connor
|
a6c77f08d2
|
use generic libboost-dev
|
2016-10-02 15:22:52 -04:00 |
Isaac Connor
|
07d6e1303b
|
Merge branch 'compress_logs' into storageareas
|
2016-10-02 12:22:46 -04:00 |
Isaac Connor
|
9e3f6226ed
|
add compress and delaycompress to the zoneminder logrotate settings
|
2016-10-02 10:05:07 -04:00 |
Isaac Connor
|
f09c6c92e8
|
blah
|
2016-09-30 12:22:35 -04:00 |
Isaac Connor
|
e11ded83ba
|
get rid of watch:
|
2016-09-30 12:15:23 -04:00 |
Isaac Connor
|
bf013cd88e
|
remove libswsresample
|
2016-09-30 11:58:55 -04:00 |
Isaac Connor
|
603d903297
|
add an environment setting for TZ which eliminates a stat on /etc/locatime on every log line
|
2016-09-29 14:24:49 -04:00 |
Isaac Connor
|
c1d2407ed3
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:02:15 -04:00 |
Disassembler
|
8eee25795a
|
Remove deprecated register_globals from Apache/PHP configs
|
2016-05-30 14:02:46 +02:00 |