Skip to content
Permalink
Browse files
Merge branch 'release/1.3.7'
fix #40
  • Loading branch information
Kwpolska committed Aug 25, 2015
2 parents 1abf61a + 2ac5ace commit 74574def47433b5a468c583ce769369f8fddcab6
Showing with 19 additions and 12 deletions.
  1. +4 −1 CHANGELOG.rst
  2. +2 −2 CONTRIBUTING.rst
  3. +1 −1 coil/__init__.py
  4. +2 −1 coil/web.py
  5. +4 −1 docs/CHANGELOG.rst
  6. +2 −2 docs/CONTRIBUTING.rst
  7. +2 −2 docs/conf.py
  8. +1 −1 requirements.txt
  9. +1 −1 setup.py
@@ -2,7 +2,10 @@
Appendix A. Changelog
=====================

:Version: 1.3.6
:Version: 1.3.7

1.3.7
* Nikola v7.6.4 compatibility

1.3.6
* Patch URLs for HTTPS sites
@@ -5,8 +5,8 @@ Appendix A. Contribution rules
:Author: Chris Warrick <chris@chriswarrick.com>
:Copyright: © 2015, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2015-08-17
:Version: 1.3.6
:Date: 2015-08-25
:Version: 1.3.7

.. index:: contributing

@@ -29,4 +29,4 @@

__all__ = ['__version__']

__version__ = '1.3.6'
__version__ = '1.3.7'
@@ -78,8 +78,9 @@ def configure_site():

nikola.__main__._RETURN_DOITNIKOLA = True
_dn = nikola.__main__.main([])
_dn.sub_cmds = _dn.get_cmds()
_site = _dn.nikola
_site.init_plugins()
_dn.sub_cmds = _dn.get_cmds()
app.config['NIKOLA_ROOT'] = os.getcwd()
app.config['DEBUG'] = False

@@ -2,7 +2,10 @@
Appendix A. Changelog
=====================

:Version: 1.3.6
:Version: 1.3.7

1.3.7
* Nikola v7.6.4 compatibility

1.3.6
* Patch URLs for HTTPS sites
@@ -5,8 +5,8 @@ Appendix A. Contribution rules
:Author: Chris Warrick <chris@chriswarrick.com>
:Copyright: © 2015, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2015-08-17
:Version: 1.3.6
:Date: 2015-08-25
:Version: 1.3.7

.. index:: contributing

@@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
version = '1.3.6'
version = '1.3.7'
# The full version, including alpha/beta/rc tags.
release = '1.3.6'
release = '1.3.7'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -1,4 +1,4 @@
Nikola>=7.5.1
Nikola>=7.6.4
docopt==0.6.2
Flask==0.10.1
Flask-Bcrypt==0.6.2
@@ -7,7 +7,7 @@
dependencies = [l.strip() for l in fh]

setup(name='coil',
version='1.3.6',
version='1.3.7',
description='A user-friendly CMS frontend for Nikola.',
keywords='coil,nikola,cms',
author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',

0 comments on commit 74574de

Please sign in to comment.