432 Commits

Author	SHA1	Message	Date
Isaac Connor	76cb031a5e	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2016-06-12 07:14:30 -04:00
Isaac Connor	2460bccdac	fix missing $	2016-06-06 10:18:21 -04:00
Isaac Connor	ef9c0ca33a	Debug the SQL on execute, not on parse	2016-06-03 11:15:40 -04:00
Isaac Connor	b8c406f969	Merge branch 'master' into storageareas	2016-06-03 09:32:55 -04:00
Isaac Connor	8a14d6f4d2	Don't not load the event if it was videod before	2016-05-30 14:57:46 -04:00
Isaac Connor	4469f909fa	Add support for DefaultVideo to video generation	2016-05-30 14:07:40 -04:00
Isaac Connor	07878e3e13	Put back the code that makes getDiskPercent look in the storagearea	2016-05-30 10:43:51 -04:00
Isaac Connor	886d88b184	Merge branch 'improve_filter' into storageareas	2016-05-30 09:30:18 -04:00
Isaac Connor	2da709848a	remove extra comma screwing up the sql	2016-05-30 09:30:02 -04:00
Isaac Connor	63ac75b440	use ::Database::dbh instead of 3013self{dbh}	2016-05-30 09:27:36 -04:00
Isaac Connor	2663781adc	put back missing my =__git_main[0];	2016-05-30 09:13:39 -04:00
Isaac Connor	7bc95561ad	fix	2016-05-29 11:37:32 -04:00
Isaac Connor	408646ea4d	remove extra s	2016-05-27 10:52:59 -04:00
Isaac Connor	d52a6f9a95	Merge branch 'improve_filter' into storageareas	2016-05-27 09:57:05 -04:00
Isaac Connor	1983f106f4	Add a missing sth->finish	2016-05-27 09:01:01 -04:00
Isaac Connor	b0116f25e9	put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo	2016-05-27 08:59:46 -04:00
Isaac Connor	419e67caa1	Put back the code that populates ZM_SERVER_ID	2016-05-26 12:42:22 -04:00
Isaac Connor	05709f3084	Merge branch 'id_on_console' into storageareas	2016-05-26 11:17:41 -04:00
Isaac Connor	f969186abb	add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console	2016-05-26 11:15:13 -04:00
Isaac Connor	a0af99459a	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2016-05-25 10:12:22 -04:00
Isaac Connor	aedba1bc7f	whitespace, google code style. Adds special cases for ServerId Attribute. ANd uses * to load all event fields instead of specifying each one.	2016-05-24 16:49:04 -04:00
Isaac Connor	8fabeb78d3	Merge branch 'fix_zone_edit' into storageareas	2016-05-24 15:55:49 -04:00
Isaac Connor	1e52934dcf	Implement a time function that gets unix_timestamp from StartTime, and implement check_for_files_in_filessytem	2016-05-20 20:33:47 -04:00
Isaac Connor	bb5dbf3e4a	Need to import Config Data into Config	2016-05-20 09:29:40 -04:00
Isaac Connor	182fa9a5cd	revert the bulk of the merge_db_connects changes.	2016-05-20 08:53:53 -04:00
Andrew Bauer	46039a1887	Merge pull request #1472 from ZoneMinder/v4l1_compat ... V4l1 compat	2016-05-16 13:02:27 -05: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	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	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	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	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	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