Commit Graph

10671 Commits

Author SHA1 Message Date
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 00e963eba4 remove the dependency on boost 2017-11-28 07:17:26 -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
Isaac Connor 00c5590a71 add Monitor count to servers 2017-11-27 11:56:48 -08:00
Isaac Connor c2ff010d27 Support NULL in date/time values 2017-11-27 10:04:08 -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 7c491bf62e make compile on trusty 2017-11-26 18:06:12 -05:00
Isaac Connor fc27674d76 can't do init in the if statement 2017-11-26 17:50:57 -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 4a884afecb need the update file 2017-11-26 15:08:12 -05:00