# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
Small css tweak
Messages! Showing info about buffering, connection to wifibox and printer
Leave warning while sending
Added heatup in startgcode and replace {printingTemp} and {preheatTemp} for settings
Added network reconnect hint
Integrated progressbar
Save settings before connect to network / create access point and display validation errors and only close settings when settings are saved
Conflicts:
css/styles.min.css
js/main.js
----------------------------------------------------------------------
Merge branch 'new_layouting_approach' into feature/printerdriver
* new_layouting_approach: (22 commits)
changed chmod
adjustments to make preview be initialized and updated better (when resizing)
updates css styles
changes to how the draw and preview canvasses are positioned and initted
many updates CSS and LESS files and generally a responsive scaling overhaul of the settings page
new LESS
simple js lib for managing the folded in/out state of the sidebars on the minimal interface
arrow file used in the minimal doodle3d interface
the resulting css files which LESS outputs
removed this because it's being rolled into the styles.css by LESS
moved logos to their own dir + removed a few redundant ones
copy normalize.css to the LESS dir since it's a source file
smallest size of the doodle3d logo
started using LESS for stylesheeting
commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch)
a lot of changes -> almost there but the drawing is not consistent yet across devices. Drawing on the draw canvas is going OK but the preview is not drawing well now. Giving up for now.
changes (sry)
intermediary progress
commented out part of the css (not final solution)
added todo for future
...
# By Adriaan Wormgoor (6) and peteruithoven (4)
# Via Adriaan Wormgoor (2) and peteruithoven (2)
* 'master' of https://github.com/Doodle3D/doodle3d-client:
objectHeight and twist fix and temp display fix
minor repositioning of temp-guage so that it doesn't overlap with the info-button
gcode generated twist now complies with the doodle preview
made the 'ok' button have a mouseover 'hand' cursor
commented out call to missing setPrintprogress()
removed wrong unit in settings
Removed unused draw logic
additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV
new favicon (for Firefox)
a few new favicons and homescreen icons
Conflicts:
js/Thermometer.js
js/gcodeGenerating_v01.js
Display temperature
Only show temperature when connected with printer
Move index.html javascript to main.js
stop button (Still having issues in firmware)
OOP style printer control
Added a proxy.php file to forward cross domain posts and get's. (should
not be necessary)
