1497 Commits

Author	SHA1	Message	Date
Isaac Connor	0b00659f26	Merge branch 'update_zmupdate' into storageareas	2016-05-16 12:24:14 -04:00
Isaac Connor	b53a0a564d	Don't need the extra use ZoneMinder::Config	2016-05-16 10:07:24 -04:00
Isaac Connor	dd24c35afa	revert bogus optimisation	2016-05-16 10:05:12 -04:00
Isaac Connor	3780f8a2e6	move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module	2016-05-16 09:31:54 -04:00
Isaac Connor	5df85770cd	zmupdate.pl.in	2016-05-13 13:52:34 -04:00
Isaac Connor	3a0aa09c2f	Force reconnect to the db after fork.	2016-05-13 09:09:49 -04:00
Isaac Connor	e9d8b7925a	Merge branch 'db_reconnect' into storageareas	2016-05-10 11:13:09 -04:00
Isaac Connor	aaa4b3a824	check for db connection before assuming that dbh is valid	2016-05-10 11:11:45 -04:00
Isaac Connor	a5ba4759bf	fix new config entry	2016-05-10 10:54:40 -04:00
Isaac Connor	17f4f5789e	Merge branch 'master' into v4l1_compat	2016-05-10 10:10:48 -04:00
Isaac Connor	56e0e4e3c6	Use Event->getPath instead of something wrong	2016-05-10 09:07:09 -04:00
Isaac Connor	a012320a3e	Whitespace and code style changes. Change Event->getEventPath to Event->getPath to sync with PHP version	2016-05-10 09:06:49 -04:00
Isaac Connor	07e988266a	Merge branch 'merge_db_connects' into storageareas	2016-05-09 13:28:40 -04:00
Isaac Connor	1a1e009533	simplify use's, add some sth->finishes and move some lines to take properly use DBI	2016-05-09 13:28:09 -04:00
Isaac Connor	9d9f2453c3	deprecate ConfigAdmin, merge it into Config.pm	2016-05-09 13:27:22 -04:00
Isaac Connor	cd8c9703c0	remove extra q	2016-05-09 12:48:56 -04:00
Isaac Connor	2fec880ff6	fix help/description mixup	2016-05-09 12:48:35 -04:00
Isaac Connor	5806eb0958	Merge branch 'v4l1_compat' into storageareas	2016-05-09 12:46:34 -04:00
Isaac Connor	605edfd6d0	add ENV{LD_PRELOAD} setting	2016-05-09 12:46:26 -04:00
Isaac Connor	08bf97fe85	Add a config entry for ZM_LD_PRELOAD	2016-05-09 12:44:41 -04:00
Isaac Connor	beebe74e7b	Merge branch 'merge_db_connects' into storageareas	2016-05-09 12:26:17 -04:00
Isaac Connor	b33e35bda7	move the require to the top	2016-05-09 12:14:59 -04:00
Isaac Connor	3522c5796b	add BEGIN Back to ZoneMinder.pm	2016-05-09 12:01:26 -04:00
Isaac Connor	e064af4214	Merge branch 'merge_db_connects' into storageareas	2016-05-07 09:35:14 -04:00
Isaac Connor	b444c8a6b4	Move the BEGIN from ZoneMinder to ZoneMinder/Base.	2016-05-07 09:34:45 -04:00
Isaac Connor	6e32b5d266	Use fully specified COnfig hash to simplify Symbol tables	2016-05-07 09:34:04 -04:00
Isaac Connor	1d63062188	Merge branch 'merge_db_connects' into storageareas	2016-05-07 09:30:18 -04:00
Isaac Connor	f55f979cc9	use fully specified Config to simplify symbol tables	2016-05-07 09:30:03 -04:00
Isaac Connor	18442be77f	Merge branch 'merge_db_connects' into storageareas	2016-05-03 14:09:18 -04:00
Isaac Connor	e3d581dcab	use single quotes instead of double quotes	2016-05-03 10:23:09 -04:00
Isaac Connor	24bf91707f	Database module should really use DBI	2016-05-03 10:22:38 -04:00
Isaac Connor	e80db4c433	Use zmDbConnect instead of duplicated db connect code	2016-05-03 10:22:16 -04:00
Isaac Connor	49e3d3be7a	Turn the config loading code from a BEGIN to a function that could be called repeatedly.	2016-05-03 10:21:50 -04:00
Isaac Connor	9406a2337f	Add a BEGIN section to load things in the correct order.	2016-05-03 10:21:01 -04:00
Isaac Connor	2ba18e14fc	Merge branch 'merge_db_connects' into storageareas	2016-05-03 09:05:36 -04:00
Isaac Connor	30f34a6f49	instead of code duplication for opening the db, use zmDbConnect everywhere	2016-05-03 08:59:40 -04:00
Isaac Connor	55d58a140e	instead of code duplication for opening the db, use zmDbConnect everywhere	2016-05-03 08:57:51 -04:00
Isaac Connor	408fba8d24	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2016-04-30 10:09:52 -04:00
Steve Gilvarry	6bf43631e2	Merge pull request #1428 from ZoneMinder/better_zmvideo ... Better zmvideo	2016-04-28 22:00:52 +10:00
Isaac Connor	0adbaafd98	Merge branch 'master' into storageareas	2016-04-26 13:10:37 -04:00
Andrew Bauer	1072327dd1	remove extra quote	2016-04-21 08:01:13 -05:00
Andrew Bauer	3a9ab7f685	Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option	2016-04-21 07:27:19 -05:00
Isaac Connor	67f38d07df	Merge branch 'master' into better_zmvideo	2016-04-20 12:04:15 -04:00
Isaac Connor	0da0896757	Merge branch 'master' into storageareas	2016-04-20 10:01:06 -04:00
Isaac Connor	e52e880553	rework open event check to not use group by	2016-04-20 10:00:13 -04:00
Isaac Connor	bb15915ce5	Use EventPrefix, not Prefix	2016-04-19 15:23:36 -04:00
Isaac Connor	588dbc0c3c	Don't JOIN MOnitors to get event prefix. Use {->MonitorID} instead	2016-04-19 15:22:46 -04:00
Isaac Connor	d9646d6ceb	Populate a Monitors hash with the Monitors data so we don't have to use in JOINs later	2016-04-19 15:19:37 -04:00
abi	7058b0862a	suppressed warnings of killall for FreeBSD	2016-04-16 16:39:58 +03:00
Isaac Connor	a2d92300b3	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2016-04-11 21:51:41 -04:00