q3k/OctoPrint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1100 commits 1 branch 0 tags 18 MiB
Commit graph

67 commits

Author SHA1 Message Date
Dale Price
021f413c12 add "Load and Print" button which automatically starts printing when a gcode file is done loading. 
Solves foosel/OctoPrint#91
 2013-03-26 00:09:36 -05:00
Gina Häußge
e08783c8bf Merge remote-tracking branch 'daprice/master' into devel 2013-03-16 00:28:37 +01:00
Dale Price
088253e564 work around a bug in iOS 6 where ajax requests get cached and only work once 2013-03-14 20:55:02 -05:00
Dale Price
d564176c9c fix localStorage bug by not trying (and failing) to make it a multidimensional array; use JSON to store array of filters in localStorage 2013-03-13 03:01:18 -05:00
Gina Häußge
4b8260b933 Fixed some indentation 2013-03-11 21:46:05 +01:00
Gina Häußge
e2798de727 Merge branch 'daftscience-master' into devel 2013-03-11 21:15:27 +01:00
Tom
2904bd62d7 Enter key sends command 
Sending a command also clears the field.
 2013-03-11 10:38:41 -04:00
Gina Häußge
eb3832b028 Implemented support for customizable system actions/commands, e.g. for shutting down/rebooting the system OctoPrint's running on from within the UI. 2013-03-10 17:04:05 +01:00
Gina Häußge
07d4a8fd4f Added (optional!) watermark addition to generated timelapse movies. 2013-03-09 00:23:52 +01:00
Gina Häußge
3b50fdcf3f Switched column sizes for gcode and timelapse file tables to pixel values. 2013-03-08 23:25:04 +01:00
Gina Häußge
133831e08e Fixed buggy column styles for gcode and timelapse file tables 2013-03-08 21:47:51 +01:00
Gina Häußge
f1dc0a629a Fixed state information for gcode file upload. Now offers some status text that gives feedback whether file is still uploading to the server or being saved to disk on the server. 2013-03-08 21:05:53 +01:00
Gina Häußge
95d6c18183 Use contrast function for calculating text color in navbar 2013-03-08 20:36:18 +01:00
Richard Mitchell
26c6c0fb5f Missing semi-colon causing problems 2013-03-08 06:34:31 +00:00
Gina Häußge
6eb8991035 Migrated ui.css to LESS (just some small touch ups compared to plain css version, nothing fancy) 2013-03-07 22:19:33 +01:00
Gina Häußge
59ffa94cde Playing around with less... 2013-03-06 23:38:31 +01:00
Gina Häußge
1fbb73e448 Refactored pagination/sorting/filtering of gcode files into own configurable listHelper now used to provide pagination etc to both gcode and timelapse file list. 2013-03-06 23:27:16 +01:00
Gina Häußge
dae1c0367a Merge branch 'daprice-sorting_persistence' into devel 
Conflicts:
	octoprint/static/js/ui.js
 2013-03-03 19:38:26 +01:00
Gina Häußge
98a7c3d8b8 New option to sort gcode files by size, reverted former utc "fix" (doesn't work anymore, works without the fix, I have no idea...), added adjusted modernizr, delete metadata from old gcode file version when adding a new one 2013-03-03 19:37:52 +01:00
Gina Häußge
9b3fc0c65e Set default instance name to empty string 2013-03-03 16:57:35 +01:00
Dale Price
eecb19ecf6 store file sorting options in the browser's LocalStorage 2013-03-02 22:56:58 -06:00
Gina Häußge
766e9f0e7f Show custom title first in head in case of small tabs 2013-03-02 13:38:30 +01:00
Gina Häußge
e0b405054a Fixed some whitespace and reworked custom title to always include an "OctoPrint" prefix (gotta protect the "brand" here ;)) 2013-03-02 12:42:35 +01:00
Richard Mitchell
260606601d Title and limited color control via settings 2013-03-02 10:56:32 +00:00
Richard Mitchell
b2408c92a5 Didn't add the restart button after all 2013-03-01 21:57:13 +00:00
Richard Mitchell
324601dfed Did clever stuff at first for restart but replacing the appearance of start is all that is needed I believe 2013-03-01 21:52:15 +00:00
Gina Häußge
899d618efe Couple of fixes while merging... 2013-02-23 22:46:29 +01:00
Richard Mitchell
0e6fd2bde2 Merge remote-tracking branch 'upstream/devel' into devel 2013-02-23 18:40:28 +00:00
Richard Mitchell
e79aede3f4 Bug in bootstrap forcing use of knockout click binding - actually works better 2013-02-23 18:38:18 +00:00
Richard Mitchell
8a3df3d4e7 Easier than I thought to add/remove temperature profiles 2013-02-23 17:59:27 +00:00
Richard Mitchell
9ba88a7d1a New temperature profile settings and hooked into ui. WIP: add and remove profiles 2013-02-23 17:47:01 +00:00
Gina Häußge
2e766a7eca Added custom controls with multiple commands 
Closes #48
 2013-02-23 18:08:59 +01:00
Richard Mitchell
42838f8b58 Fixed the navigate to top of page on e.g. Set ABS issue 
Also replaced to HTML ° for degrees symobol
 2013-02-23 10:11:42 +00:00
Richard Mitchell
9e351339a4 Added features for quick setting of temperatures for PLA and ABS - configured via new settings. 
Not perfect, I'd like to show temperature to be set in UI.
On clicking it always moves to the top of the page.
The overflow and temp layout changes are to allow the drop down to display outside of the tab.

Is it worth having more temp boxes e.g. Nylon? - array like similar to move speeds?
 2013-02-23 01:09:30 +00:00
Gina Häußge
1c9854b6c1 Merge branch 'master' into devel 2013-02-17 22:31:11 +01:00
Gina Häußge
1c4203b708 Added settings dialog for configuring OctoPrint 
Warning: Many settings will need a restart of OctoPrint to take effect, adding corresponding notes is still a TODO. There's also no proper validation and error handling yet, so use at your own risk.
 2013-02-17 22:30:34 +01:00
Dale Price
0266bcd593 optimize image file size on iOS web clip icons 2013-02-16 23:32:31 -06:00
Dale Price
48f0af2e7a Add iOS web clip icons 2013-02-16 23:28:23 -06:00
Richard Mitchell
22e5f656fe Sort out the spacing and alignment on jog controls 2013-02-10 21:12:38 +00:00
Gina Häußge
bd68e0ae54 Added sorting and filtering options for gcode files. 
Closes #21
 2013-02-10 21:48:24 +01:00
Richard Mitchell
4035ebcec5 Various control for jogging, speed reduced 2013-02-10 16:00:47 +00:00
Richard Mitchell
142d07be21 Equalized the size of the button with the input control 2013-02-10 09:34:53 +00:00
Gina Häußge
8c9c2ecfee Added extrusion controls, kept motor and fan controls in general control area as suggested (recurring demand suggests that they definitely aren't something to be added by anyone individually via custom controls), made custom controls always position themselves below the general stuff. 2013-02-10 00:40:06 +01:00
Gina Häußge
f09d57bef9 Started work on adding extrusion control 2013-02-09 23:20:41 +01:00
Richard Mitchell
7fb354a256 Added controls I want (motors off, fans on/off) - they perhaps should be custom 2013-02-09 12:07:31 +00:00
Richard Mitchell
878bee784a Modified the appearance of the jogging controls with a view to adding finer control 2013-02-09 11:22:09 +00:00
Gina Häußge
5f55ebd90a GCode file list now automatically switches to page with newly uploaded file as soon as upload request comes back from backend as finished. Progress bar also gets emptied again then. Careful: might take a bit after the upload progress reaches 100% since the file still has to be written to disk in the backend (have to look into how to get this done in a streaming way), metadata analysis gets triggered after returning a response. 
Different sorting options are still on my mental todo list ;)

Closes #34.
 2013-02-04 22:24:32 +01:00
Gina Häußge
3de0d1b1e5 Fixed file deletion for gcode files 2013-02-04 21:41:02 +01:00
Gina Häußge
959feba9ca First version with gcode viewer integration. 
Did some minor changes: renamed gcode tab, renamed gcode file download endpoint, added some margin for gcode viewer accordion. Not sure yet what to do about the gcode viewer controls/settings, until I figure this out they'll stay where they are now ,)
 2013-02-03 22:01:11 +01:00
Gina Häußge
ea52bbfb14 Merge branch 'gcodeViewer' into devel 
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/static/js/ui.js
 2013-02-03 21:38:00 +01:00