Isaac Connor
|
b71d021ae1
|
Merge branch 'fix_1849' into storageareas
|
2017-04-18 12:43:04 -04:00 |
Andrew Bauer
|
cea31f205a
|
Update zoneminder.tmpfiles.in
remove cake cache folders from tmpfiles.d since we changed the cake cache engine to apc
|
2017-04-16 20:44:41 -05:00 |
|
Isaac Connor
|
273229858f
|
Merge branch 'master' into storageareas
|
2017-04-16 11:26:18 -04:00 |
|
Isaac Connor
|
3b2d708a16
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-04-16 11:24:51 -04:00 |
Andy Bauer
|
3b1ef579d5
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
|
2017-04-15 09:24:45 -05:00 |
|
Andy Bauer
|
4240f03f4e
|
rpm readmefile changes
|
2017-04-15 09:23:28 -05:00 |
Isaac Connor
|
432a38720a
|
Merge pull request #1788 from knnniggett/travis_test1
packpack nightly builds
|
2017-04-15 10:21:42 -04:00 |
|
Andrew Bauer
|
7e9b9944ae
|
rpmspecfile changes to reflect recent commits
|
2017-04-15 08:51:59 -05: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
|
e28be26978
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2017-04-12 13:41:16 -04:00 |
|
Isaac Connor
|
6e7bd9311d
|
add the api tmp cache folders to the tmpfiles
|
2017-04-12 13:41:02 -04:00 |
|
Isaac Connor
|
a58259c60e
|
include other libjpeg alternatives. Include a libpcre dependency
|
2017-04-10 21:55:52 -04:00 |
|
Andrew Bauer
|
cd1b09d977
|
Update zoneminder.spec
use rpm macros
|
2017-03-31 20:35:24 -05:00 |
|
Andrew Bauer
|
716a25fc1f
|
rpmspecfile - ensure cache folders are created during install
|
2017-03-31 20:17:05 -05:00 |
|
Isaac Connor
|
58d119d9ed
|
Merge branch 'fix_1762' into storageareas
|
2017-03-31 13:38:59 -04:00 |
|
Andrew Bauer
|
7068efd581
|
rpmspecfile - modify tarball handling
|
2017-03-30 18:31:58 -05:00 |
|
Andrew Bauer
|
9a2c31d2c0
|
bump rpmspecfile to 1.30.2 release
|
2017-03-30 18:20:41 -05:00 |
|
Andrew Bauer
|
e46f64125e
|
Update zoneminder.tmpfiles.in
With cakephp debug mode off, we must ensure cake's tmp folders are created
|
2017-03-29 13:28:15 -05: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
|
adbb5f431d
|
fix version of x264
|
2017-03-11 11:00:46 -05: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
|
d135216ac7
|
Merge branch 'master' into storageareas
|
2017-02-15 09:30:35 -05:00 |
|
Isaac Connor
|
c58b44bd9e
|
try out the git format
|
2017-02-14 11:45:13 -05:00 |
Steve Gilvarry
|
bf99d132c7
|
Add the missing F back in.
|
2017-02-13 22:15:10 +11:00 |
Andrew Bauer
|
91dd2105d2
|
rpmspecfile - use %{_sysconfdir} macro
|
2017-02-08 20:44:00 -06:00 |
|
Andrew Bauer
|
bd4aea0385
|
rpm specfile - php requires was listed twice
|
2017-02-08 20:21:23 -06:00 |
|
Andrew Bauer
|
9c8c87f591
|
rpm specfile - require php-mysqli, bump to 1.30.2
|
2017-02-08 20:12:54 -06:00 |
|
Isaac Connor
|
7ab6818fa0
|
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
|
2017-01-25 17:14:30 -05:00 |
|
Andy Bauer
|
3882b74766
|
rpm specfile - el6 buildrequires epel-rpm-macros
|
2017-01-15 16:39:38 -06: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
|
babe4f07fb
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-14 10:53:49 -05:00 |