MrDraw/src/octoprint
Gina Häußge 749af60796 Merge branch 'master' into devel
Conflicts:
	src/octoprint/server/util.py
	src/octoprint/settings.py
	src/octoprint/templates/index.jinja2
2014-12-30 10:49:03 +01:00
..
filemanager More error resilient handling of .metadata.yaml writes in local storage 2014-12-20 01:06:40 +01:00
plugin Added new plugin type ProgressPlugin 2014-12-15 21:29:18 +01:00
plugins Log a message to octoprint.log if Cura is not fully configured and hence not available for slicing yet. 2014-12-21 15:15:59 +01:00
printer Support action: commands sent from printer, for now only pause, resume and disconnect are supported, plus a new hook "octoprint.comm.protocol.action" to add handlers of custom actions via plugins. 2014-12-20 00:31:46 +01:00
server Don't user server.host but server.forwardedHost as fallback for generated external URLs 2014-12-30 10:20:50 +01:00
slicing Fetch estimated print time from cura slicing result, create print time statistics per printer profile, interpolate between stats and live estimation during printing for print time left 2014-12-17 17:31:30 +01:00
static Request available slicers and slicing profiles from backend asynchronously when opening the slicing dialog 2014-12-21 15:57:23 +01:00
templates Merge branch 'master' into devel 2014-12-30 10:49:03 +01:00
translations [i18n] Translation update 2014-12-18 15:15:23 +01:00
util More error resilient handling of .metadata.yaml writes in local storage 2014-12-20 01:06:40 +01:00
__init__.py Versioning by versioneer: https://github.com/warner/python-versioneer/ 2014-06-22 01:12:06 +02:00
_version.py Fixed a couple of more missing branch fields and added Changelog entry 2014-11-04 10:07:46 +01:00
daemon.py Actually, umask 002 is what we want here. 2013-10-27 02:39:29 +02:00
events.py Fetch estimated print time from cura slicing result, create print time statistics per printer profile, interpolate between stats and live estimation during printing for print time left 2014-12-17 17:31:30 +01:00
settings.py Merge branch 'master' into devel 2014-12-30 10:49:03 +01:00
timelapse.py Only decrement the image counter if it is set and larger than 0 2014-12-28 00:19:55 +01:00
users.py Properly recognize app session keys everywhere. Also fixed a bug where the ApiUser was not properly provisioned with his roles. 2014-11-14 17:58:42 +01:00