207 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	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	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
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
Adriaan Wormgoor	66271c5287	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: Small css tweak Messages! Showing info about buffering, connection to wifibox and printer Leave warning while sending Added heatup in startgcode and replace {printingTemp} and {preheatTemp} for settings Added network reconnect hint Integrated progressbar Save settings before connect to network / create access point and display validation errors and only close settings when settings are saved Conflicts: css/styles.min.css js/main.js	2013-10-21 10:39:21 +02:00
Adriaan Wormgoor	524643e28a	clearfix fix for progressguage and thermometer layouting	2013-10-21 10:28:04 +02:00
peteruithoven	2950638873	Small css tweak	2013-10-18 23:57:06 +02:00
peteruithoven	10724b1746	Messages! Showing info about buffering, connection to wifibox and printer	2013-10-18 19:11:10 +02:00
peteruithoven	46d2ae4bfc	Leave warning while sending	2013-10-18 16:38:20 +02:00
peteruithoven	5ceabf41ba	Added heatup in startgcode and replace {printingTemp} and {preheatTemp} for settings	2013-10-18 15:55:11 +02:00
peteruithoven	10ca22d7e9	Added network reconnect hint	2013-10-18 13:23:50 +02:00
peteruithoven	b978b5ada5	Integrated progressbar	2013-10-17 14:40:33 +02:00
peteruithoven	53e8ccc294	Save settings before connect to network / create access point and display validation errors and only close settings when settings are saved	2013-10-17 14:09:13 +02:00
Adriaan Wormgoor	b2191217cb	better margins for thermo and progress	2013-10-16 23:32:50 +02:00
Adriaan Wormgoor	b89f2385b8	removed debug-method (thermo and progress (dis)appearing)	2013-10-16 23:20:13 +02:00
Adriaan Wormgoor	69933b3b41	bigger thermo and progress	2013-10-16 23:19:18 +02:00
Adriaan Wormgoor	5c9c8c8e8c	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: Check gcode generation feasibility check to prevent iPad/iPhone crashes Removing confirm stop status checks on override and start them again when there is a first response reset the status check when printer state is overruled	2013-10-16 23:11:13 +02:00
Adriaan Wormgoor	e01175ed81	styles and html pertaining to the new Progressbar and Thermometer look and feel	2013-10-16 23:11:06 +02:00
Adriaan Wormgoor	7d9b099aec	progressguage images	2013-10-16 23:03:03 +02:00
peteruithoven	ff14078d46	Check gcode generation feasibility check to prevent iPad/iPhone crashes	2013-10-16 22:25:15 +02:00
peteruithoven	b1ded5d41b	Removing confirm	2013-10-16 18:32:24 +02:00
peteruithoven	d5aef3bf95	stop status checks on override and start them again when there is a first response	2013-10-16 18:27:17 +02:00
peteruithoven	9ab36d999e	reset the status check when printer state is overruled	2013-10-16 18:27:17 +02:00