353 Commits

Author	SHA1	Message	Date
Isaac Connor	538658403c	Merge pull request #1822 from knnniggett/csrf ... Implement CSRF Mitigation	2017-03-30 10:39:55 -04:00
Andy Bauer	4e16ae6d19	add ZM_ENABLE_CSRF_MAGIC toggle	2017-03-28 17:29:36 -05:00
Andrew Bauer	a43adc241f	fix incorrect gpl license mailing address	2017-03-22 07:03:53 -05:00
Andrew Bauer	7bb0d12a4f	Merge pull request #1819 from ZoneMinder/Copyright_patch1 ... Fix failure to attribute previous work	2017-03-20 09:17:03 -05:00
Andrew Bauer	2dcd95bc7f	Merge pull request #1504 from ZoneMinder/improve_filter ... Improve filter	2017-03-18 21:12:58 -05:00
Steve Gilvarry	3a69238381	Fix failure to attribute previous work ... Just fixing this up as there is a issue logged from Debian for it.	2017-03-18 23:05:32 +11:00
Isaac Connor	ac32b001e9	use a real variable for the file handle so that it sticks around.	2017-01-12 13:05:39 -05:00
Isaac Connor	c97ecc2a38	remove debug line	2017-01-12 13:04:44 -05:00
Isaac Connor	513cd68c20	remove the verified caching. It makes calling zmMemVerify useless.	2017-01-12 13:02:16 -05:00
Isaac Connor	a146d7bee1	add a test for valid in the shared data. zmc sets this to false when it closes properly	2017-01-10 15:08:49 -05:00
Isaac Connor	d2ff6701f4	test	2017-01-10 13:53:02 -05:00
Isaac Connor	2a1ec2beb1	Merge pull request #1719 from knnniggett/hikvisionptz ... Add HikVision ptz control sciprt	2017-01-03 08:59:56 -05:00
Isaac Connor	b4bddee337	Merge branch 'master' into improve_filter	2017-01-03 08:49:56 -05:00
Andy Bauer	25ab1bee18	more fixed to gpl license text	2016-12-26 10:40:09 -06:00
Andy Bauer	0f15b3ae62	update gpl 2 mailing address	2016-12-26 10:33:03 -06:00
Andy Bauer	254fcbcef7	update gpl 2 mailing address in source files	2016-12-26 09:23:16 -06:00
Isaac Connor	752f0eb40b	Merge branch 'master' into improve_filter	2016-12-20 11:43:02 -05:00
Isaac Connor	a9548d3f6b	Add a config entry to turn event disk space on/off	2016-12-13 13:34:56 -05:00
Isaac Connor	2c0a868eea	fix typo	2016-12-08 11:02:59 -05:00
Isaac Connor	857b4e8345	Merge branch 'master' into improve_filter	2016-12-06 11:58:41 -05:00
Andrew Bauer	ecbaaef59a	Merge pull request #1670 from connortechnology/fix_braces ... Fix braces	2016-12-06 08:39:43 -06:00
Isaac Connor	02cd3e8cba	Merge branch 'master' into small_fixes	2016-11-22 10:52:07 -05:00
Isaac Connor	1be6c57aee	fix extra semi colon	2016-11-08 13:11:10 -05:00
Isaac Connor	5f0c1c0e26	fix layout in a complex map	2016-11-08 12:55:07 -05:00
Andy Bauer	4be668f838	Add HikVision ptz control sciprt	2016-11-06 08:03:43 -06:00
Isaac Connor	0dbde8e290	correct a lot of braces	2016-11-04 15:53:14 -04:00
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