Commit Graph

107 Commits

Author SHA1 Message Date
peteruithoven 8222591041 Setting to enable or disable tour 2013-12-19 16:36:15 +01:00
peteruithoven f2f4727482 {if heatedBed} variable 2013-12-18 17:43:57 +01:00
Wouter R 076b69500e Bind click buttons to ‘click’ event to prevent double triggers.
prev/next buttons are now initially disabled.
2013-12-11 17:57:29 +01:00
peteruithoven 238a9812e2 Request minified FileSaver lib 2013-12-05 18:13:33 +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 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 a545f8f2b1 Merge branch 'master' into develop 2013-11-22 18:03:17 +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
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 09f60b8f4b many small UI (css) improvements 2013-10-29 21:27:17 +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
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
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 8350425070 slight adjustments to styling and positioning of help tour elements 2013-10-23 18:45:19 +02:00
Adriaan Wormgoor 3058ef5c79 updated intro Tour behavior 2013-10-23 17:01:59 +02:00
Adriaan Wormgoor 7daa661f3c index.html didn't point to the minified version of a js file 2013-10-23 11:40:54 +02:00
Adriaan Wormgoor 06a969446a corrected: pointed to js file outside of www dir 2013-10-23 11:39:25 +02:00
Adriaan Wormgoor d7d30f8167 lot of new files (will weed out later, some are probably not going to be used by us) 2013-10-23 06:49:14 +02:00
Adriaan Wormgoor ff98a24526 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver
# By Wouter R
# Via Wouter R
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Re-added two css files which were accidentally untracked.
  Untrack and ignore derived files in www/js and www/css directories.
  Change references to minified stylesheets.
  Add openwrt package Makefile. Add short description of steps to build css and js files.
  Fix permissions.

Conflicts:
	www/css/styles.css
	www/css/styles.min.css
	www/index.html
	www/js/doodle3d-client.js
	www/js/doodle3d-client.min.js
2013-10-23 06:48:29 +02:00
Adriaan Wormgoor d3029096a7 added a simple help layer to the app (jquery joyride) 2013-10-23 06:46:07 +02:00
Wouter R 02d026e52a Re-added two css files which were accidentally untracked. 2013-10-22 21:49:22 +02:00
Wouter R 86dcb57677 Untrack and ignore derived files in www/js and www/css directories. 2013-10-22 21:20:33 +02:00
Wouter R 6e79e70c0b Change references to minified stylesheets. 2013-10-22 19:43:37 +02:00
Wouter R 7b44b52cdd Fix permissions. 2013-10-22 17:39:44 +02:00
Adriaan Wormgoor df98330259 - some more files w.r.t. help
- fixed issue #3 https://github.com/Doodle3D/doodle3d-client/issues/3
2013-10-22 16:54:10 +02:00
Adriaan Wormgoor cda7b43163 - new libs and files for the in-app help
- moved some uncompressed js libs to js_src/libs
2013-10-22 16:37:56 +02:00
peteruithoven 4899f7f510 Added bed temperature settings and replacement patterns 2013-10-22 16:00:59 +02:00
peteruithoven d06008b3dc Correcting spelling mistake 2013-10-22 16:00:59 +02:00
Adriaan Wormgoor b55a9be25f slight change 2013-10-22 12:21:45 +02:00
Adriaan Wormgoor f0f97198ec Big changes to order and placement of JS files:
- grunt file updated to include automatic production of doodle3d-client.js and doodle3d-client.min.js
- all individual JS files moved to outside scope of 'www' dir to reflect these changes
2013-10-22 12:04:46 +02:00
Adriaan Wormgoor 90e00913ab 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:
  UpdatePanel
2013-10-22 11:01:11 +02:00
Adriaan Wormgoor 447b245c5b fix bug where progressguage and thermometer were making print and stop button non-clickable 2013-10-22 11:00:33 +02:00
peteruithoven 48a602e856 UpdatePanel 2013-10-22 03:31:12 +02:00
Adriaan Wormgoor 13b500f267 further squeezing of kilobytes from the assets to save space on the 'kastje' 2013-10-21 16:48:41 +02:00
Adriaan Wormgoor eb2f941639 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:
  store settings locally on save
2013-10-21 15:44:54 +02:00
Adriaan Wormgoor 8289c084ca - Grunt configured
- first install the dependencies with 'sudo npm install'
- then run with 'grunt'
2013-10-21 15:44:09 +02:00
peteruithoven bc15491bf4 store settings locally on save 2013-10-21 15:14:08 +02:00
Adriaan Wormgoor 4ec660fd74 overhaul of client files to 'www' dir. This dir will now as a 'bin' dir of sorts. Outside of the 'www' dir there will be old files, temp files and also shell scripts which support continuous compilation and minification of css and js files 2013-10-21 11:40:38 +02:00