10145 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Isaac Connor	bab308ffa8	Merge branch 'storageareas' into zma_to_thread	2017-12-03 12:43:31 -05:00
Isaac Connor	6fc684a018	Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread	2017-12-03 11:09:17 -05:00
Isaac Connor	4d73ce4109	rework locking to have a per-packet mutex	2017-12-03 11:09:01 -05:00
Isaac Connor	5f01313ff6	Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread	2017-12-03 11:00:52 -05:00
Isaac Connor	b8f455ee7c	some cleanup, add a note about the lines that cause zm to crash	2017-12-03 11:00:40 -05:00
Isaac Connor	bc525a4e01	blah	2017-12-02 13:55:26 -05:00
Isaac Connor	9d5447aa6a	Merge pull request #55 from digital-gnome/storageareas-updateNavbar ... Add navbar refresh to all pages that use it	2017-12-02 10:44:01 -05:00
Isaac Connor	b1019267d8	try moving codec selection up above ctx allocation so that it allocates a priv_data	2017-12-02 08:12:04 -05:00
digital-gnome	53f886edc4	Make navbar refresh not change header links	2017-12-01 22:15:29 -05:00
Isaac Connor	0ef9d13dbd	Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread	2017-12-01 18:50:46 -05:00
Isaac Connor	3ca9b36877	fixes to compile on old ffmpeg	2017-12-01 18:50:28 -05:00
APHW2 MFGENG	4a9c31a15d	wip	2017-12-01 15:42:19 -08:00
Isaac Connor	e64497c16a	Merge pull request #54 from digital-gnome/storageareas-uifixes ... Storageareas uifixes	2017-12-01 16:30:29 -05:00
digital-gnome	1bbcf239d7	Fix timeline by adding StartDateTime	2017-12-01 16:25:03 -05:00
Isaac Connor	ca3d6546bd	sorty by name when listing monitors by name	2017-12-01 12:30:21 -08:00
Isaac Connor	5e953cefea	fix old cookie causing errors loading layouts	2017-12-01 12:30:07 -08:00
APHW2 MFGENG	392e6c28a1	Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread	2017-12-01 12:09:02 -08:00
APHW2 MFGENG	c26d7fec7b	Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread	2017-12-01 11:50:05 -08:00
Isaac Connor	b87e459125	still corrupting memory	2017-12-01 14:48:30 -05:00
Isaac Connor	2e3fda488e	more debug	2017-12-01 14:33:51 -05:00
Isaac Connor	cbae7ef7b4	Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread	2017-12-01 10:33:15 -05:00
Isaac Connor	128ae82331	add a debug for when in addpacket and no videostore	2017-12-01 10:33:10 -05:00
Isaac Connor	6e17bfefdd	fix printouts on 32bit	2017-12-01 10:30:58 -05:00
Isaac Connor	0865201e1e	seems to work	2017-12-01 07:26:34 -05:00
Isaac Connor	967368ce07	testing	2017-11-30 22:18:33 -05:00
Isaac Connor	4e26bde140	merge fix	2017-11-30 22:18:02 -05:00
Isaac Connor	4130c73943	Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread	2017-11-30 19:26:58 -05:00
Isaac Connor	4cc5838c66	whitespace & cleanup	2017-11-30 19:26:51 -05:00
digital-gnome	0a995aea78	Add navbar refresh to all pages that use it	2017-11-30 16:33:46 -05:00
Isaac Connor	556c4d8851	debug	2017-11-30 16:10:30 -05:00
Isaac Connor	c52d7c60eb	finish deprecating zma	2017-11-30 15:19:31 -05:00
Isaac Connor	84c901a01b	don't write non-frames	2017-11-30 15:01:48 -05:00
Isaac Connor	f2efc80f22	works?	2017-11-30 14:37:36 -05:00
digital-gnome	83a37732ce	Fix montage view jumping ... Need to override bootstrap styling	2017-11-30 09:48:02 -05:00
digital-gnome	f8c3e5573e	Change dark theme buttons to match original colors	2017-11-28 21:39:31 -05:00
digital-gnome	3cdb965c4a	Fix dark theme console ... Hover was using the mostly white from classic and flat. Added the striped look from classic and flat.	2017-11-28 21:27:46 -05:00
APHW2 MFGENG	f0ffa34c4d	set videostreamid	2017-11-28 12:58:20 -08:00
Isaac Connor	cb70a3627f	Fixes to montagereview and only load event data when in History mode	2017-11-28 14:50:21 -05:00
digital-gnome	07b0bf81c1	More cleanup	2017-11-28 12:30:00 -05:00
digital-gnome	e166703be0	Cleanup css ... Remove repeated block, move eventVideo to the same location in all files	2017-11-28 12:11:07 -05:00
Isaac Connor	344539f5dc	cleanup	2017-11-28 11:55:47 -05:00
Isaac Connor	d73f9e8a73	wip, crashes	2017-11-28 11:11:41 -05:00
Isaac Connor	1e50df741f	fix some memleaks	2017-11-28 09:50:09 -05:00
Isaac Connor	6e4abf83d0	wip	2017-11-28 08:29:03 -05:00
Isaac Connor	dfb69a2c5b	Merge branch 'tesla' into storageareas	2017-11-28 06:29:42 -05:00
Isaac Connor	db5cf998ad	Turn off debug	2017-11-27 15:43:21 -05:00
Isaac Connor	9d91d4ce45	relocate code for readability	2017-11-27 15:43:16 -05:00
Isaac Connor	81fa201910	init last_signal	2017-11-27 15:43:06 -05:00
Isaac Connor	9f57c819cd	Merge branch 'tesla' into zma_to_thread	2017-11-27 14:57:38 -05:00
Isaac Connor	d1886b5536	wip	2017-11-27 14:57:24 -05:00