2715 Commits

Author	SHA1	Message	Date
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
Isaac Connor	b8cf7c04c1	Fix messed up SQL. die when the selectFrameData sql doesn't execute	2016-05-31 09:14:50 -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	409545b386	Add concat to the usage line and format it better	2016-05-30 14:08:38 -04:00
Isaac Connor	326c4f1fee	Check for existence of libraries specified in LD_PRELOAD and warn about them not existing	2016-05-30 14:08:08 -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	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	d52a6f9a95	Merge branch 'improve_filter' into storageareas	2016-05-27 09:57:05 -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	b9322a02e8	Merge branch 'get_rid_of_ConfigAdmin' into storageareas	2016-05-26 09:56:16 -04:00
Isaac Connor	e329bacb78	remove deprecated ConfigAdmin	2016-05-26 09:51:48 -04:00
Isaac Connor	7a08d4620f	Merge branch 'master' into storageareas	2016-05-25 10:17:46 -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