Gina Häußge a2cd46899c Merge branch 'improve/intermediaryUrlsAndTimeouts' into devel ... Conflicts: AUTHORS.md src/octoprint/plugins/virtual_printer/virtual.py		2016-07-06 13:32:03 +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	Allow removal of folders	2016-07-04 18:59:06 +02: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	Add absolute jog mode to printer API	2016-07-01 17:54:26 +02:00
printer_profiles.py	Merge pull request #870 from DanLipsitt/feature/flask-0.10	2015-05-04 11:36:14 +02:00
settings.py	Merge branch 'improve/intermediaryUrlsAndTimeouts' into devel	2016-07-06 13:32:03 +02:00
slicing.py	Merge branch 'improve/slicingFlexibility' into devel	2016-07-04 10:24:43 +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