Commit Graph

322 Commits

Author SHA1 Message Date
peteruithoven abc9841bc7 Handling new print3d driver (using new api, printer states) 2013-10-11 12:39:05 +02:00
Adriaan Wormgoor 65f43f197f updates css styles 2013-10-11 11:44:28 +02:00
Adriaan Wormgoor 0a44087989 changes to how the draw and preview canvasses are positioned and initted 2013-10-11 11:42:27 +02:00
Adriaan Wormgoor b6f77fc39e many updates CSS and LESS files and generally a responsive scaling overhaul of the settings page 2013-10-10 19:18:29 +02:00
peteruithoven d417a7454f Better network connecting feedback 2013-10-10 12:12:33 +02:00
Adriaan Wormgoor 98edfb2a7e new LESS 2013-10-09 19:21:33 +02:00
Adriaan Wormgoor 23fdaeaaa0 simple js lib for managing the folded in/out state of the sidebars on the minimal interface 2013-10-09 18:53:49 +02:00
Adriaan Wormgoor 16c46355f1 arrow file used in the minimal doodle3d interface 2013-10-09 18:53:16 +02:00
Adriaan Wormgoor a38535ecd1 the resulting css files which LESS outputs 2013-10-09 18:52:54 +02:00
Adriaan Wormgoor 1e646caef0 removed this because it's being rolled into the styles.css by LESS 2013-10-09 18:50:11 +02:00
Adriaan Wormgoor 58d8fa1454 moved logos to their own dir + removed a few redundant ones 2013-10-09 18:46:25 +02:00
Adriaan Wormgoor 1af5ee6125 copy normalize.css to the LESS dir since it's a source file 2013-10-09 18:21:49 +02:00
Adriaan Wormgoor c449ccd317 smallest size of the doodle3d logo 2013-10-09 18:18:34 +02:00
Adriaan Wormgoor 4d54dc56d9 started using LESS for stylesheeting 2013-10-09 18:15:47 +02:00
peteruithoven f292c01d64 Changed preheat temperature field into number 2013-10-02 14:49:37 +02:00
peteruithoven caca7b2ac9 Added wifiboxid to settings 2013-10-02 14:47:33 +02:00
peteruithoven 79e2fe1a8a Show current ip in settings window 2013-10-02 14:47:33 +02:00
peteruithoven b6dca873e7 Use uhttpd lua handler 2013-10-02 14:47:33 +02:00
Adriaan Wormgoor dd2ca8a1cb commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch) 2013-09-27 18:15:33 +02:00
Wouter R a45d1ad8ed Bugfix for heatup change. 2013-09-27 16:04:56 +02:00
peteruithoven f0df41bc89 warmUpCommand > heatup.temperature 2013-09-27 13:58:59 +02:00
peteruithoven ce8e306994 Preventing OS X / iOS captive portal popup altogether 2013-09-25 19:01:08 +02:00
peteruithoven 80b4a53d5a Raw captive portal detected popup 2013-09-25 16:19:40 +02:00
Adriaan Wormgoor 1842ec01b2 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Slightly longer allowed temp mod time
2013-09-18 22:35:59 +02:00
Adriaan Wormgoor 267587fe2f vertical shapes implemented 2013-09-18 22:35:38 +02:00
Adriaan Wormgoor ecae281a74 new vertical shape icons 2013-09-18 21:22:58 +02:00
peteruithoven 6c7018a00d Slightly longer allowed temp mod time 2013-09-18 20:59:35 +02:00
Adriaan Wormgoor 44f3895d34 small change to make settings page appear directly over the d3d interface 2013-09-18 20:43:00 +02:00
Adriaan Wormgoor 6cf58db7a3 reduced maximem rotation slightly, to reduce risk of overlapping 2013-09-18 20:42:32 +02:00
Adriaan Wormgoor fdfaafd99d simple code changes. Border around D3D interface makes slightly more sense. 2013-09-18 20:17:25 +02:00
Adriaan Wormgoor 3d318bb56e gcode changes submitted by Rick, w.r.t. centering the doodle for Ultimakers (means: doodle is only in positive space, i.e. there are no negative coordinates) 2013-09-18 20:15:58 +02:00
peteruithoven 979403826a another hack to show targetTemp 2013-09-18 19:20:44 +02:00
Adriaan Wormgoor 6e32a36e12 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.
2013-09-18 19:08:58 +02:00
peteruithoven a692976be6 Only preheat the first time the settings where saved 2013-09-18 18:56:57 +02:00
peteruithoven 6c7b832a30 update timing hacks 2013-09-18 18:56:57 +02:00
Adriaan Wormgoor c51107a275 changes (sry) 2013-09-18 17:45:02 +02:00
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
Adriaan Wormgoor d610e802f5 Merge branches 'master' and 'master' of https://github.com/Doodle3D/doodle3d-client
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  objectHeight and twist fix and temp display fix

# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  objectHeight and twist fix and temp display fix
2013-09-18 17:16:23 +02:00
peteruithoven ac5f129e47 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
Conflicts:
	js/gcodeGenerating_v01.js
2013-09-18 17:01:45 +02:00
peteruithoven 0b49256fd5 objectHeight and twist fix and temp display fix 2013-09-18 16:59:48 +02:00
Adriaan Wormgoor 5a45d1f3b5 minor repositioning of temp-guage so that it doesn't overlap with the info-button 2013-09-18 16:19:06 +02:00
Adriaan Wormgoor 8a88c173e5 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  commented out call to missing setPrintprogress()
  removed wrong unit in settings
  Removed unused draw logic
2013-09-18 16:10:47 +02:00
Adriaan Wormgoor 001428f349 gcode generated twist now complies with the doodle preview 2013-09-18 16:10:22 +02:00
Adriaan Wormgoor 066eb182f0 intermediary progress 2013-09-18 16:02:51 +02:00
Adriaan Wormgoor f6fd05113a made the 'ok' button have a mouseover 'hand' cursor 2013-09-18 12:06:47 +02:00
Adriaan Wormgoor bd83fc42f8 commented out part of the css (not final solution) 2013-09-18 12:04:53 +02:00
Adriaan Wormgoor d7c32c926f added todo for future 2013-09-18 12:04:06 +02:00
Adriaan Wormgoor 51aabf56c1 tiny, tiny indent change 2013-09-18 11:39:34 +02:00
peteruithoven fa0a610a8c commented out call to missing setPrintprogress() 2013-09-18 11:34:36 +02:00
peteruithoven 4788321a62 removed wrong unit in settings 2013-09-18 11:28:21 +02:00