pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maintenance' into devel

Browse source 
# Conflicts:
#	CHANGELOG.md
#	src/octoprint/templates/javascripts.jinja2
This commit is contained in:
Gina Häußge 2016-10-13 17:17:44 +02:00
commit 613363379f
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -74,6 +74,14 @@
* [#1047](https://github.com/foosel/OctoPrint/issues/1047) - Fixed 90 degree
webcam rotation for iOS Safari.
## 1.2.17rc3 (2016-10-13)
### Bug fixes
* Fixed a wrong order in loading JS files on the client introduced in 1.2.17rc2 to make the UI more resilient against broken plugin JS.
([Commits](https://github.com/foosel/OctoPrint/compare/1.2.17rc2...1.2.17rc3))
## 1.2.17rc2 (2016-10-13)
### Improvements

2
src/octoprint/server/__init__.py
View file

@ -1044,7 +1044,7 @@ class Server(object):
"js/app/helpers.js",
"js/app/main.js"]
js_plugins = dynamic_plugin_assets["external"]["js"]
js_app = js_core + js_plugins
js_app = js_plugins + js_core
css_libs = [
"css/bootstrap.min.css",