Gina Häußge
|
187c09e7da
|
Centralized online connectivity check
See also #2011
|
2017-07-19 18:42:27 +02:00 |
|
Gina Häußge
|
9de78001dd
|
Merge branch 'maintenance' into devel
# Conflicts:
# CHANGELOG.md
# docs/plugins/concepts.rst
# src/octoprint/__init__.py
# src/octoprint/server/__init__.py
# src/octoprint/templates/javascripts.jinja2
# src/octoprint/timelapse.py
Merge branch 'devel' into dev/wizard
# Conflicts:
# octoprint_octobullet/__init__.py
# octoprint_octobullet/templates/octobullet_settings.jinja2
Merge branch 'devel' into dev/wizard
# Conflicts:
# octoprint_octobullet/__init__.py
# octoprint_octobullet/templates/octobullet_settings.jinja2
|
2016-10-13 14:22:40 +02:00 |
|
Gina Häußge
|
9845e3b4ea
|
Restored accidentally removed file
|
2016-09-22 16:32:05 +02:00 |
|
Gina Häußge
|
8e8853c9c3
|
Lots of documentation updates + some related code fixes
|
2016-09-22 16:27:06 +02:00 |
|
Gina Häußge
|
ee185230a4
|
Refactored plugin docs + improved docs on sortables
|
2016-03-24 16:42:41 +01:00 |
|