Gina Häußge 2971c29f10 Merge branch 'improve/pauseApiCommand' into devel ... Conflicts: src/octoprint/static/js/app/viewmodels/printerstate.js		2016-06-30 13:01:13 +02:00
..
__init__.py	Merge branch 'fix/aclFirstRun' into devel	2015-12-17 13:16:51 +01:00
connection.py	Move get_connection_options as classmethod into PrinterInterface	2016-06-27 12:19:28 +02:00
files.py	Don't allow empty folder names	2015-12-17 16:56:09 +01:00
job.py	Added only pause/resume sub commands to job API	2016-06-30 12:56:18 +02:00
languages.py	Use lowercase when matching extensions	2015-06-30 19:12:58 +02:00
log.py	Made diskspace running low a bit more obvious	2015-08-27 17:14:10 +02:00
printer.py	Only process bed temps & commands if printer profile has heated bed	2015-11-30 11:11:35 +01:00
printer_profiles.py	Merge pull request #870 from DanLipsitt/feature/flask-0.10	2015-05-04 11:36:14 +02:00
settings.py	Add flag to disable model size detection & check	2016-06-28 14:47:17 +02:00
slicing.py	Merge branch 'maintenance' into devel	2016-06-09 12:56:07 +02:00
system.py	Fix: Each divider action needs a custom action id	2015-10-19 13:24:16 +02:00
timelapse.py	Merge branch 'maintenance' into devel	2016-06-02 12:05:08 +02:00
users.py	Disabled ACL is now tracked through enabled flag on UserManager	2015-12-17 13:08:45 +01:00