pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1058 commits 20 branches 22 tags 141 MiB
Commit graph

1058 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gina Häußge
625ad32f6c Merge pull request #75 from daprice/master 
Fix storing of ItemListHelper sorting/filtering in localStorage
 2013-03-13 02:36:10 -07: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
09adb8dfda Fixed TimedTimelapse 
Interval parameter gets now accessed correctly
 2013-03-11 09:38:36 +01:00
Gina Häußge
95d6c18183 Use contrast function for calculating text color in navbar 2013-03-08 20:36:18 +01:00
Gina Häußge
1361c48bf6 Merge pull request #63 from richardjm/devel 
Missing semi-colon causing problems
 2013-03-08 00:45:30 -08:00
Richard Mitchell
26c6c0fb5f Missing semi-colon causing problems 2013-03-08 06:34:31 +00:00
Gina Häußge
72c0e703b9 Merge branch 'richardjm-devel' into devel 
Conflicts:
	octoprint/static/css/ui.css
	octoprint/templates/index.html
 2013-03-07 22:20:45 +01: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
Richard Mitchell
f68b0ddc04 not sure why i commented that out 2013-03-07 21:10:42 +00:00
Richard Mitchell
69980a3401 Fix up for less support 2013-03-07 21:08:16 +00:00
Gina Häußge
2ade4948fc The jog controls aren't ugly any more and we have some more stuff than just jog controls now 2013-03-06 23:44:58 +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
c1f2866a94 Moved totalExtrusion calculation into existing branches, added calculation of currentE for relative extruders (in case GCODE switches back to absolute) 2013-03-02 13:39:44 +01: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
63888f5e2e Merge branch 'AxTheB-devel' into devel 2013-03-02 13:29:08 +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
Gina Häußge
bd28c73bc5 Merge branch 'richard-jm/appearance' into devel 2013-03-02 12:20:24 +01:00
Gina Häußge
b3bbfb4574 Merge remote-tracking branch 'origin/master' into devel 2013-03-02 12:02:18 +01:00
Richard Mitchell
260606601d Title and limited color control via settings 2013-03-02 10:56:32 +00:00
Richard Mitchell
943d734993 That was easy enough to continue temp monitoring whilst paused 2013-03-01 22:19:58 +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
Václav 'Ax' Hůla
d667a0ff56 Fix filament measurement for relative extruders 2013-03-01 17:55:25 +01:00
Gina Häußge
727b4659cb Bugfix: added getter for interval attribute on TimedTimelapse, went missing since a refactoring a couple of weeks back. 2013-02-28 09:46:26 +01:00
Gina Häußge
e3cc7ad941 Update README.md 
config.ini => config.yaml
 2013-02-26 15:14:06 +01:00
Gina Häußge
c015a67a70 Fixed some whitespace 2013-02-23 23:55:26 +01:00
Gina Häußge
899d618efe Couple of fixes while merging... 2013-02-23 22:46:29 +01:00
Richard Mitchell
e828d4e7b7 New settings split off 2013-02-23 19:37:38 +00: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
aa2108e9c3 Change to ° required binding to html 2013-02-23 18:02:14 +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
55244c2f7c Added example for multiple commands 2013-02-23 18:13:04 +01: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
4c35adb347 Separated settings into separate template to improve ease of maintenance. 
Reduced word witdth and added add-ons for units.
 2013-02-23 10:01:52 +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
Gina Häußge
cbae792dbe Added logging to file on top of to stdout, temperature parsing now can cope with negative temperature (shouldn't normally occur but seems to happen with buggy firmware), added option to wait for "start" response from printer firmware before switching to state "operational" (defaults to previous behaviour) 2013-02-17 17:47:06 +01:00
Gina Häußge
0afad7d226 Merge pull request #46 from daprice/master 
Add web clip icons for iOS
 2013-02-17 00:30:44 -08:00
Dale Price
e4f06ba0d0 Revert "Add tooltips to explain some icon-only controls" 
This reverts commit 96fb0c2ce1.
 2013-02-17 00:18:30 -06:00
Dale Price
96fb0c2ce1 Add tooltips to explain some icon-only controls 2013-02-17 00:08:16 -06:00
Dale Price
0266bcd593 optimize image file size on iOS web clip icons 2013-02-16 23:32:31 -06:00