Skip to content
Permalink
Browse files
Merge branch 'release/1.3.1' into develop
  • Loading branch information
Kwpolska committed Jun 18, 2015
2 parents a1c0f4d + 0ceaeca commit 081a35217594351054a38faa6b6cbec335aa8514
Showing with 82 additions and 8 deletions.
  1. +2 −0 CHANGELOG.rst
  2. +1 −1 coil/__init__.py
  3. +0 −1 docs/CHANGELOG.rst
  4. +73 −0 docs/CHANGELOG.rst
  5. +2 −2 docs/conf.py
  6. +2 −2 requirements.txt
  7. +2 −2 setup.py
@@ -2,6 +2,8 @@
Appendix A. Changelog
=====================

:Version: 1.3.1

v1.3.0
------

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

__all__ = ['__version__']

__version__ = '1.2.0'
__version__ = '1.3.1'

This file was deleted.

@@ -0,0 +1,73 @@
=====================
Appendix A. Changelog
=====================

:Version: 1.3.1

v1.3.0
------

* Python 3 support

v1.2.2
------

* Don’t repeat Nikola dependencies to decrease maintenance burden

v1.2.1
------

* Specify deps in ``setup.py``

v1.2.0
------

* Added support for a Limited mode, which does not require Redis and rq
* Nikola v7.4.0 compatibility

v1.1.0
------

* Changed hashing mechanism to sha256 + bcrypt.
Hashes will be fixed automatically on first login of each user.
* Added ``passlib`` dependency.
* rqworker queue is now named ``coil`` (was ``default``)
* add trailing slashes to all URLs
* use ``url_for()``
* add ``/rebuild/force/`` (== ``nikola build -a``)

v1.0.0
------

* RENAME TO *Coil CMS*
* User documentation
* Form validation
* Redis for storing data
* Rebuilding the site, using RQ as a task queue

v0.6.0
------

* Permission management
* ``setup.py`` and Python packaging
* ``comet`` management command
* more modern pages
* multiple issues fixed

v0.5.0
------

* Switch to Flask
* Cookie-based authentication
* User management
* Style wysihtml properly
* Rename to *Comet CMS*

v0.0.1
------

* Initial version
* Called ``nikola webapp``
* using bottle
* HTTP Basic “Authentication” (sorry)
* wysihtml
@@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
version = '1.3.0'
version = '1.3.1'
# The full version, including alpha/beta/rc tags.
release = '1.3.0'
release = '1.3.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -1,5 +1,4 @@
git+https://github.com/nvie/rq.git#egg=rq
Nikola>=7.4.1
Nikola>=7.5.1
docopt==0.6.2
Flask==0.10.1
Flask-Bcrypt==0.6.2
@@ -14,6 +13,7 @@ pyinotify==0.9.5
python-bcrypt==0.3.1
pytz==2015.2
redis==2.10.3
rq==0.5.3
six==1.9.0
webassets==0.10.1
Werkzeug==0.10.4
@@ -4,10 +4,10 @@
from setuptools import setup

with open('requirements.txt', 'r') as fh:
dependencies = [l.strip() for l in fh][1:]
dependencies = [l.strip() for l in fh]

setup(name='coil',
version='1.3.0',
version='1.3.1',
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 081a352

Please sign in to comment.