Isaac Connor
|
d903f7e6e9
|
Merge pull request #1871 from connortechnology/master
Clean up ubuntu builds
|
2017-05-05 09:46:24 -04:00 |
Isaac Connor
|
7b81f0464b
|
Due to switch to apc for caching in api, don't need the tmp dirs
|
2017-05-05 09:45:36 -04:00 |
|
Isaac Connor
|
a8d216d9c7
|
Due to switch to apc for caching in api, don't need the tmp dirs
|
2017-05-05 09:44:42 -04:00 |
Andrew Bauer
|
44433ab9c6
|
Update README.Fedora
|
2017-05-05 08:43:49 -05:00 |
|
Isaac Connor
|
bccddcad88
|
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
|
2017-05-05 09:42:24 -04:00 |
|
Isaac Connor
|
cccc3df700
|
Merge branch 'master' into storageareas
|
2017-05-03 16:43:44 -04:00 |
Andy Bauer
|
fd8aa62927
|
bump 1.30.3 release
|
2017-05-02 13:25:56 -05:00 |
|
Isaac Connor
|
8fad889c82
|
Don't delete the docs anymore
|
2017-04-27 12:15:39 -04:00 |
|
Isaac Connor
|
48d9167c5d
|
Don't apply patches.
|
2017-04-27 12:05:47 -04:00 |
|
Isaac Connor
|
2b0561b481
|
delete the old merge files
|
2017-04-27 12:05:13 -04:00 |
|
Isaac Connor
|
6a3531c2ef
|
use the mootools shipped with zm
|
2017-04-27 12:01:55 -04:00 |
|
Isaac Connor
|
6e94e57f57
|
don't default the cgi-bin path to /zm
|
2017-04-27 11:56:46 -04:00 |
|
Isaac Connor
|
ce00047175
|
try out quilt format again
|
2017-04-27 11:46:36 -04:00 |
|
Isaac Connor
|
eac1ebfb5a
|
bump up standards version
|
2017-04-27 11:46:07 -04:00 |
|
Isaac Connor
|
20345df3eb
|
Merge branch 'icon' into storageareas
|
2017-04-26 15:58:26 -04:00 |
|
Isaac Connor
|
dce39bb2a9
|
Merge branch 'master' into storageareas
|
2017-04-26 15:58:17 -04:00 |
|
Isaac Connor
|
17052d1d91
|
get rid of rules.rej and rules.orig from some old merge problem
|
2017-04-26 15:53:54 -04:00 |
|
Isaac Connor
|
dae4689b9c
|
remove .rej and .orig
|
2017-04-26 15:51:54 -04:00 |
|
Isaac Connor
|
da8a8f390e
|
remove .rej and .orig
|
2017-04-26 15:51:49 -04:00 |
|
Isaac Connor
|
4a0d2ec123
|
This should add a menu entry
|
2017-04-26 15:51:21 -04:00 |
|
Isaac Connor
|
681be621b1
|
add /usr/share/zoneminder/icons to install list
|
2017-04-26 15:51:04 -04:00 |
|
Isaac Connor
|
882a2095b8
|
I believe this will cause the .deb to include a menu entry... not sure though
|
2017-04-26 15:46:19 -04:00 |
|
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 |
|
Isaac Connor
|
3074263e06
|
Merge branch 'control_fixes' into storageareas
|
2017-01-10 12:54:46 -05:00 |
|
Andrew Bauer
|
06fd760a2a
|
rpm specfile- use %{_localstatedir} macro
|
2017-01-09 09:07:05 -06:00 |
|
Andrew Bauer
|
dc6b2ed114
|
clean up unnessary requires
|
2017-01-08 18:17:28 -06:00 |
|
Andrew Bauer
|
6b7e3a1b61
|
rpm specfile changes
|
2017-01-08 17:37:03 -06:00 |
|
Isaac Connor
|
d1ed472db0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-05 10:09:11 -05:00 |
|
Andrew Bauer
|
0d7e1bcbc5
|
add php as a dependency only when we aren't using nginx
|
2017-01-04 10:49:22 -06:00 |
|
Andrew Bauer
|
8ea4bdca1d
|
explicity set index.php as the only directoryindex
|
2017-01-04 10:45:36 -06:00 |
|
Andy Bauer
|
7e7ef46420
|
rpm packaging - remove rundir from tmpfiles.d
|
2017-01-03 16:42:12 -06:00 |
|
Andy Bauer
|
b4f537c5d3
|
rpm build tweaks based on rpmfusion feedback
|
2017-01-03 13:12:12 -06:00 |
|
Isaac Connor
|
84183c819c
|
Merge branch 'master' into storageareas
|
2017-01-03 09:53:09 -05:00 |
|
Andrew Bauer
|
3042b39672
|
Update zoneminder.spec
rpmspecfile don't glob zoneminder's binaries
|
2017-01-02 11:41:14 -06:00 |
|
Andy Bauer
|
c594ad8be7
|
rpmspec - remove quotes from pidfile path
|
2017-01-02 10:37:23 -06: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 |
|
Andrew Bauer
|
76db2e811d
|
more rpm specfile changes
|
2016-12-28 09:27:30 -06:00 |
|
Andrew Bauer
|
ea0cfad37c
|
update rpm specfile
|
2016-12-27 09:06:50 -06:00 |
|
Andrew Bauer
|
56277bce09
|
minor rpm specfile changes
|
2016-12-26 10:07:38 -06:00 |
|
Andrew Bauer
|
0d1dbf1745
|
fix rpm specfile versioning in changelog
|
2016-12-26 09:31:11 -06:00 |
|
Andrew Bauer
|
0dd6f4916e
|
rpm specfile - move tmpfile config under /usr/lib
|
2016-12-26 08:31:21 -06:00 |
|
Andrew Bauer
|
eb0b85ec13
|
changes based on feedback from rpmlint
|
2016-12-23 14:02:39 -06:00 |
|
Andrew Bauer
|
3d15ac315b
|
Update CMakeLists.txt
minor whitespace change
|
2016-12-23 13:11:06 -06:00 |
|
Andrew Bauer
|
1b81d790b2
|
rpm specfile consolidation
|
2016-12-23 13:06:44 -06:00 |
|
Isaac Connor
|
ed618ff7b0
|
Merge branch 'master' into storageareas
|
2016-12-20 11:29:31 -05:00 |
|
Andrew Bauer
|
68cd4c2ce5
|
Update zoneminder.el7.spec
minor specfile change
|
2016-12-15 08:28:37 -06:00 |
|
Isaac Connor
|
708f52beda
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-12-13 13:36:18 -05:00 |
|
Andrew Bauer
|
6fe88adc02
|
Update zoneminder.f25.spec
|
2016-12-12 20:50:53 -06: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 |
|
Andy Bauer
|
9a694541ba
|
repm specfile maintenance: retire fc23, add fc25
|
2016-11-26 08:20:03 -06:00 |
|
Andy Bauer
|
bf85791e4c
|
improvements to fedora nginx rpm support
|
2016-11-22 13:02:02 -06:00 |
|
Andy Bauer
|
c2b1638a3e
|
rpm changes - set TZ var in systemd service file
|
2016-11-22 12:43:56 -06:00 |
|
Andy Bauer
|
a96ab604ec
|
rpm changes - set TZ var in systemd service file
|
2016-11-22 12:42:48 -06:00 |
|
Andrew Bauer
|
71898df756
|
Merge pull request #1697 from connortechnology/apache_indexes
Apache indexes
|
2016-11-22 12:33:55 -06: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
|
cf49a234b3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-11-22 13:05:03 -05:00 |
|
Andrew Bauer
|
b67450b8ae
|
Update zoneminder.php-fpm.conf.in
|
2016-11-17 19:48:35 -06:00 |
|
Isaac Connor
|
c360e27b02
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-11-17 13:13:47 -05:00 |
Andrew Bauer
|
bcc5a57b02
|
prelimniary support for nginx on fedora
|
2016-11-15 18:34:25 -06: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
|
056e560b70
|
Merge ../ZoneMinder.master into storageareas
|
2016-10-02 12:25:51 -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
|
53d3e063e8
|
smal re-order
|
2016-09-30 09:35:52 -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
|
3dfe1185ff
|
add ffmpeg as option to libav-tols
|
2016-09-13 10:11:50 -04:00 |
|
Andy Bauer
|
4895942308
|
update fedora rpm readme
|
2016-08-16 09:49:45 -05:00 |
|
Isaac Connor
|
1058796374
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:04:35 -04:00 |
|
Isaac Connor
|
bdcc53d309
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:04:10 -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 |
|
Isaac Connor
|
6b70ff964b
|
fix path in cake api cleanup rules
|
2016-08-10 09:06:15 -04:00 |
|
Andrew Bauer
|
6c8001f362
|
Merge pull request #1549 from SteveGilvarry/initd_sql_wait
Implement suggested wait for MySQL start
|
2016-08-06 09:14:58 -05:00 |
|
Andrew Bauer
|
004b651d61
|
RPM specfile config change
use make macros, rather than hard coded values
|
2016-07-31 15:06:39 -05:00 |
|
Andrew Bauer
|
3c6692d0d5
|
RPM specfile config change
fix logrotate script
|
2016-07-31 07:29:37 -05:00 |
|
Andrew Bauer
|
477c02382b
|
Update CMakeLists.txt
Minor change for fedora rpmbuild
|
2016-07-06 19:06:28 -05:00 |
|
Andrew Bauer
|
1f060f1938
|
Update zoneminder.init
Remove my initials
|
2016-07-05 11:35:08 -05:00 |
|
Steve Gilvarry
|
1f53377d8a
|
Implement suggested wait for MySQL start
|
2016-07-05 07:28:52 +10:00 |
|
Andy Bauer
|
980d3f6e7f
|
rpm housecleaning, change the way jscalendar is installed
|
2016-07-03 11:34:35 -05:00 |
|
Andrew Bauer
|
f3583e5707
|
rpm specfile - add support for f24, remove support for f22
|
2016-06-24 15:39:57 -05:00 |
|
Andy Bauer
|
58e1a9ac4a
|
rpm README changes
|
2016-06-01 07:30:41 -05:00 |
Disassembler
|
8eee25795a
|
Remove deprecated register_globals from Apache/PHP configs
|
2016-05-30 14:02:46 +02:00 |
Isaac Connor
|
b3fd156c11
|
add boost to build depends
|
2016-05-25 20:01:42 -04:00 |
|
Isaac Connor
|
abd43bdc9f
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-29 14:25:11 -04:00 |
|
Isaac Connor
|
f9fd715657
|
Merge branch 'master' into storageareas
|
2016-09-29 14:25:02 -04:00 |
|
Isaac Connor
|
f1012f60ec
|
add libswresample to build depends
|
2016-09-29 12:31:02 -04:00 |
|
Isaac Connor
|
441020e8b8
|
fix_type
|
2016-09-29 10:49:40 -04:00 |
|
Isaac Connor
|
ce2c52c07d
|
allow libavdevice55 and 57
|
2016-09-27 16:15:24 -04:00 |
|
Isaac Connor
|
da5bad7ec2
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-27 15:09:14 -04:00 |