0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-12-19 20:03:48 +01:00
Commit Graph

307 Commits

Author SHA1 Message Date
peteruithoven
d18b420365 Merge branch 'develop' 2014-01-02 13:28:48 +01:00
peteruithoven
dfcd3ee2c2 Making sure the resetall call can't be aborted by request timout 2013-12-23 20:54:15 +01:00
peteruithoven
14789ea046 Increase saveSettings timeout and request it through cgi-bin 2013-12-23 17:51:31 +01:00
peteruithoven
136799e16c No retain option during update 2013-12-23 17:40:27 +01:00
peteruithoven
1f1b6c89dd Ignore settings form fields with empty name attr on save 2013-12-23 17:40:26 +01:00
peteruithoven
d50a42ef09 Retry preheat also if request failed 2013-12-23 17:40:25 +01:00
Wouter R
2d8c385e02 Add license header to source files. 2013-12-20 16:31:41 +01:00
Wouter R
744862b6a1 Add license + copyright info on external software.
Add configuration file for license header script.
Change js uglify to keep copyright comments.
2013-12-20 15:32:53 +01:00
peteruithoven
f0492e9246 Display send percentage in status message #126 2013-12-19 17:33:06 +01:00
peteruithoven
8222591041 Setting to enable or disable tour 2013-12-19 16:36:15 +01:00
peteruithoven
fc48b4de85 Merge branch 'heatedbedcondition' into develop 2013-12-18 17:46:56 +01:00
peteruithoven
f2f4727482 {if heatedBed} variable 2013-12-18 17:43:57 +01:00
peteruithoven
f077fdd484 Fix #45 Overruling printer into tour state 2013-12-18 16:56:06 +01:00
peteruithoven
8b0b8884ed Increased installed delay 2013-12-18 14:47:52 +01:00
Wouter R
d0806a0ea1 Include links to release notes in update panel, both for current version and for updateable version.
Bump package version.
2013-12-12 14:14:34 +01:00
peteruithoven
457cb756ad Merge branch 'develop' 2013-12-12 14:06:03 +01:00
Wouter R
aa585236b8 Fix prev button behaviour, fixes https://github.com/Doodle3D/doodle3d-client/issues/117.
Clear preview when all points have been ‘oopsed’ away, fixes https://github.com/Doodle3D/doodle3d-client/issues/123.
2013-12-11 22:21:05 +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
Rick Companje
997c34a532 ;LAYER comment temporary disabled 2013-12-06 15:03:18 +01:00
peteruithoven
238a9812e2 Request minified FileSaver lib 2013-12-05 18:13:33 +01:00
Rick Companje
9f0ab35cbd added FileSaver.js library 2013-12-05 18:03:21 +01:00
Rick Companje
2edba7a4c9 SettingsWindow printerType dropdown is now populated by API call 2013-12-05 17:32:37 +01:00
peteruithoven
c3fa844966 Added makerbot_replicator2x 2013-12-05 16:37:15 +01:00
Rick Companje
4799a7e95e made preview_tmp hidden in debugMode 2013-12-05 12:47:03 +01:00
Rick Companje
ff6df2f041 some extra keyboard shortcuts 2013-12-05 11:50:02 +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
dd6c1d8034 Added Ultimaker2 2013-12-04 14:56:17 +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
peteruithoven
965119de33 First version of new PrinterPanel. 2013-12-01 18:38:02 +01:00
Wouter R
eb2736afcb Add openwrt option to enable/disable minification of javascript files (enabled by default).
Bump version to 0.9.2.
2013-11-29 23:25:14 +01:00
Wouter R
a545f8f2b1 Merge branch 'master' into develop 2013-11-22 18:03:17 +01:00
Wouter R
c2d6c2274e Default makerbot printer type to replicator 2. 2013-11-22 18:01:53 +01:00
peteruithoven
d92a2bcb3c Ignoring grunt generated js libraries 2013-11-22 17:53:20 +01:00
peteruithoven
d89e440cd9 Removed grunt generated js libraries 2013-11-22 17:52:24 +01:00
peteruithoven
3ff0eb921e Small settings button style refactoring 2013-11-22 17:45:43 +01:00
peteruithoven
f98dc488d4 Reset settings to defaults 2013-11-22 17:45:16 +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
Wouter R
fe9c2cc5ea Dummy merge branch 'feature/savingsketches' to preserve history.
Commit [0b5cf1a] contains (most) of the changes in that branch, but in working form.
The merge was created as described here: <http://www.claassen.net/geek/blog/2011/02/git-merge-strategytheirs.html>.
2013-11-08 20:53:26 +01:00
peteruithoven
d715d19412 Other updated text 2013-10-30 21:21:12 +01:00
peteruithoven
c8f0ad4409 Change updated label, since we go to access point after update 2013-10-30 20:26:22 +01:00
Rick Companje
8b76a17ef7 added printer type replacement in start-gcode 2013-10-30 14:17:47 +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
e7ef6eccc4 fixed bug which happened if you pressed the move up/down or twist left/right buttons after loading Doodle3D (before drawing anything). Somewhat related: after pressing 'new', the move up/down and twist left/right buttons would show the previous (cached) doodle. Cleared that as well. 2013-10-29 22:08:08 +01:00
Adriaan Wormgoor
176f8f4ae1 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:
  Disabling prev, next and save buttons for now (code ready to enable/disable according to state) #41
2013-10-29 21:27:23 +01:00
Adriaan Wormgoor
09f60b8f4b many small UI (css) improvements 2013-10-29 21:27:17 +01:00
peteruithoven
8745e037a4 Disabling prev, next and save buttons for now (code ready to enable/disable according to state) #41 2013-10-29 15:09:07 +01:00