v1.3.4: add CAPTCHA support and user edit blocking

Signed-off-by: Chris Warrick <[email protected]>
getnikola · Aug 8, 2015 · f9b3b0e · f9b3b0e
1 parent ed0e54c
commit f9b3b0e
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 10 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,12 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.3
+:Version: 1.3.4
+
+1.3.4
+    * Link to demo site in documentation
+    * Support reCAPTCHA for logins (for demo site)
+    * Support preventing some users from editing the site (for demo site)
 
 1.3.3
     Remove yesterday’s new options.  Please do not use v1.3.2.

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -5,8 +5,8 @@ Appendix A. Contribution rules
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2015, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2015-07-03
-:Version: 1.3.3
+:Date: 2015-08-08
+:Version: 1.3.4
 
 .. index:: contributing
 

diff --git a/coil/__init__.py b/coil/__init__.py
@@ -29,4 +29,4 @@
 
 __all__ = ['__version__']
 
-__version__ = '1.3.3'
+__version__ = '1.3.4'
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -2,7 +2,12 @@
 Appendix A. Changelog
 =====================
 
-:Version: 1.3.3
+:Version: 1.3.4
+
+1.3.4
+    * Link to demo site in documentation
+    * Support reCAPTCHA for logins (for demo site)
+    * Support preventing some users from editing the site (for demo site)
 
 1.3.3
     Remove yesterday’s new options.  Please do not use v1.3.2.

diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
@@ -5,8 +5,8 @@ Appendix A. Contribution rules
 :Author: Chris Warrick <[email protected]>
 :Copyright: © 2015, Chris Warrick.
 :License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
-:Date: 2015-07-03
-:Version: 1.3.3
+:Date: 2015-08-08
+:Version: 1.3.4
 
 .. index:: contributing
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.3'
+version = '1.3.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.3'
+release = '1.3.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -3,6 +3,11 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
+Coil demo site
+==============
+
+The Coil demo site is available at https://coilcms-site.getnikola.com/ and https://coilcms-site.getnikola.com/.
+
 Coil CMS
 ========
 

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     dependencies = [l.strip() for l in fh]
 
 setup(name='coil',
-      version='1.3.4-alpha.2',
+      version='1.3.4',
       description='A user-friendly CMS frontend for Nikola.',
       keywords='coil,nikola,cms',
       author='Chris Warrick, Roberto Alsina, Henry Hirsch et al.',
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,4 @@

		__all__ = ['__version__']

		__version__ = '1.3.3'
		__version__ = '1.3.4'