8482d1f278
remove superfluous libs
2013-10-23 19:45:01 +02:00
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
52d7da85fe
some finetuning of help tour
2013-10-23 19:10:32 +02:00
5ebaf0e654
Merge branch 'feature/printerdriver' of github.com:Doodle3D/doodle3d-client into feature/printerdriver
2013-10-23 18:49:21 +02:00
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
c1160c60a7
Warning text improvement
2013-10-23 18:46:18 +02:00
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
8350425070
slight adjustments to styling and positioning of help tour elements
2013-10-23 18:45:19 +02:00
2e93202bfc
Fix spelling error.
2013-10-23 18:43:54 +02:00
98e0418eb8
Disable settings button if printer is busy or no control access.
2013-10-23 18:42:47 +02:00
4cf3ef2d58
Another spelling correction
2013-10-23 18:25:15 +02:00
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
d4eaadfcb9
closes issue https://github.com/Doodle3D/doodle3d-client/issues/7
2013-10-23 18:10:45 +02:00
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
ceb89b9664
Return to idle state when Doodle was to big.
2013-10-23 17:42:08 +02:00
f59feb7d44
Added helpcontent file to makefile
2013-10-23 17:26:23 +02:00
c3fb6fc016
Console logging leave warning
2013-10-23 17:25:46 +02:00
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
3058ef5c79
updated intro Tour behavior
2013-10-23 17:01:59 +02:00
8bd62c93ec
Lowering max drawing complexity
2013-10-23 16:45:41 +02:00
2b319c5dd6
Also showing warning when gcode file is to big
2013-10-23 16:45:24 +02:00
580b0ef33e
Messages auto hide after 2 > 5 seconds
2013-10-23 15:33:10 +02:00
11c1764074
Settings validation messages are properly cleared
2013-10-23 15:32:28 +02:00
cc2bcf962c
Prevent preheat while buffering/printing/stopping
2013-10-23 12:45:41 +02:00
3b192078b4
Add logic for stepping through saved sketches (WIP, untested).
2013-10-23 12:43:21 +02:00
f7bcd6e7c4
Spelling correction
2013-10-23 12:16:39 +02:00
7daa661f3c
index.html didn't point to the minified version of a js file
2013-10-23 11:40:54 +02:00
06a969446a
corrected: pointed to js file outside of www dir
2013-10-23 11:39:25 +02:00
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
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
d3029096a7
added a simple help layer to the app (jquery joyride)
2013-10-23 06:46:07 +02:00
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
56d404522a
Move loadFromSvg and saveToSvg to better position in file.
2013-10-23 01:31:03 +02:00
77a58849e8
Load sketch path from svg (WIP, metadata is not parsed yet).
2013-10-23 01:29:50 +02:00
81bdabd2d5
Clean up empty directories on package removal.
2013-10-22 22:38:42 +02:00
02d026e52a
Re-added two css files which were accidentally untracked.
2013-10-22 21:49:22 +02:00
db4ed0df8a
Re-added two css files which were accidentally untracked.
2013-10-22 21:45:56 +02:00
86dcb57677
Untrack and ignore derived files in www/js and www/css directories.
2013-10-22 21:20:33 +02:00
21b5f5d03e
Untrack and ignore derived files in www/js and www/css directories.
2013-10-22 21:19:37 +02:00
feae8ba3e6
Merge branch 'feature/printerdriver' into feature/savingsketches
2013-10-22 20:51:16 +02:00
6e79e70c0b
Change references to minified stylesheets.
2013-10-22 19:43:37 +02:00
1f79986f54
Add openwrt package Makefile. Add short description of steps to build css and js files.
2013-10-22 18:23:29 +02:00
7b44b52cdd
Fix permissions.
2013-10-22 17:39:44 +02:00
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
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
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
b3823c1fc5
.gitignore
2013-10-22 16:17:38 +02:00
4899f7f510
Added bed temperature settings and replacement patterns
2013-10-22 16:00:59 +02:00
d06008b3dc
Correcting spelling mistake
2013-10-22 16:00:59 +02:00
b55a9be25f
slight change
2013-10-22 12:21:45 +02:00
Adriaan Wormgoor
Wouter R
peteruithoven