1583 Commits

Author	SHA1	Message	Date
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
Isaac Connor	85c0377280	When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it	2016-07-12 14:21:54 -04:00
Isaac Connor	6129732e61	restore the behaviour where the generated file names are printed to stdout.	2016-07-11 08:01:43 -04: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	795665f8c7	Merge branch 'startup_time' into storageareas	2016-09-29 11:07:55 -04:00
Isaac Connor	29c015ecd3	need to put zmGetStartupTime in exports	2016-09-29 11:07:33 -04:00
Isaac Connor	5c867aa5f5	Merge branch 'fix_auth_timeout' into storageareas	2016-09-29 10:10:38 -04:00
Isaac Connor	8bc7b9562f	introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for	2016-09-29 10:04:53 -04:00
Isaac Connor	b074a3257d	add StartTime to log line about deleting an event.	2016-09-28 08:35:19 -04:00
Isaac Connor	89d4b9fec5	ifdef the libswresample lib stuff	2016-09-27 13:34:10 -04:00
Isaac Connor	f40c8d0da8	contains due to glob	2016-09-20 15:54:37 -04:00
Isaac Connor	a3e99cf08d	quick update to Monitor to use Object methods	2016-09-20 12:15:48 -04:00
Isaac Connor	e228de6ebe	detect relative path for ZM_PATH_EVENTS and use ZM_PATH_WEB to make a full path	2016-09-19 16:44:43 -04:00
Isaac Connor	ae4a4681cd	fix using wrong var	2016-09-15 11:41:42 -04:00
Isaac Connor	8f33ed6ca6	introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started.	2016-09-15 11:16:05 -04:00
Isaac Connor	2b4bad86cb	Merge branch 'master' into storageareas	2016-09-13 10:21:10 -04:00
Isaac Connor	5fb1c45c4e	Merge ../ZoneMinder.connortechnology into storageareas	2016-09-08 11:34:36 -04:00
Isaac Connor	7b0a14ee72	change doulbe quotes to single quotes. Detect if we can't chdir into the monitor dir.	2016-09-08 11:06:02 -04:00
Isaac Connor	e51cc7efc8	add a missing / in error message	2016-08-31 11:21:46 -04:00
Isaac Connor	747382f214	change double quotes to single quotes. When can't connect, print out the path to the sock file	2016-08-22 13:34:02 -04:00
Isaac Connor	d618b612fe	google code style & whitespace	2016-08-22 12:08:49 -04:00
Isaac Connor	707694d4ea	google code style	2016-08-22 11:41:26 -04:00
Isaac Connor	eafe3d7748	Merge branch 'master' into storageareas	2016-08-17 10:31:55 -04:00
Isaac Connor	3d65b0d2ad	Merge branch 'master' into storageareas	2016-08-08 18:09:11 -04:00
Isaac Connor	2451768295	Merge branch 'master' into storageareas	2016-08-08 18:08:46 -04:00
Isaac Connor	99289e4713	Deprecate MAX_AGED_DIRS. Only check age if the fs event isn't in the db. This should work much better.	2016-08-04 12:22:33 -04:00
Isaac Connor	62d3c66e8f	Merge branch 'fix_1571' into storageareas	2016-08-02 13:53:32 -04:00
Isaac Connor	208337635a	Merge branch 'master' into storageareas	2016-08-01 19:30:01 -04:00
Isaac Connor	8eac8a1e1a	Merge branch 'master' into storageareas	2016-07-13 09:50:30 -04:00
Isaac Connor	1e2ec7028e	better debugging. add back deleting of zmswap files. detaint them so that they can be deleted. Use Objects to fix up deleting events	2016-07-12 14:16:20 -04:00
Isaac Connor	26369268bb	merge Steve's updates, work on zmaudit	2016-07-12 11:27:25 -04:00
Isaac Connor	e29a0ebe71	Merge branch 'feature-h264-videostorage' into storageareas	2016-06-21 13:48:32 -04:00
Isaac Connor	76cb031a5e	Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas	2016-06-12 07:14:30 -04:00
Isaac Connor	c0cb1419a3	fixup delete_empty_directories	2016-06-07 22:03:46 -04:00
Isaac Connor	eb4e36789d	maybe fix delete_empty_directories	2016-06-07 21:43:47 -04:00
Isaac Connor	5ff53ebce0	More output on errors, make them non-fatal	2016-06-07 21:37:33 -04:00
Isaac Connor	b081d2e3bf	rename fs_monitor to monitor_id, which is what it is	2016-06-06 10:30:52 -04:00
Isaac Connor	2460bccdac	fix missing $	2016-06-06 10:18:21 -04:00
Isaac Connor	5f83bac59c	add line to delete empty directories	2016-06-03 12:01:31 -04:00
Isaac Connor	ad185809f8	Merge branch 'fix_zmaudit' into storageareas	2016-06-03 11:57:38 -04:00
Isaac Connor	575180ba5e	introduce new function that recursively deletes empty directories. Call it on each monitor dir	2016-06-03 11:35:28 -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