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
