vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-15 23:27:57 +01:00
Code Issues Releases Wiki Activity
484 Commits 8 Branches 37 Tags 2.6 MiB
4e18fa0f56
Commit Graph

45 Commits

Author SHA1 Message Date
Rick Companje
3d99c146a0 added a button for importing photos for tracing by hand 2014-10-09 16:24:24 +02:00
Wouter R
ee6bab1c5a Change message.set() to set html instead of text. 
Move message div to appear on top of logo and dialog overlays.
Minor text modifications.
 2014-03-06 13:43:08 +01:00
peteruithoven
5c5d45088a Added mobile-web-app-capable meta tag and minimal-ui to viewport 2014-02-28 23:57:03 +01:00
Wouter R
d634f2e9c3 Merge branch 'text-experiment' into develop 
Conflicts:
	js/Help.js
	js/buttonbehaviors.js
	js/main.js
	js_src/Keyboard.js
	js_src/Shape.js
	js_src/verticalShapes.js
	www/index.html
 2014-01-17 13:21:02 +01:00
peteruithoven
31cec107b0 Restyled settings popup 2014-01-16 22:51:19 +01:00
peteruithoven
bbed35d877 Generalized Popups 2014-01-16 21:30:57 +01:00
peteruithoven
548ea2732a AddShape point icons 2014-01-16 17:09:15 +01:00
peteruithoven
e9a2b90483 New Twist and Height buttons 2014-01-16 16:07:40 +01:00
peteruithoven
7d726f513e Turned logo into btn 2014-01-16 12:16:09 +01:00
peteruithoven
01f28a2403 Edit button group 2014-01-13 16:38:26 +01:00
peteruithoven
ab329aaaf1 VerticalShapes toggle button 2014-01-13 15:52:40 +01:00
peteruithoven
82b57def39 Cleanup 2014-01-10 17:21:43 +01:00
peteruithoven
139e4ca6ae Cleanup 2014-01-10 14:04:17 +01:00
peteruithoven
a4ad7d7198 Cleanup 2014-01-10 13:59:55 +01:00
Wouter R
af95065bbe Fix mistake in js include. 2014-01-10 12:12:25 +01:00
Rick Companje
0ad800b021 removed files 2014-01-09 18:10:54 +01:00
Rick Companje
2cdeaacd14 major changes in interface 2014-01-09 17:05:03 +01:00
Wouter R
292f798f9a Update list of separate js includes for local development. 2014-01-07 22:35:57 +01:00
Wouter R
076b69500e Bind click buttons to ‘click’ event to prevent double triggers. 
prev/next buttons are now initially disabled.
 2013-12-11 17:57:29 +01:00
peteruithoven
238a9812e2 Request minified FileSaver lib 2013-12-05 18:13:33 +01:00
Rick Companje
2edba7a4c9 SettingsWindow printerType dropdown is now populated by API call 2013-12-05 17:32:37 +01:00
Rick Companje
b85d3244c9 Added download GCODE feature, added keyboard shortcuts and added some basic Shapes 2013-12-05 11:14:12 +01:00
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