vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-10 21:23:23 +01:00
Code Issues Releases Wiki Activity
455 Commits 8 Branches 37 Tags 2.6 MiB
4b0fdc1bc1
Commit Graph

455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adriaan Wormgoor
e579c27284 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:
  Return to idle state when Doodle was to big.
  Added helpcontent file to makefile
  Console logging leave warning
 2013-10-23 18:10:54 +02:00
Adriaan Wormgoor
d4eaadfcb9 closes issue https://github.com/Doodle3D/doodle3d-client/issues/7 2013-10-23 18:10:45 +02:00
Adriaan Wormgoor
099711b33e somewhat robust detection of desktop, tablet or smartphone. This mainly w.r.t. the help tour, which we don't want to show on smartphones. 2013-10-23 18:10:25 +02:00
peteruithoven
ceb89b9664 Return to idle state when Doodle was to big. 2013-10-23 17:42:08 +02:00
peteruithoven
f59feb7d44 Added helpcontent file to makefile 2013-10-23 17:26:23 +02:00
peteruithoven
c3fb6fc016 Console logging leave warning 2013-10-23 17:25:46 +02:00
Adriaan Wormgoor
7cc5b01b37 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:
  Lowering max drawing complexity
  Also showing warning when gcode file is to big
  Messages auto hide after 2 > 5 seconds
  Settings validation messages are properly cleared
  Prevent preheat while buffering/printing/stopping
  Spelling correction
 2013-10-23 17:02:12 +02:00
Adriaan Wormgoor
3058ef5c79 updated intro Tour behavior 2013-10-23 17:01:59 +02:00
peteruithoven
8bd62c93ec Lowering max drawing complexity 2013-10-23 16:45:41 +02:00
peteruithoven
2b319c5dd6 Also showing warning when gcode file is to big 2013-10-23 16:45:24 +02:00
peteruithoven
580b0ef33e Messages auto hide after 2 > 5 seconds 2013-10-23 15:33:10 +02:00
peteruithoven
11c1764074 Settings validation messages are properly cleared 2013-10-23 15:32:28 +02:00
peteruithoven
cc2bcf962c Prevent preheat while buffering/printing/stopping 2013-10-23 12:45:41 +02:00
Wouter R
3b192078b4 Add logic for stepping through saved sketches (WIP, untested). 2013-10-23 12:43:21 +02:00
peteruithoven
f7bcd6e7c4 Spelling correction 2013-10-23 12:16:39 +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
9fc106b916 loading/saving sketches: metadata is now written in cdata as json and loaded back so sketches can be fully restored. 2013-10-23 02:43:58 +02:00