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
Gina Häußge
19fe770606
Forgot to inject plugin manager...
2015-01-15 16:51:55 +01:00
Gina Häußge
f52afb8660
Fixed translation feels not being properly copied over during installation
...
Should solve initial problem reported in #720
2015-01-15 16:28:22 +01:00
Gina Häußge
f2e98265e7
Fix generic plugin includes again (was still depending on a removed variable)
2015-01-15 15:13:55 +01:00
Gina Häußge
bb7aa6544f
Adjusted bundled Cura plugin to not define already defined folder paths again, now included automatically
2015-01-15 14:53:23 +01:00
Gina Häußge
2324a1bf0e
Correctly set custom element styles on navbar and tab items
2015-01-15 14:42:58 +01:00
Gina Häußge
ca278985b0
Correctly set selected element on first load in settings
2015-01-15 14:42:27 +01:00
Gina Häußge
4a9be80c98
Fixed login dialog again
2015-01-15 14:21:32 +01:00
Gina Häußge
23387d6e48
More work on the template refactoring and new template plugin types
2015-01-15 11:06:59 +01:00
Teja
0c68913e56
first preview draft
2015-01-14 15:21:02 +01:00
Renha
6cf0550312
Bugfix for Invalid cross-device link on Linux when /tmp is on another fs
2015-01-13 22:24:35 +00:00
Gina Häußge
73466bb513
Merge branch 'devel' into dev/templateRefactoring
2015-01-13 18:27:10 +01:00
Gina Häußge
b0805a9bae
Forgot to commit some files (argh)
2015-01-13 18:20:45 +01:00
Gina Häußge
f9fd4f9009
WIP: refactoring of templates
2015-01-13 18:20:13 +01:00
Gina Häußge
5b6b8b6ad1
And some more moving around of templates
2015-01-13 11:49:28 +01:00
Gina Häußge
8aede1dfe4
Moved settings components into individual template files as well
2015-01-13 11:31:45 +01:00
Gina Häußge
77cdb7bf43
Moved navbar, sidebar and tab contents from index.jinja2 into individual files
2015-01-13 11:20:37 +01:00
Gina Häußge
6880184cbb
Increased default communication and connection timeouts
2015-01-13 11:09:42 +01:00
Gina Häußge
84122f9f54
Fixed changelog entry for last commit, was added to wrong section
2015-01-13 11:09:41 +01:00
Gina Häußge
c52d201808
Fix error where API state is requested and printer is offline
...
(cherry picked from commit 619fe9a
2015-01-13 11:09:41 +01:00
Gina Häußge
466866c323
Merge remote-tracking branch 'origin/devel' into devel
2015-01-13 10:32:59 +01:00
Gina Häußge
be8ffeb724
WIP: Some documentation of plugins
2015-01-13 10:31:56 +01:00
Gina Häußge
868dc6d7a9
Increased default communication and connection timeouts
2015-01-12 17:34:08 +01:00
Gina Häußge
1ddb187518
Fixed changelog entry for last commit, was added to wrong section
2015-01-12 17:25:02 +01:00
Gina Häußge
b7badcbf02
Fix error where API state is requested and printer is offline
...
(cherry picked from commit 619fe9a
2015-01-12 16:55:38 +01:00
C-o-r-E
684d12e60e
Fix error where API state is requested and printer is offline
...
(cherry picked from commit 619fe9a
2015-01-12 16:53:17 +01:00
Gina Häußge
4e4ad0be8b
Fixed file sending to SD card
...
Closes #709
2015-01-12 16:00:37 +01:00
Gina Häußge
f238ef40ec
Better error validation for printer profiles
...
Data types loaded from disk were not properly ensured to match expected types and input validation also had deficits.
Should fix #714
2015-01-12 15:07:14 +01:00
Gina Häußge
f5eef06e88
Fixed wrong variable name
...
Closes #715
2015-01-12 10:45:39 +01:00
Gina Häußge
76f7a40b7f
Added changelog entry for PR #610
2015-01-12 09:59:51 +01:00
Gina Häußge
778d3f2853
Merge remote-tracking branch 'origin/devel' into devel
2015-01-12 09:46:15 +01:00
Gina Häußge
2ba681573f
Key controls are now enabled when you mouse over the webcam picture, indicated by an overlay
...
Also moved key control help in that overlay
2015-01-12 09:40:45 +01:00
Gina Häußge
edafee7b22
Added setting to enable/disable the keycontrol feature
2015-01-12 09:37:52 +01:00
Gina Häußge
52056b0eeb
Merge branch 'devel_keycontrol' of https://github.com/nEuDy/OctoPrint into nEuDy-devel_keycontrol
...
Conflicts:
src/octoprint/static/css/octoprint.css
2015-01-10 13:56:51 +01:00
Gina Häußge
5a3df191a5
Merge pull request #712 from rspeed/sigterm-fix
...
Daemon cleans up pidfile when receiving a SIGTERM
2015-01-10 12:32:30 +01:00
Rob Speed
062131a10e
Renamed delpid to term to better match its modified behavior. Moved the registration of the SIGTERM handler to avoid an extremely unlikely race condition.
2015-01-10 01:34:47 -08:00
Rob Speed
6c78049886
Fixes issue where a daemonized OctoPrint doesn't clean up after itself after receiving SIGTERM.
2015-01-10 00:24:25 -08:00
Teja
59368ca240
grbl state alarm treatment
2015-01-09 21:47:57 +01:00
Philipp Engel
221ea637be
Merge remote-tracking branch 'upstream/devel' into mrbeam
...
Conflicts:
src/octoprint/printer/__init__.py
src/octoprint/server/__init__.py
src/octoprint/settings.py
src/octoprint/static/css/octoprint.css
src/octoprint/static/js/app/main.js
src/octoprint/static/js/i18n/de.js
src/octoprint/static/js/i18n/fr.js
src/octoprint/static/js/i18n/he.js
src/octoprint/static/js/i18n/nl.js
src/octoprint/static/js/i18n/no.js
src/octoprint/static/js/i18n/ro.js
src/octoprint/templates/index.jinja2
src/octoprint/templates/settings.jinja2
src/octoprint/translations/de/LC_MESSAGES/messages.mo
src/octoprint/translations/de/LC_MESSAGES/messages.po
src/octoprint/translations/fr/LC_MESSAGES/messages.mo
src/octoprint/translations/fr/LC_MESSAGES/messages.po
src/octoprint/translations/he/LC_MESSAGES/messages.mo
src/octoprint/translations/he/LC_MESSAGES/messages.po
src/octoprint/translations/messages.pot
src/octoprint/translations/nl/LC_MESSAGES/messages.mo
src/octoprint/translations/nl/LC_MESSAGES/messages.po
src/octoprint/translations/no/LC_MESSAGES/messages.mo
src/octoprint/translations/no/LC_MESSAGES/messages.po
src/octoprint/translations/ro/LC_MESSAGES/messages.mo
src/octoprint/translations/ro/LC_MESSAGES/messages.po
src/octoprint/util/comm.py
2015-01-09 18:11:40 +01:00
Teja
a87131ac1f
safety glasses popups
2015-01-09 16:47:08 +01:00
Teja
209de59714
styles... laser button color and animation
2015-01-09 16:21:09 +01:00
Teja
dc7576a9ef
save button replaced with auto saving.
2015-01-09 13:11:20 +01:00
Teja
b003c5ed0a
focus tab ... first draft
2015-01-08 22:50:54 +01:00
