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
Wouter R
a545f8f2b1
Merge branch 'master' into develop
2013-11-22 18:03:17 +01:00
peteruithoven
3ff0eb921e
Small settings button style refactoring
2013-11-22 17:45:43 +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
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
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
Adriaan Wormgoor
341fb637b8
updated code for the tour of the Doodle3D app
2013-10-23 23:40:26 +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
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
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
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
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
