1195 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	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	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	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
Isaac Connor	8fabeb78d3	Merge branch 'fix_zone_edit' into storageareas	2016-05-24 15:55:49 -04:00
Isaac Connor	3f880fad3a	Merge pull request #1500 from knnniggett/zmdc_unlink ... remove one unlink, add better error reporting to the rest	2016-05-24 14:35:39 -04:00
Andrew Bauer	0052bb080c	unlink only if file exists	2016-05-24 12:13:17 -05:00
Andrew Bauer	11701357aa	remove one unlink, add better error reporting to the rest	2016-05-24 09:01:32 -05:00
Andrew Bauer	bc163b33fc	move multiserver message to once during startup only	2016-05-23 20:06:29 -05: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
Andrew Bauer	8bbb443c67	fix invalid key name in config hash	2016-05-20 10:35:03 -05: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
Isaac Connor	924acf4284	fix zmdc.pl hang due to needing to connect to db after fork	2016-05-19 15:01:31 -04:00
Isaac Connor	8e06c0ec63	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2016-05-19 12:08:56 -04:00
Isaac Connor	183f9c70a4	Must use ZoneMinder instead of ZoneMinder::Logger	2016-05-19 12:08:45 -04:00
Isaac Connor	d57690903d	Must use ZoneMinder instead of ZoneMinder::Logger	2016-05-19 12:08:25 -04:00
Andrew Bauer	8bac5fbdfb	typo - remove extra comma	2016-05-18 16:58:04 -05:00
Andrew Bauer	46039a1887	Merge pull request #1472 from ZoneMinder/v4l1_compat ... V4l1 compat	2016-05-16 13:02:27 -05:00
Isaac Connor	0b00659f26	Merge branch 'update_zmupdate' into storageareas	2016-05-16 12:24:14 -04:00