7e015e6e18
Merge branch 'devel' into events
2013-06-19 20:39:01 +02:00
f9beb28b1d
Merge branch 'master' into devel
2013-06-19 20:38:38 +02:00
c24a66c361
Fixed signature for user view model. Closes #157
2013-06-19 20:36:50 +02:00
0e294ef8fd
Merge branch 'devel' into events
2013-06-18 21:44:30 +02:00
a4aacf6108
Merge branch 'CapnBry-extrudevol' into devel
2013-06-18 21:28:13 +02:00
7c85013389
Added filament diameter retrieval from gcode generated by Cura, fixed Slic3r version
2013-06-18 21:28:05 +02:00
e96765bc39
Merge branch 'master' into devel
...
Conflicts:
octoprint/static/css/octoprint.less
2013-06-17 22:12:45 +02:00
bcf8d54ff3
Merge remote-tracking branch 'origin/master'
2013-06-17 22:10:48 +02:00
6876438783
Fix for #153 backported from events branch
2013-06-17 22:10:14 +02:00
e32afe147a
Add extrusion volume calculation for Slic3r gcode files
2013-06-17 14:39:52 +00:00
33731464e5
Merge pull request #145 from daprice/master
...
Improve nav bar appearance when custom colors are used
2013-06-17 04:56:10 -07:00
d9fb3bb8f6
Added jquery.min.js locally to avoid depending on
...
internet connection on clients which may be
locally and offline
2013-06-17 00:11:17 +02:00
0e56952913
Finalized decoupling of timelapse from printer module, made sure timelapse is properly unregistered from eventbus on change
2013-06-16 22:42:18 +02:00
236e26979f
Switched Timelapses to using Eventbus instead of direct connection
2013-06-16 21:50:50 +02:00
ed9e93f379
Merge branch 'devel' into events
...
Conflicts:
octoprint/printer.py
octoprint/server.py
octoprint/util/comm.py
2013-06-16 11:50:52 +02:00
4994d488cf
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
...
(cherry picked from commit ee3bc84
2013-06-16 11:39:20 +02:00
ee3bc84242
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
2013-06-16 11:38:52 +02:00
e27b34a9f3
Hopefully fixed a off-by-one error...
2013-06-15 17:33:03 +02:00
d6ad8dca00
Indentation still wrong, caused another funny behaviour
2013-06-11 18:45:57 +02:00
25802ddb66
Fixed wrong indentation that caused a rather funny behaviour...
2013-06-09 19:30:42 +02:00
d0035c3f3a
Removed reference to remove feedratemodifier
2013-06-09 19:05:37 +02:00
8917d2e607
strip, not trim
2013-06-09 18:58:03 +02:00
b099bb443b
Trim sd filenames
2013-06-09 18:53:23 +02:00
ac4a0f772d
Fixed whitespace
2013-06-09 18:29:28 +02:00
8be1329a71
Merge branch 'devel' into gcodestreaming
...
Conflicts:
octoprint/printer.py
octoprint/static/js/ui.js
octoprint/templates/index.jinja2
octoprint/util/comm.py
2013-06-09 18:28:40 +02:00
edff311351
Merge branch 'master' into devel
2013-06-09 18:18:57 +02:00
9963c523c0
Do not display -1mm when printing from sd
2013-06-09 18:13:12 +02:00
4509eab816
Enable sd support by default
2013-06-09 18:04:25 +02:00
d5a620f476
Introduced new function matchesGcode to properly test if a line contains a specific gcode
2013-06-09 18:03:41 +02:00
c36e39909e
Always reset heatingUp flag when receiving an ok
2013-06-09 17:44:06 +02:00
5b15d42881
Only send M105/M27 during sd printing when not currently heating up
2013-06-09 17:08:12 +02:00
90a1edbbcf
Testing out a space between the N-prefix and the command
2013-06-09 16:33:59 +02:00
30a57e21f4
Fixed line count incrementation for gcode streaming
2013-06-09 15:55:55 +02:00
003109d59e
Made gcode viewer capable of handling progress information
...
GCode viewer now updates its visualization (during printing) based on the current progress percentage, not based on the current line (which will not be available any more as part of the progress tuple with gcode streaming)
2013-06-09 14:00:15 +02:00
add073a6cb
Add black color setting
2013-06-08 19:05:09 -05:00
719c4fab57
Define brand image in CSS instead of an <img> tag to allow it to be styled; add high resolution tentacle brand image for retina/high-res displays; create non-clashing light version of tentacle brand image to be used when darker custom colors are chosen in settings
2013-06-08 18:43:17 -05:00
7662023223
Improve appearance of text-shadow when dark navbar colors are used; adjust color of carets in navbar menus according to the navbar color
2013-06-06 20:11:35 -05:00
57932ff78c
Check for localStorage with Modernizr before attempting to use it. Solves foosel/OctoPrint#91
2013-06-06 00:23:30 -05:00
8d4f7e2ba7
M20 on startup (2nd try)
2013-06-03 22:37:08 +02:00
480f0aef6f
M20 on startup
2013-06-03 22:32:23 +02:00
1441a7dbd8
Added missing image resource
2013-06-03 22:25:23 +02:00
107ff01b29
Merge branch 'gcodestreaming' into devel
2013-06-03 22:18:00 +02:00
b0891b4d16
Added resource for retrieving a JSON representation of the current printer state (basically most of what's available on socket.io)
...
Endpoint is <baseurl>/ajax/state
2013-05-31 23:24:21 +02:00
56cb1c294c
Changed to GCODE streaming instead of loading it all into memory -- no more loading times. Also better file handling.
2013-05-31 22:41:53 +02:00
8d53f313fe
Removed debug log output
2013-05-27 19:48:17 +02:00
16befc84d2
Brought up to date with sdcard branch
2013-05-27 01:45:52 +02:00
d571aa588a
Merge branch 'sdcard' into events
...
Conflicts:
octoprint/printer.py
octoprint/server.py
octoprint/util/comm.py
2013-05-27 01:33:54 +02:00
3130c0c30b
Fixed jobData key
2013-05-27 01:20:45 +02:00
624630ac63
Updated documentation of events
2013-05-27 01:03:53 +02:00
be99930021
Refactoring of event management
2013-05-27 00:56:57 +02:00
Gina Häußge