vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-05 11:43:22 +01:00
Code Issues Releases Wiki Activity
327 Commits 8 Branches 37 Tags 2.6 MiB
e56d4bcd84
Commit Graph

327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wouter R
56d404522a Move loadFromSvg and saveToSvg to better position in file. 2013-10-23 01:31:03 +02:00
Wouter R
77a58849e8 Load sketch path from svg (WIP, metadata is not parsed yet). 2013-10-23 01:29:50 +02:00
Wouter R
81bdabd2d5 Clean up empty directories on package removal. 2013-10-22 22:38:42 +02:00
Wouter R
02d026e52a Re-added two css files which were accidentally untracked. 2013-10-22 21:49:22 +02:00
Wouter R
db4ed0df8a Re-added two css files which were accidentally untracked. 2013-10-22 21:45:56 +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
21b5f5d03e Untrack and ignore derived files in www/js and www/css directories. 2013-10-22 21:19:37 +02:00
Wouter R
feae8ba3e6 Merge branch 'feature/printerdriver' into feature/savingsketches 2013-10-22 20:51:16 +02:00
Wouter R
6e79e70c0b Change references to minified stylesheets. 2013-10-22 19:43:37 +02:00
Wouter R
1f79986f54 Add openwrt package Makefile. Add short description of steps to build css and js files. 2013-10-22 18:23:29 +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
Adriaan Wormgoor
476e7d3e2d 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:
  Added bed temperature settings and replacement patterns
  Correcting spelling mistake

Conflicts:
	.gitignore
 2013-10-22 16:21:06 +02:00
Adriaan Wormgoor
b3823c1fc5 .gitignore 2013-10-22 16:17:38 +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
Wouter R
9c9086ab91 Small svg fix. 
Path is now translated so the data can actually be previewed properly.
Change metadata to be put in a single comment.
 2013-10-21 23:29:07 +02:00
Wouter R
28c179aa77 Hacky implementation of an SVG generator + api call to save generated data. 2013-10-21 22:37:10 +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