3840 Commits

Author	SHA1	Message	Date
Isaac Connor	bab308ffa8	Merge branch 'storageareas' into zma_to_thread	2017-12-03 12:43:31 -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
digital-gnome	53f886edc4	Make navbar refresh not change header links	2017-12-01 22:15:29 -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
Isaac Connor	967368ce07	testing	2017-11-30 22:18:33 -05:00
digital-gnome	0a995aea78	Add navbar refresh to all pages that use it	2017-11-30 16:33:46 -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
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	1e50df741f	fix some memleaks	2017-11-28 09:50:09 -05:00
Isaac Connor	dfb69a2c5b	Merge branch 'tesla' into storageareas	2017-11-28 06:29:42 -05:00
Isaac Connor	9f57c819cd	Merge branch 'tesla' into zma_to_thread	2017-11-27 14:57:38 -05:00
Isaac Connor	00c5590a71	add Monitor count to servers	2017-11-27 11:56:48 -08:00
Isaac Connor	106351a9f3	don't get zma status	2017-11-27 11:57:42 -05:00
Isaac Connor	81c46073a7	remove some brackets	2017-11-27 11:57:08 -05:00
Isaac Connor	99968dfa2a	Merge branch 'storageareas' into zma_to_thread	2017-11-27 11:28:36 -05:00
Isaac Connor	03c9f88d55	fix build on trusty	2017-11-27 08:24:14 -05:00
digital-gnome	c92b3a9408	Converge stills view and stream view ... Make the stills view look more like stream view. Moved slider up to be like a scrub bar, added alarmcues.	2017-11-26 19:08:07 -05:00
digital-gnome	a81c35d377	Cleanup unused code event.css	2017-11-26 19:08:07 -05:00
digital-gnome	18dc515ba4	stills view loads image when slider used ... Stills view now loads the selected image if an image is being viewed and the slider is used.	2017-11-26 19:08:07 -05:00
digital-gnome	136f0e90f5	Fix autoscale on stills view ... Switching from stills view and changing the window would make stream view go crazy. Changed to autoscale on switch	2017-11-26 19:08:07 -05:00
digital-gnome	b506466a70	Change alarmcues to accept arbitrary containing element	2017-11-26 19:08:07 -05:00
digital-gnome	abba086d08	Progressbox transition	2017-11-26 19:08:07 -05:00
digital-gnome	b01fed111a	Add zoom transition	2017-11-26 19:08:06 -05:00
digital-gnome	ac3dbfbc23	Fix Typo	2017-11-26 19:08:06 -05:00
digital-gnome	b5db885a31	Add scaleToFit to frame view ... Changes navigation to use flexbox because absolute positioning was messing with scaletofit. Also makes frame view respect scale choice	2017-11-26 19:08:06 -05:00
digital-gnome	55699a9b9b	Change scaleToFit to choose what to fit ... Adds 4th input to choose what element is the last thing to fit.	2017-11-26 19:08:06 -05:00
digital-gnome	f52306ff56	Fix scales to only use fixed width/height on montage	2017-11-26 19:08:06 -05:00
digital-gnome	68e54400e2	Add scaleToFit to watch view	2017-11-26 19:08:06 -05:00
digital-gnome	3920420aa9	Convert scaleToFit to shared function	2017-11-26 19:08:06 -05:00
Isaac Connor	428d923874	make StatusFIlter do something	2017-11-26 17:39:49 -05:00
Isaac Connor	39e490e5e5	fix monitor dropdown	2017-11-26 17:32:41 -05:00
Isaac Connor	4fbdacef05	fix event counts	2017-11-26 17:03:36 -05:00
Isaac Connor	dd3f9492ba	fix dulicate logic	2017-11-26 15:12:35 -05:00
Isaac Connor	d6bc727c9c	use htmlSelect to create the Colours dropdown, which fixes a problem caused when I inverted the Colours array	2017-11-26 11:12:00 -05:00
Isaac Connor	b1bb0020d3	turn off database debug	2017-11-24 15:42:44 -05:00
Isaac Connor	c0e49b65ef	stop writing env to /tmp/env	2017-11-24 15:38:07 -05:00
Isaac Connor	4b92a788f7	fix filter execute	2017-11-24 15:37:50 -05:00
Isaac Connor	7e3328fbb8	add styles to the html5 button element	2017-11-24 09:36:45 -05:00
Isaac Connor	a9f0f3813a	Merge branch 'tesla' into storageareas	2017-11-24 09:31:00 -05:00
Isaac Connor	900fbe1e0f	update save to a button tag, and add a saveas functionality	2017-11-23 08:26:55 -08:00
Isaac Connor	485567349d	Don't calc DiskSpace if it is already defined	2017-11-23 07:29:05 -08:00