Merge branch 'release/0.5.1' into production
* release/0.5.1: finish release 0.5.1 docs load jquery and html5shim with same URL schema as the rest of the site
This commit is contained in:
commit
ccfbc79a73
3 changed files with 6 additions and 3 deletions
|
@ -1,6 +1,9 @@
|
|||
Changelog
|
||||
=========
|
||||
|
||||
* :release:`0.5.1 <2015-01-18>`
|
||||
* :bug:`-` load jquery and html5 with same URL schema as the rest of the site
|
||||
|
||||
* :release:`0.5.0 <2015-01-17>`
|
||||
* :feature:`-` add authentication via social media accounts from Google,
|
||||
LinkedIn, Twitter and Xing
|
||||
|
|
|
@ -62,7 +62,7 @@ copyright = u'2014, 2015 Jan Dittberner'
|
|||
# The short X.Y version.
|
||||
version = '0.5'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '0.5.0'
|
||||
release = '0.5.1'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
|
||||
<!--[if lt IE 9]>
|
||||
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
|
||||
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
<!-- This file store project specific CSS -->
|
||||
|
@ -94,7 +94,7 @@
|
|||
<!-- Le javascript
|
||||
================================================== -->
|
||||
<!-- Placed at the end of the document so the pages load faster -->
|
||||
<script src="http://code.jquery.com/jquery-latest.js"></script>
|
||||
<script src="//code.jquery.com/jquery-latest.js"></script>
|
||||
<script src="{% static 'js/bootstrap.min.js' %}"></script>
|
||||
|
||||
<!-- place project specific Javascript in this file -->
|
||||
|
|
Loading…
Reference in a new issue