2715 Commits

Author	SHA1	Message	Date
techrockedge	826201a3f9	Merge branch 'master' of git://github.com/ZoneMinder/zoneminder	2018-12-28 20:32:04 -05:00
Isaac Connor	1a1231fdaa	Merge branch 'master' into storageareas	2018-12-28 10:47:27 -05:00
Jonathan Meredith	265a73ab29	Spelling mistake fix ... Changed his to this	2018-12-27 22:26:07 -05:00
Isaac Connor	3e06bbcef8	Merge branch 'master' into storageareas	2018-12-27 13:50:29 -05:00
Isaac Connor	08e5166bcb	remove quotes around state in command documentation.	2018-12-27 12:24:50 -05:00
Isaac Connor	c017219a1e	use do instead of many lines of dbi. Cleanup logic around command detection	2018-12-27 12:22:06 -05:00
Isaac Connor	e15227d53e	remove zma restarts	2018-12-26 18:18:22 -05:00
Isaac Connor	28dafd5931	Merge branch 'storageareas' into zma_to_thread	2018-12-26 12:02:00 -05:00
techrockedge	f815aaa5f5	Merge branch 'master' of git://github.com/ZoneMinder/zoneminder	2018-12-21 19:46:45 -05:00
Isaac Connor	7a8beffdcc	Merge branch 'master' into storageareas	2018-12-20 15:10:52 -05:00
Isaac Connor	e626049f6b	Merge branch 'swresample' into storageareas	2018-12-20 14:08:40 -05:00
Isaac Connor	0c09616059	put back privacy notice update	2018-12-20 13:58:09 -05:00
Isaac Connor	88e148068e	Logging and whitespace	2018-12-20 13:56:57 -05:00
Isaac Connor	6af8f0d419	Logging and whitespace	2018-12-20 13:55:18 -05:00
Isaac Connor	64bdf40e86	Logging and whitespace changes. No logical changes	2018-12-20 13:50:55 -05:00
Isaac Connor	eccfdb8a6a	Logging and whitespace changes. No logical changes	2018-12-20 13:50:07 -05:00
Isaac Connor	3a068ae6a3	Merge branch 'master' into swresample	2018-12-16 16:15:28 -05:00
techrockedge	180a4b07b1	foscam r2c ptz	2018-12-14 19:13:41 -05:00
techrockedge	51b4c27b27	foscam r2c ptz	2018-12-14 17:30:45 -05:00
Isaac Connor	0bfe1007c8	Merge branch 'master' into storageareas	2018-12-14 10:16:08 -05:00
Pliable Pixels	ebaafef607	Ffmpeg logs optional (#2345) ... * make ffmpeg logs configurable via web * fix Info	2018-12-14 08:01:23 -05:00
Isaac Connor	b61eb7d4fc	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2018-12-13 10:53:56 -05:00
Isaac Connor	0c5eead929	Merge branch 'master' into fix_startup_db_connection	2018-12-13 10:53:34 -05:00
Andrew Bauer	db81465fa2	allow one to set manpage destination	2018-12-07 09:47:00 -06:00
Isaac Connor	0c7f91c38a	Merge branch 'master' into storageareas	2018-12-03 16:25:28 -05:00
Isaac Connor	f2f1e230d1	put back missing !	2018-12-03 16:25:03 -05:00
Isaac Connor	14272a42b4	fix use of getcwd in delete_empty_subdirs. We use absolute paths	2018-12-03 11:08:24 -05:00
Isaac Connor	7d90a56561	Merge branch 'master' into storageareas	2018-11-30 14:46:42 -05:00
Isaac Connor	f9139f2d98	Use the word skipped instead of aborted	2018-11-30 10:48:20 -05:00
Isaac Connor	df0b600431	Merge branch 'master' into storageareas	2018-11-29 10:49:06 -05:00
Isaac Connor	45a9f9158d	spelling mistakes	2018-11-29 10:45:30 -05:00
Isaac Connor	1a85e282e2	use find_one instead of new. We seem to be comparing against unfound event objects	2018-11-29 10:09:49 -05:00
Isaac Connor	4625f7c879	Merge branch 'master' into storageareas	2018-11-28 10:46:49 -05:00
Isaac Connor	6de704922c	Set scheme to '' if undefined to quiet warnings	2018-11-27 17:01:49 -05:00
Isaac Connor	e15bbba090	Make debug line more useful by printing out the containing directory	2018-11-26 15:45:05 -05:00
Isaac Connor	b3703a5eed	Check in db a second time for the event. Long running zmaudits can find an event in the fs that was created after we loaded all the db events.	2018-11-26 15:16:10 -05:00
Isaac Connor	3f4e918b9e	Merge branch 'zmaudit_check_other_storageareas' into storageareas	2018-11-26 15:09:14 -05:00
Isaac Connor	d6fb4e1910	Add StorageId function to clear Storage when you set a new StorageId. Clear Path when assigning a new StorageArea	2018-11-26 15:09:04 -05:00
Isaac Connor	7fb0e1eaf7	Cache All StorageAreas and just to next event if we find the event somewhere other than where it should be.	2018-11-26 15:02:34 -05:00
Isaac Connor	1c45f98a65	Merge branch 'zmaudit_check_other_storageareas' into storageareas	2018-11-23 15:16:15 -05:00
Isaac Connor	1b74aa959b	Have to refresh the Path in the Event when updating Storage Area	2018-11-23 15:15:51 -05:00
Isaac Connor	32337c5dbb	fix prompt when updating StorageArea	2018-11-23 15:13:47 -05:00
Isaac Connor	d16981365f	Merge branch 'zmaudit_check_other_storageareas' into storageareas	2018-11-23 12:16:21 -05:00
Isaac Connor	6d19280069	Set Scheme when Shallow. Improve debug message. Fix spacing	2018-11-23 12:16:11 -05:00
Isaac Connor	dea5db9dd9	Merge branch 'zmaudit_check_other_storageareas' into storageareas	2018-11-23 11:11:39 -05:00
Isaac Connor	73d27f5095	Add code to see if a db event is stored at the wrong storage area	2018-11-23 10:10:50 -05:00
Isaac Connor	b16cd7ec84	Merge branch 'h265' into zma_to_thread	2018-11-20 12:38:17 -05:00
Isaac Connor	62e511cfd1	Merge branch 'master' into h265	2018-11-17 10:41:20 -05:00
Andrew Bauer	b4f77077e9	Update zmdc.pl.in ... temporary fix to #2292	2018-11-16 18:33:54 -06:00
Andrew Bauer	e5f2212a32	fix gpl mailing address	2018-11-15 20:00:53 -06:00