Gina Häußge
|
bd61d45e27
|
Missed the settings when changing api -> allow to api -> enabled
|
2013-06-24 17:48:13 +02:00 |
Gina Häußge
|
6989613b99
|
Moved printer state to API endpoint, made apikey instead of login necessary
|
2013-06-23 21:24:19 +02:00 |
Gina Häußge
|
599bca12a9
|
Changed api > allow to api > enabled for consistency
|
2013-06-23 19:48:12 +02:00 |
Gina Häußge
|
e17fa031c8
|
Return proper http status codes in case of problems
|
2013-06-23 16:57:38 +02:00 |
Gina Häußge
|
c6e15a7d32
|
Merge branch 'richardjm-devel' into devel
Conflicts:
octoprint/server.py
octoprint/settings.py
octoprint/templates/index.jinja2
|
2013-06-23 16:09:31 +02:00 |
Gina Häußge
|
31045b4c25
|
Merge branch 'peteruithoven-master' into devel
Conflicts:
octoprint/timelapse.py
|
2013-06-23 14:58:58 +02:00 |
Bryan Mayland
|
329656837a
|
Renamed flipX, flipY to flipH, flipV, made update upon change instant, also made timelapse video reflect flipped webcam
|
2013-06-23 14:57:48 +02:00 |
Bryan Mayland
|
a9ec4336de
|
More errors == more error events
|
2013-06-22 15:13:44 +02:00 |
Gina Häußge
|
79f2cd0e31
|
Merge branch 'devel' into events
Conflicts:
octoprint/util/comm.py
|
2013-06-22 15:08:53 +02:00 |
Bryan Mayland
|
50914df07a
|
Made communication mode more error resilient
|
2013-06-22 15:03:01 +02:00 |
Bryan Mayland
|
8b702db0d0
|
Be able to cope with M999 causing a Resend: 1
|
2013-06-22 09:36:21 +02:00 |
Gina Häußge
|
40b4bfad85
|
Merge branch 'feedbackCommands' into devel
|
2013-06-21 23:19:25 +02:00 |
Bryan Mayland
|
6600eea1a2
|
Feedback commands now work
|
2013-06-21 23:19:15 +02:00 |
Gina Häußge
|
94316fbcc1
|
Merge remote-tracking branch 'CapnBry/resendfix' into devel
|
2013-06-21 21:03:59 +02:00 |
Gina Häußge
|
f041c6b4f3
|
First work on custom controls with printer feedback evaluation and presentation in the UI
|
2013-06-21 20:50:57 +02:00 |
Gina Häußge
|
5bf5d24dfc
|
Also include /dev/ttyAMA* in glob patterns for serial port
|
2013-06-21 15:03:32 +02:00 |
Bryan Mayland
|
c8875fd0f1
|
Resend correct gcode line when resend is requested
|
2013-06-20 11:41:10 -04:00 |
Gina Häußge
|
7e015e6e18
|
Merge branch 'devel' into events
|
2013-06-19 20:39:01 +02:00 |
Gina Häußge
|
f9beb28b1d
|
Merge branch 'master' into devel
|
2013-06-19 20:38:38 +02:00 |
Gina Häußge
|
c24a66c361
|
Fixed signature for user view model. Closes #157
|
2013-06-19 20:36:50 +02:00 |
peteruithoven
|
ecfdb37f93
|
Adding classes according to flipX, flipY settings and flipping using css
|
2013-06-19 02:39:49 +02:00 |
peteruithoven
|
e8913e3141
|
Adding settings for webcam flipX and flipY
|
2013-06-19 00:42:43 +02:00 |
Gina Häußge
|
0e294ef8fd
|
Merge branch 'devel' into events
|
2013-06-18 21:44:30 +02:00 |
Gina Häußge
|
a4aacf6108
|
Merge branch 'CapnBry-extrudevol' into devel
|
2013-06-18 21:28:13 +02:00 |
Gina Häußge
|
7c85013389
|
Added filament diameter retrieval from gcode generated by Cura, fixed Slic3r version
|
2013-06-18 21:28:05 +02:00 |
Gina Häußge
|
e96765bc39
|
Merge branch 'master' into devel
Conflicts:
octoprint/static/css/octoprint.less
|
2013-06-17 22:12:45 +02:00 |
Gina Häußge
|
bcf8d54ff3
|
Merge remote-tracking branch 'origin/master'
|
2013-06-17 22:10:48 +02:00 |
Gina Häußge
|
6876438783
|
Fix for #153 backported from events branch
|
2013-06-17 22:10:14 +02:00 |
Bryan Mayland
|
e32afe147a
|
Add extrusion volume calculation for Slic3r gcode files
|
2013-06-17 14:39:52 +00:00 |
Gina Häußge
|
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 |
algspd
|
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 |
Gina Häußge
|
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 |
Gina Häußge
|
236e26979f
|
Switched Timelapses to using Eventbus instead of direct connection
|
2013-06-16 21:50:50 +02:00 |
Gina Häußge
|
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 |
Gina Häußge
|
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 |
Gina Häußge
|
ee3bc84242
|
Use span instead of button for upload buttons, otherwise FF and IE hiccup...
|
2013-06-16 11:38:52 +02:00 |
Gina Häußge
|
e27b34a9f3
|
Hopefully fixed a off-by-one error...
|
2013-06-15 17:33:03 +02:00 |
Gina Häußge
|
d6ad8dca00
|
Indentation still wrong, caused another funny behaviour
|
2013-06-11 18:45:57 +02:00 |
Gina Häußge
|
25802ddb66
|
Fixed wrong indentation that caused a rather funny behaviour...
|
2013-06-09 19:30:42 +02:00 |
Gina Häußge
|
d0035c3f3a
|
Removed reference to remove feedratemodifier
|
2013-06-09 19:05:37 +02:00 |
Gina Häußge
|
8917d2e607
|
strip, not trim
|
2013-06-09 18:58:03 +02:00 |
Gina Häußge
|
b099bb443b
|
Trim sd filenames
|
2013-06-09 18:53:23 +02:00 |
Gina Häußge
|
ac4a0f772d
|
Fixed whitespace
|
2013-06-09 18:29:28 +02:00 |
Gina Häußge
|
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 |
Gina Häußge
|
edff311351
|
Merge branch 'master' into devel
|
2013-06-09 18:18:57 +02:00 |
Gina Häußge
|
9963c523c0
|
Do not display -1mm when printing from sd
|
2013-06-09 18:13:12 +02:00 |
Gina Häußge
|
4509eab816
|
Enable sd support by default
|
2013-06-09 18:04:25 +02:00 |
Gina Häußge
|
d5a620f476
|
Introduced new function matchesGcode to properly test if a line contains a specific gcode
|
2013-06-09 18:03:41 +02:00 |
Gina Häußge
|
c36e39909e
|
Always reset heatingUp flag when receiving an ok
|
2013-06-09 17:44:06 +02:00 |
Gina Häußge
|
5b15d42881
|
Only send M105/M27 during sd printing when not currently heating up
|
2013-06-09 17:08:12 +02:00 |