Teja
4ecf06bedd
Merge branch 'mrbeam-ui' into gcode-preview
2015-01-28 11:22:03 +01:00
Teja
6cc8ea4882
beautified focus mode tab
2015-01-28 11:21:02 +01:00
Teja
e5d2d8e6eb
fixed y shift on gcode preview
2015-01-28 01:09:43 +01:00
Teja
206c8cbcc3
fixed gcode preview. not all but much.
2015-01-28 00:33:48 +01:00
Teja
fa48a1393f
trying to get the gcode viewer working
2015-01-27 11:48:07 +01:00
Teja
a4a274b78b
disabled infill algorithm as it is very experimental and needs testing.
2015-01-26 16:58:54 +01:00
Teja
67f7d3dbaa
code cleanup
2015-01-26 16:50:02 +01:00
Teja
5535f256c8
changed name of the plugin.
2015-01-26 16:48:59 +01:00
Teja
2c7ef276a7
minor fixes in the profile list
2015-01-26 16:26:35 +01:00
Teja
05687b1699
fixed z-axis setting
2015-01-26 16:13:57 +01:00
Teja
9e2abc3632
set coordinate origin button implemented
2015-01-26 15:16:53 +01:00
Teja
901e63aef9
working area fix. edit fix of default profiles
2015-01-26 14:24:31 +01:00
Teja
8237d3c98f
fixed profile editing
2015-01-26 13:31:07 +01:00
Teja
040035b7ff
work in progress. still buggy.
2015-01-25 19:19:58 +01:00
Teja
5c9567309f
using the new settigns from upstream
2015-01-24 20:54:27 +01:00
Teja
f2054a1bc3
somehow resolved the merge conflicts
2015-01-23 21:32:57 +01:00
Teja
d55e723f75
Merge remote-tracking branch 'upstream/devel' into update_merge
...
Conflicts:
src/octoprint/plugins/cura/profile.py
src/octoprint/plugins/cura/static/js/cura.js
src/octoprint/plugins/svgtogcode/__init__.py
src/octoprint/plugins/svgtogcode/templates/svgtogcode_settings_dialog.jinja2
src/octoprint/server/__init__.py
src/octoprint/server/api/settings.py
src/octoprint/settings.py
src/octoprint/static/js/app/main.js
src/octoprint/static/js/app/viewmodels/control.js
src/octoprint/static/js/app/viewmodels/settings.js
src/octoprint/templates/dialogs.jinja2
src/octoprint/templates/index.jinja2
2015-01-23 11:37:47 +01:00
Gina Häußge
657629183b
Custom 400 response if requests that need json don't contain proper json
2015-01-22 17:59:31 +01:00
Gina Häußge
9cefd06655
Added missing pagination for printer profiles
2015-01-22 17:57:25 +01:00
Teja
8d5cc52ee5
Merge branch 'mrbeam' into update_merge
...
Conflicts:
src/octoprint/plugins/cura/__init__.py
src/octoprint/plugins/cura/profile.py
src/octoprint/printer/__init__.py
src/octoprint/server/__init__.py
src/octoprint/server/api/printer.py
src/octoprint/server/api/settings.py
src/octoprint/static/js/app/main.js
src/octoprint/static/js/app/viewmodels/control.js
src/octoprint/static/js/app/viewmodels/settings.js
2015-01-22 17:51:28 +01:00
Gina Häußge
ac549770ee
Move onStartup call to before any bindings getting applied
2015-01-22 16:56:42 +01:00
Teja
b41032cc1c
Merge branch 'mrbeam' into update_merge
2015-01-21 20:50:36 +01:00
Teja
cb983a4b38
code cleanup
2015-01-21 19:09:26 +01:00
Teja
3184b0251f
bugfixes! state model works again. feature: printing of placed svg files & direct gcode.
2015-01-21 17:38:53 +01:00
Teja
5ef6600ab6
bugfix. fixed status message filter in terminal
2015-01-21 12:31:41 +01:00
Teja
f19d2deffa
bugfix. working area svg stays where it is on modal dialogs.
2015-01-21 12:26:16 +01:00
Teja
a49f2b721f
meaningful gcode names
2015-01-21 11:54:46 +01:00
Teja
aab27fa181
progress in direct lasering the working area
2015-01-20 21:55:37 +01:00
Gina Häußge
22623fb0b6
Allow setting the default printer profile when creating a new one
2015-01-20 15:17:49 +01:00
Gina Häußge
98ac877033
Merge branch 'master' into devel
...
Conflicts:
CHANGELOG.md
2015-01-19 16:48:51 +01:00
Gina Häußge
5f835edf2e
Changelog entries for #706 and #719
2015-01-19 16:48:03 +01:00
Gina Häußge
83790fcd64
Do not truncate error reported from printer in UI
...
Closes #706
2015-01-19 16:42:09 +01:00
Gina Häußge
6dd2dcee16
GCODE viewer: Even better version of initial bed centering, backported from c858c8f75b
...
See #719
2015-01-19 16:34:40 +01:00
Gina Häußge
a91a354fa9
Fixed a bug causing the GCODE viewer to be zoomed in outside of the print bed due to missing initial move
...
Possible fix for #719
2015-01-19 16:26:52 +01:00
Gina Häußge
4bf3d698e3
Fixed some changelog entries and added commit history to unreleased 1.1.2
2015-01-19 15:52:20 +01:00
Gina Häußge
67a884fc9d
Added a lot of changelog entries
2015-01-19 13:18:43 +01:00
Gina Häußge
6e315cff76
Changelog entry for #724
2015-01-19 12:37:31 +01:00
Gina Häußge
146128730c
Fixed timelapse deletion
...
Was broken after switching to new file name sanitizing with the new file management layer, still stripped everything but ascii from the filename although timelapse file names may actually contain more than that character set since the gcode file names they are based off may too.
Closes #724
2015-01-19 12:34:25 +01:00
Gina Häußge
1daa6df346
Added exception logging for event bus worker loop
2015-01-19 12:13:04 +01:00
Teja
33c3bd401c
force homing cycle if machine is locked.
2015-01-19 11:59:42 +01:00
Gina Häußge
416b897596
Fixed a documentation bug
...
Thanks @Booli
2015-01-19 11:15:09 +01:00
Teja
1491d995cf
slicing works again after dealing with svg namespaces.
2015-01-18 22:33:04 +01:00
Gina Häußge
039285ffae
Fixed babel_refresh command as suggested in #726
...
Thanks to @derpicknicker1 for report and suggested fix.
Closes #726
2015-01-18 13:57:17 +01:00
Gina Häußge
b28f511b92
Small addendum and changelog entry for #717
2015-01-16 21:49:01 +01:00
Gina Häußge
19df1aed17
Merge pull request #717 from Renha/devel
...
Bugfix for Invalid cross-device link on Linux when /tmp is on another fs
2015-01-16 21:24:31 +01:00
Gina Häußge
9452ba4c24
Fixed heated bed temperature setting during slicing with Cura
2015-01-16 19:58:46 +01:00
Gina Häußge
98a28cc4e9
Merge branch 'dev/templateRefactoring' into devel
2015-01-16 17:15:36 +01:00
Gina Häußge
762ec228da
More work on the documentation
2015-01-16 17:11:31 +01:00
Gina Häußge
f619c1f8c4
Made data_bind handling of Template Plugin more easier
...
allowBindings: true is automatically added if necessary, regardless of plugin_supplied data_bind value, should make usage easier.
2015-01-16 12:35:24 +01:00
Gina Häußge
5180fc70d2
Changed how TemplatePlugin works
...
get_template_vars get split into get_template_vars (for injection additional template variables only) and get_template_configs (for configuring injection of additional template). It's now possible to inject more than one of a given template type from within plugins, and template injection is more intelligent in that if a plugin's templates don't need special configuration and stick to default naming and behaviour, just declaring them inside the templates directory of the plugin will be enough to fire up everything including links to switch to tabs, sidebars etc (the plugin's name being used in such cases for link text).
2015-01-16 11:54:34 +01:00
