vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-22 01:07:56 +01:00
Code Issues Releases Wiki Activity
86 Commits 8 Branches 37 Tags 2.6 MiB
JavaScript 74.6%
HTML 12.1%
CSS 11.4%
Makefile 1.2%
Shell 0.6%
aee5fecb88
Go to file
Adriaan Wormgoor aee5fecb88 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach 
# 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
2013-09-18 17:44:26 +02:00
css Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach 2013-09-18 17:44:26 +02:00
img a few new favicons and homescreen icons 2013-09-18 10:52:18 +02:00
js Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach 2013-09-18 17:44:26 +02:00
.gitignore Always dump gcode in textarea 2013-09-13 16:03:04 +02:00
favicon_alt.ico new favicon (for Firefox) 2013-09-18 10:52:40 +02:00
favicon.ico doodle3d favicon 2013-08-21 18:09:15 +02:00
favicon.png doodle3d facivon 2013-09-17 13:13:23 +02:00
fixedPosInterface01_v02.html minor class-name change 2013-08-30 09:51:23 +02:00
index.html intermediary progress 2013-09-18 16:02:51 +02:00
proxy.php Basic feedback and more control 2013-08-07 20:47:47 +02:00
README.md first commit 2013-06-19 16:23:57 +02:00
redirect.html Add redirect.html (only used as 404 page in captive portal mode). 2013-08-26 16:14:32 +02:00
settings.html removed wrong unit in settings 2013-09-18 11:28:21 +02:00

README.md