412 Commits

Author	SHA1	Message	Date
Isaac Connor	1e233c0ce5	Merge branch 'master' into improve_filter	2016-11-04 15:20:43 -04:00
Isaac Connor	93725b3f4b	fixup spacing in ConfigData	2016-11-04 14:05:51 -04:00
Isaac Connor	3d17067276	change tabs to spaces	2016-11-03 14:30:23 -04:00
Isaac Connor	68c8178648	remove some extra spaces	2016-11-03 14:21:07 -04:00
Isaac Connor	bb371612c3	tabs to spaces	2016-11-03 14:18:03 -04:00
Andrew Bauer	191efed8e3	change fast_delete to off - fixes #1597	2016-10-19 14:10:28 -05:00
Isaac Connor	b385ba7bf4	Merge branch 'master' into improve_filter	2016-10-18 09:59:45 -04:00
Andrew Bauer	24d471f452	Merge pull request #1503 from ZoneMinder/id_on_console ... add option to show monitor ID on console	2016-08-06 10:59:03 -05:00
Isaac Connor	9d65ef3bb2	Merge pull request #1556 from knnniggett/banner ... custom banner text on web console	2016-08-06 10:59:53 -04:00
Andrew Bauer	382896dc0d	Merge pull request #1498 from josh4trunks/mysql_port_socket ... Add support for MySQL Port / Unix Socket	2016-08-06 09:32:32 -05:00
Andrew Bauer	e6b1cf90df	Merge pull request #1566 from gerdesj/Keekoon ... Control script for Keekoon cameras.	2016-08-06 09:09:40 -05:00
Jon Gerdes	ee720c4561	Control script for Keekoon cameras. Tested with KK002.	2016-07-25 11:20:49 +01:00
Dmitry Smirnov	aed3c3d29a	reduce noise on "zmupdate.pl" invocation	2016-07-14 00:43:32 +10:00
Andy Bauer	19265b631a	custom banner text on web console	2016-07-09 13:11:30 -05:00
Isaac Connor	1069b301a0	functions have been moved from ConfigAdmin to Config	2016-06-12 15:38:59 -04:00
Isaac Connor	2da709848a	remove extra comma screwing up the sql	2016-05-30 09:30:02 -04:00
Isaac Connor	408646ea4d	remove extra s	2016-05-27 10:52:59 -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	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	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
josh4trunks	57a25373fa	Add logic to Config.pm	2016-05-22 08:53:30 -07:00
josh4trunks	a3fe6ea181	Apply changes to Logger.pm	2016-05-22 08:28:23 -07:00
josh4trunks	38e1cc909c	Reapply changes to Database.pm	2016-05-22 08:19:18 -07: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	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	08bf97fe85	Add a config entry for ZM_LD_PRELOAD	2016-05-09 12:44:41 -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	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	f55f979cc9	use fully specified Config to simplify symbol tables	2016-05-07 09:30:03 -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	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
Steve Gilvarry	6bf43631e2	Merge pull request #1428 from ZoneMinder/better_zmvideo ... Better zmvideo	2016-04-28 22:00:52 +10: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
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	a31660c1f6	Remove the code looks for zm.conf in the current dir.	2016-04-04 10:45:58 -04:00
Sándor Czettner	38e3c92546	Minor grammar fixes	2016-03-25 13:18:43 +00:00