2715 Commits

Author	SHA1	Message	Date
Isaac Connor	e24a308481	Merge branch 'master' into h265	2018-11-14 17:15:37 -05:00
Isaac Connor	35b439629c	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2018-11-13 18:14:35 -05:00
Isaac Connor	381071eb0f	Fix log message to say recovering instead of auditing	2018-11-13 16:36:39 -05:00
Isaac Connor	d2dc23b4e9	fixes, better logging	2018-11-13 16:35:09 -05:00
Isaac Connor	73c52705f2	Merge branch 'fix_32bit_alignment' into storageareas	2018-11-13 14:22:06 -05:00
Isaac Connor	e8ed1367d7	Merge branch 'master' into storageareas	2018-11-13 14:22:00 -05:00
Isaac Connor	ca87936cd7	add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.	2018-11-13 14:13:41 -05:00
Isaac Connor	798bf68df1	add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.	2018-11-13 14:13:32 -05:00
Isaac Connor	31b0ed107d	remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258	2018-11-13 14:02:44 -05:00
Isaac Connor	07d6d799ce	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2018-11-13 10:30:58 -05:00
Isaac Connor	993da131f1	tidy up and use Error instead of Carp::croak	2018-11-13 10:29:19 -05:00
Isaac Connor	967fe14b22	Add ability to update incorrect starttime.	2018-11-11 10:17:32 -05:00
Isaac Connor	1e98ecb595	Sort keys in to_string	2018-11-09 12:14:39 -05:00
Isaac Connor	5f81e9111f	Add Scheme and SaveJPEGs to Event fields, and fix setting Scheme	2018-11-09 12:14:05 -05:00
Isaac Connor	abada5c95c	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2018-11-09 10:47:00 -05:00
Isaac Connor	4ddd328c61	Check and Fix Scheme and StorageArea	2018-11-09 10:39:57 -05:00
Andrew Bauer	d6877b763d	Merge pull request #2298 from connortechnology/log_use_global_dbh ... Use the global dbh in ZoneMinder::Database instead of keeping our own…	2018-11-07 12:29:11 -06:00
Isaac Connor	0e3eb0df17	remove extra quotes, google code style, update pod docs	2018-11-07 11:26:48 -05:00
Isaac Connor	4107082845	Don't delete default states if there are none	2018-11-07 11:01:49 -05:00
Isaac Connor	0ebcef7324	in poddoc and over needs a =back	2018-11-07 11:01:12 -05:00
Isaac Connor	56bdd53757	Use the global dbh in ZoneMinder::Database instead of keeping our own copy of it in Logger	2018-11-07 10:40:44 -05:00
Isaac Connor	93bf05be4e	Merge branch 'zmrecover' into storageareas	2018-11-06 20:37:35 -05:00
Isaac Connor	9a96785fa4	Add in Frame.php	2018-11-06 20:37:00 -05:00
Isaac Connor	5495ab8036	Fix package for Event	2018-11-06 16:15:27 -05:00
Isaac Connor	c60bd3af1e	Need to new an Event	2018-11-06 15:43:22 -05:00
Isaac Connor	5a6ffe758a	Merge branch 'zmrecover' into storageareas	2018-11-06 15:29:02 -05:00
Isaac Connor	f86ed5c66c	allow interactive=0 and use Inf for log lines about resurecting events	2018-11-06 15:28:56 -05:00
Isaac Connor	181a8c29e1	Add SaveJPEGs to Event	2018-11-06 15:28:37 -05:00
Isaac Connor	6d6d25261f	Merge branch 'zmrecover' into storageareas	2018-11-06 12:14:54 -05:00
Isaac Connor	3cd1887d54	Cleanup POSIX use. Fix conflict between POSIX and Date::Format.	2018-11-06 12:14:42 -05:00
Isaac Connor	aa9bb81b61	Merge branch 'zmrecover' into storageareas	2018-11-06 09:57:01 -05:00
Isaac Connor	e0bc0484d4	Add empty string default for DefaultVideo	2018-11-06 09:56:29 -05:00
Isaac Connor	18b327b4ac	Turn off massive debugging	2018-11-06 09:55:53 -05:00
Isaac Connor	e1a5940254	Merge branch 'zmrecover' into storageareas	2018-11-05 16:53:01 -05:00
Isaac Connor	451c42ddf5	Implement rmrecover script. Flush out Object code to support find, find_one, find_sql, improve to_string, etc.	2018-11-05 16:52:34 -05:00
Isaac Connor	4b24bf4e36	merge from storageareas, fully specify Module for zmDbDisconnect as we havn't 'used' it	2018-11-02 11:48:35 -04:00
Isaac Connor	461ce3c1f8	Merge branch 'master' into storageareas	2018-10-29 12:52:06 -04:00
Isaac Connor	aaeb30a72f	Move license down to perldocs at bottom. Remove unecessary line feeds and spaces	2018-10-28 17:50:22 -04:00
Isaac Connor	349693e27d	Add a missing comma	2018-10-25 11:24:23 -04:00
Isaac Connor	a8329465fb	Merge branch 'master' into h265	2018-10-22 10:30:01 -04:00
Isaac Connor	5ab1126260	Merge branch 'storageareas' into zma_to_thread	2018-10-20 17:31:14 -04:00
Isaac Connor	88b9a1b259	Don't auto enable show privacy	2018-10-18 08:49:13 -04:00
Isaac Connor	372c6b7f69	explicitly call ZoneMinder::Database::zmDbDisconnect	2018-10-17 20:57:24 -04:00
Isaac Connor	c2af380e29	Merge branch 'master' into storageareas	2018-10-16 11:39:26 -04:00
Isaac Connor	7149576a7c	Merge branch 'smarter_packetqueue' into storageareas	2018-10-15 10:59:50 -04:00
Andy Bauer	5b964ba3d5	create the upload folder if it does not exist	2018-10-11 15:57:25 -05:00
Andrew Bauer	71e150daae	add missing brackets around second expression in archImagePath	2018-10-11 14:32:40 -05:00
Isaac Connor	ad71b0c626	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2018-10-11 11:28:17 -04:00
Isaac Connor	428b2506ec	Add .mp4 and snapshot files to glob for upload archive	2018-10-11 11:28:07 -04:00
Andrew Bauer	7ffc5ab266	Merge branch 'master' into control_plugin_psia	2018-10-11 09:32:06 -05:00