613 Commits

Author	SHA1	Message	Date
Isaac Connor	d06a0cf2a4	2016042801 build	2016-04-28 12:58:09 -04:00
Isaac Connor	386afc3546	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2016-04-26 20:02:04 -04:00
Isaac Connor	6a31966781	shift to match debian	2016-04-22 13:35:20 -04:00
Isaac Connor	8b96872efe	shoudl be php-mysql for php7	2016-04-20 15:04:50 -04:00
Isaac Connor	e218e91e24	add php7 versions for 1604	2016-04-20 14:58:18 -04:00
Isaac Connor	c626baae14	Merge branch 'fix_grant' into storageareas	2016-04-20 14:39:06 -04:00
Isaac Connor	02a56b811b	Don't be recursive when chowning /var/cache/zoneminder	2016-04-20 14:38:51 -04:00
Isaac Connor	060df90ff3	bump versions	2016-04-20 09:38:07 -04:00
Isaac Connor	7e1a80658b	Merge branch 'master' into storageareas	2016-04-17 09:30:33 -04:00
Isaac Connor	d424a297c4	need php5-gd	2016-04-17 09:29:55 -04:00
Isaac Connor	3f27f4893c	Merge branch 'fix_grant' into storageareas	2016-04-15 12:55:13 -04:00
Isaac Connor	78c6e14e0c	Merge branch 'master' into storageareas	2016-04-09 14:52:28 -04:00
Andy Bauer	dafdf1a289	rpm specfile changes	2016-04-08 19:22:27 -05:00
Isaac Connor	e473839704	substitute ZM_DB_NAME,ZM_DB_USER and ZM_DB_PASS from zm.conf for defaults	2016-04-06 15:50:51 -04:00
Isaac Connor	3dd010b40a	User and and instead of defaults	2016-04-06 15:44:56 -04:00
Isaac Connor	6cdbcfc9e6	add back identified by	2016-04-06 13:55:18 -04:00
Isaac Connor	6199a54838	more work, check for local db, check for existence of mysql, sync up between debian ubuntu1204 ubuntu1504	2016-04-06 13:45:46 -04:00
Isaac Connor	699b6458d5	bring up to date with debian postinst. Will not install the db, create the user and will run zmupdate.	2016-04-06 13:08:30 -04:00
Isaac Connor	cf76360ecb	bring up to date with the one in debian	2016-04-06 13:03:24 -04:00
Isaac Connor	fb05e1baad	grant requires rights regardless of password	2016-04-06 13:01:20 -04:00
Isaac Connor	59a8b37df2	Merge branch 'master' into storageareas	2016-04-06 11:47:20 -04:00
Isaac Connor	765f79a87f	Merge branch 'icon_video' into storageareas	2016-04-06 11:16:38 -04:00
Isaac Connor	3e5a4b6481	remove autotools builds, replace them with cmake versions	2016-04-06 08:43:20 -04:00
Isaac Connor	9a795432cf	merge all the commits from the messed up iconnor_video branch	2016-04-05 17:14:46 -04:00
Isaac Connor	60642c1fff	Merge branch 'iconnor_video' into storageareas	2016-04-05 12:32:33 -04:00
Isaac Connor	f73d8be765	Merge branch 'master' into feature-h264-videostorage	2016-04-05 09:43:34 -04:00
Isaac Connor	238a25a302	Merge branch 'master' into iconnor_video	2016-04-05 09:38:59 -04:00
Isaac Connor	0f1a530891	ciontrol files need spaces on multi-line lines	2016-04-05 09:03:37 -04:00
SteveGilvarry	4d7ded5ef0	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: configure.ac src/Makefile.am web/js/Makefile.am	2016-04-05 22:06:14 +10:00
Andy Bauer	7ff8d36598	Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation	2016-04-04 20:44:53 -05:00
Isaac Connor	82b32578ec	Merge branch 'master' into iconnor_video	2016-04-01 12:54:09 -04:00
Isaac Connor	abcf48b65c	Merge branch 'master' into feature-h264-videostorage	2016-04-01 08:53:45 -04:00
Isaac Connor	56d95bb949	Merge branch 'iconnor_video' into storageareas	2016-03-31 14:02:56 -04:00
Isaac Connor	74301b3ff3	Add the dependencies for libmp4v2	2016-03-31 11:53:36 -04:00
Isaac Connor	c9a1a9020d	Merge h264	2016-03-31 11:03:36 -04:00
Isaac Connor	e5a36c02bd	Merge remote-tracking branch 'origin/master' into video_remote	2016-03-30 16:55:24 -04:00
Isaac Connor	55e237fd3f	tabs to spaces, add back perl modules to Builds-Depends	2016-03-30 11:10:54 -04:00
Isaac Connor	ea49dc20d1	Merge branch 'master' into storageareas	2016-03-30 10:58:07 -04:00
Isaac Connor	b81395843c	fix spacing in control file	2016-03-30 10:56:10 -04:00
Isaac Connor	f0a307e082	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas ... Conflicts: distros/ubuntu1504_cmake/control	2016-03-29 11:53:17 -04:00
Isaac Connor	e4d0f2ffda	fixup depends	2016-03-29 11:50:51 -04:00
Isaac Connor	7f34a0df37	Remove deprecated --enable-crashtrace	2016-03-29 11:48:30 -04:00
Isaac Connor	3a8352eb6b	Merge branch 'master' into storageareas	2016-03-21 10:25:03 -04:00
Jon Burgess	06e04127d6	Fix spelling in other README files as well	2016-03-18 23:27:43 +00:00
Jon Burgess	94057a94ff	Fix spelling of 'environment'	2016-03-18 22:42:34 +00:00
Isaac Connor	688dd67697	Merge branch 'add_onvif_deps' into storageareas	2016-03-09 11:18:35 -05:00
Isaac Connor	ee0c134a9b	need spaces at beginning of lien	2016-03-09 11:18:27 -05:00
Isaac Connor	740dc12f7c	remove extra comma	2016-03-09 11:17:50 -05:00
SteveGilvarry	24ebc33ea4	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-03-09 20:54:11 +11:00
Isaac Connor	9647a680f6	Merge branch 'add_onvif_deps' into storageareas	2016-03-08 16:06:30 -05:00