Commit Graph

489 Commits

Author SHA1 Message Date
Rick Companje 997c34a532 ;LAYER comment temporary disabled 2013-12-06 15:03:18 +01:00
peteruithoven 238a9812e2 Request minified FileSaver lib 2013-12-05 18:13:33 +01:00
Rick Companje 9f0ab35cbd added FileSaver.js library 2013-12-05 18:03:21 +01:00
Rick Companje 2edba7a4c9 SettingsWindow printerType dropdown is now populated by API call 2013-12-05 17:32:37 +01:00
peteruithoven c3fa844966 Added makerbot_replicator2x 2013-12-05 16:37:15 +01:00
Rick Companje 4799a7e95e made preview_tmp hidden in debugMode 2013-12-05 12:47:03 +01:00
Rick Companje ff6df2f041 some extra keyboard shortcuts 2013-12-05 11:50:02 +01:00
Rick Companje b85d3244c9 Added download GCODE feature, added keyboard shortcuts and added some basic Shapes 2013-12-05 11:14:12 +01:00
peteruithoven dd6c1d8034 Added Ultimaker2 2013-12-04 14:56:17 +01:00
peteruithoven 9b802ceea9 Merge branch 'feature/printerprofiles' into develop
Conflicts:
	js_src/gcodeGenerating.js
2013-12-04 14:00:27 +01:00
peteruithoven ff397700b7 Made gcodePanel collapsible using coolfieldset 2013-12-04 13:42:37 +01:00
peteruithoven 965119de33 First version of new PrinterPanel. 2013-12-01 18:38:02 +01:00
Wouter R eb2736afcb Add openwrt option to enable/disable minification of javascript files (enabled by default).
Bump version to 0.9.2.
2013-11-29 23:25:14 +01:00
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