From 56f2dc9d8e5597edddb02499ece1e2f90789127b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 9 Feb 2016 17:55:29 +0100 Subject: [PATCH 1/2] Make improve/... branches behave as maintenance branches Felt too wrong to call improvements fixes all the time. --- .versioneer-lookup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.versioneer-lookup b/.versioneer-lookup index 86ee131b..d753c1c0 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -15,9 +15,10 @@ HEAD \(detached.* # maintenance is currently the branch for preparation of maintenance release 1.2.9 -# so are any fix/... branches +# so are any fix/... and improve/... branches maintenance 1.2.9 dedadbc9ac0305799e94ae279d3bca131629c4c5 pep440-dev fix/.* 1.2.9 dedadbc9ac0305799e94ae279d3bca131629c4c5 pep440-dev +improve/.* 1.2.9 dedadbc9ac0305799e94ae279d3bca131629c4c5 pep440-dev # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now .* 1.3.0 198d3450d94be1a2 pep440-dev From 682c3dd8e3348b09518d933df14df2714cfc4f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 9 Feb 2016 18:03:04 +0100 Subject: [PATCH 2/2] Limit file upload dialogs to supported file extensions See #1196 --- src/octoprint/server/views.py | 4 +++- src/octoprint/templates/sidebar/files.jinja2 | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py index 8c58a766..59f19a31 100644 --- a/src/octoprint/server/views.py +++ b/src/octoprint/server/views.py @@ -16,6 +16,7 @@ from octoprint.server import app, userManager, pluginManager, gettext, \ debug, LOCALES, VERSION, DISPLAY_VERSION, UI_API_KEY, BRANCH, preemptiveCache, \ NOT_MODIFIED from octoprint.settings import settings +from octoprint.filemanager import get_all_extensions import re @@ -297,7 +298,8 @@ def index(): uiApiKey=UI_API_KEY, templates=templates, pluginNames=plugin_names, - locales=locales + locales=locales, + supportedExtensions=map(lambda ext: ".{}".format(ext), get_all_extensions()) ) render_kwargs.update(plugin_vars) diff --git a/src/octoprint/templates/sidebar/files.jinja2 b/src/octoprint/templates/sidebar/files.jinja2 index 39b4d9c8..fbff0ce8 100644 --- a/src/octoprint/templates/sidebar/files.jinja2 +++ b/src/octoprint/templates/sidebar/files.jinja2 @@ -42,18 +42,18 @@ {{ _('Upload') }} - + {{ _('Upload to SD') }} - + {% else %} {{ _('Upload') }} - + {% endif %}