vmario
/
doodle3d-client
mirror of https://github.com/Doodle3D/doodle3d-client.git
0
0
Fork 0
Code Issues Releases Wiki Activity
276 Commits 8 Branches 37 Tags 2.6 MiB
Commit Graph

276 Commits

Author SHA1 Message Date
Wouter R a545f8f2b1 Merge branch 'master' into develop 2013-11-22 18:03:17 +01:00
Wouter R c2d6c2274e Default makerbot printer type to replicator 2. 2013-11-22 18:01:53 +01:00
peteruithoven d92a2bcb3c Ignoring grunt generated js libraries 2013-11-22 17:53:20 +01:00
peteruithoven d89e440cd9 Removed grunt generated js libraries 2013-11-22 17:52:24 +01:00
peteruithoven 3ff0eb921e Small settings button style refactoring 2013-11-22 17:45:43 +01:00
peteruithoven f98dc488d4 Reset settings to defaults 2013-11-22 17:45:16 +01:00
Wouter R ea2d50fd60 Lower number of lines to send per gcode part to 500, this should fix failure to convert to x3g code for Makerbots (which took about 8 seconds while ajax timeouts are 5 seconds). 
Bump version to 0.9.1.
 2013-11-22 16:51:26 +01:00
Wouter R fe9c2cc5ea Dummy merge branch 'feature/savingsketches' to preserve history. 
Commit [0b5cf1a] contains (most) of the changes in that branch, but in working form.
The merge was created as described here: <http://www.claassen.net/geek/blog/2011/02/git-merge-strategytheirs.html>.
 2013-11-08 20:53:26 +01:00
peteruithoven d715d19412 Other updated text 2013-10-30 21:21:12 +01:00
peteruithoven c8f0ad4409 Change updated label, since we go to access point after update 2013-10-30 20:26:22 +01:00
Rick Companje 8b76a17ef7 added printer type replacement in start-gcode 2013-10-30 14:17:47 +01:00
Adriaan Wormgoor 41f8232ebb Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 
# By Rick Companje
# Via Rick Companje
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  added working prev/next/save functionality
 2013-10-30 13:03:26 +01:00
Adriaan Wormgoor f9f64f7133 favicon reference (for Android browser) 2013-10-30 13:03:15 +01:00
Rick Companje 1da8ff05d0 Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-client into feature/printerdriver 2013-10-29 23:26:26 +01:00
Rick Companje 0b5cf1a5f4 added working prev/next/save functionality 2013-10-29 23:26:09 +01:00
Adriaan Wormgoor e7ef6eccc4 fixed bug which happened if you pressed the move up/down or twist left/right buttons after loading Doodle3D (before drawing anything). Somewhat related: after pressing 'new', the move up/down and twist left/right buttons would show the previous (cached) doodle. Cleared that as well. 2013-10-29 22:08:08 +01:00
Adriaan Wormgoor 176f8f4ae1 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Disabling prev, next and save buttons for now (code ready to enable/disable according to state) #41
 2013-10-29 21:27:23 +01:00
Adriaan Wormgoor 09f60b8f4b many small UI (css) improvements 2013-10-29 21:27:17 +01:00
peteruithoven 8745e037a4 Disabling prev, next and save buttons for now (code ready to enable/disable according to state) #41 2013-10-29 15:09:07 +01:00
Adriaan Wormgoor 7003aefe66 - change Message z-index to overlap over Doodle3D logo 
- change Message position in DOM so that the Message box is fully visible in the mobile view
 2013-10-29 14:43:48 +01:00
peteruithoven 5f15b9945c Download logs button #9 2013-10-29 14:10:56 +01:00
peteruithoven 159adb8df8 404 page 2013-10-29 12:42:03 +01:00
peteruithoven b57dab9826 Better settings fieldset label and description 2013-10-29 11:09:15 +01:00
Adriaan Wormgoor e6e34e4ca6 Thermometer graph goes above target temperature (fixes issue https://github.com/Doodle3D/doodle3d-client/issues/6 ) 2013-10-28 21:48:53 +01:00
Adriaan Wormgoor 69b50cc55d Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Sending endcode with API:printer/stop. Refactored start- and endcode generation
  Seperate CGI-bin signin request
  Open Settings window after settings are loaded
 2013-10-28 19:58:14 +01:00
Adriaan Wormgoor d53f1c3e0f when undoing, the preview recalculates its viewsize (ie keeping it maximized on the preview) 2013-10-28 19:37:33 +01:00
Adriaan Wormgoor 68bcd4834a fixes issue https://github.com/Doodle3D/doodle3d-client/issues/13 2013-10-28 19:36:12 +01:00
Adriaan Wormgoor ef7a147a5b very minor editing (basically trying to see if I could improve minification, don't think it helped) 2013-10-28 19:34:49 +01:00
peteruithoven 3e6dde503e Sending endcode with API:printer/stop. Refactored start- and endcode generation 2013-10-28 17:17:50 +01:00
peteruithoven 9ead4a9416 Seperate CGI-bin signin request 2013-10-28 13:50:08 +01:00
peteruithoven cfff8b498f Open Settings window after settings are loaded 2013-10-28 11:16:00 +01:00
peteruithoven f783726c47 A little less code duplication 2013-10-28 01:26:58 +01:00
peteruithoven 96a48b38d9 Makerbot start- and endcode settings 2013-10-28 01:11:13 +01:00
peteruithoven 636d00370a Printer bed size setting 2013-10-26 03:24:30 +02:00
peteruithoven b67c24d750 Printer type selection 2013-10-26 03:14:30 +02:00
peteruithoven 2e09d8bccb Reenabling Settings ok button when validation failed 2013-10-26 02:40:55 +02:00
peteruithoven 8550cc586a Disabling SettingsWindow ok button while saving 2013-10-26 01:46:24 +02:00
Adriaan Wormgoor 341fb637b8 updated code for the tour of the Doodle3D app 2013-10-23 23:40:26 +02:00
Adriaan Wormgoor 05f2c58aa9 - purge of unused js libs 
- refresh of used js libs
 2013-10-23 23:20:06 +02:00
Adriaan Wormgoor 8482d1f278 remove superfluous libs 2013-10-23 19:45:01 +02:00
Adriaan Wormgoor 7057a92da6 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 
# By Wouter R (2) and peteruithoven (1)
# Via Wouter R (2) and peteruithoven (1)
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Warning text improvement
  Fix spelling error.
  Disable settings button if printer is busy or no control access.
 2013-10-23 19:10:40 +02:00
Adriaan Wormgoor 52d7da85fe some finetuning of help tour 2013-10-23 19:10:32 +02:00
Wouter R 5ebaf0e654 Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-client into feature/printerdriver 2013-10-23 18:49:21 +02:00
Wouter R 1155cad8c2 Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-client into feature/printerdriver 
Conflicts:
	js_src/Printer.js
 2013-10-23 18:48:02 +02:00
peteruithoven c1160c60a7 Warning text improvement 2013-10-23 18:46:18 +02:00
Adriaan Wormgoor f3e45662ad Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver 
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Another spelling correction
 2013-10-23 18:45:28 +02:00
Adriaan Wormgoor 8350425070 slight adjustments to styling and positioning of help tour elements 2013-10-23 18:45:19 +02:00
Wouter R 2e93202bfc Fix spelling error. 2013-10-23 18:43:54 +02:00
Wouter R 98e0418eb8 Disable settings button if printer is busy or no control access. 2013-10-23 18:42:47 +02:00
peteruithoven 4cf3ef2d58 Another spelling correction 2013-10-23 18:25:15 +02:00