Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/coil
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0c0b6c58b207
Choose a base ref
...
head repository: getnikola/coil
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dff89c966fe7
Choose a head ref
  • 3 commits
  • 9 files changed
  • 1 contributor

Commits on Aug 17, 2015

  1. Fix #38 -- add icon descriptions

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    Kwpolska committed Aug 17, 2015
    Copy the full SHA
    95a3415 View commit details
  2. v1.3.5: add icon descriptions

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    Kwpolska committed Aug 17, 2015
    Copy the full SHA
    566b8d8 View commit details
  3. Merge branch 'release/1.3.5'

    Kwpolska committed Aug 17, 2015
    Copy the full SHA
    dff89c9 View commit details
Showing with 18 additions and 17 deletions.
  1. +4 −1 CHANGELOG.rst
  2. +2 −2 CONTRIBUTING.rst
  3. +0 −5 README.rst
  4. +1 −1 coil/__init__.py
  5. +2 −2 coil/web.py
  6. +4 −1 docs/CHANGELOG.rst
  7. +2 −2 docs/CONTRIBUTING.rst
  8. +2 −2 docs/conf.py
  9. +1 −1 setup.py
5 changes: 4 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -2,7 +2,10 @@
Appendix A. Changelog
=====================

:Version: 1.3.4
:Version: 1.3.5

1.3.5
* Add icon descriptions for the navigation bar

1.3.4
* Link to demo site in documentation
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -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-08
:Version: 1.3.4
:Date: 2015-08-17
:Version: 1.3.5

.. index:: contributing

5 changes: 0 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
@@ -9,8 +9,3 @@ Setup
-----

Setting up Coil CMS is described in `the documentation <https://coil.readthedocs.org/en/latest/admin/setup/>`_.

Demo
----

The Coil demo site is available at https://coilcms-site.getnikola.com/ and https://coilcms-site.getnikola.com/.
2 changes: 1 addition & 1 deletion coil/__init__.py
Original file line number Diff line number Diff line change
@@ -29,4 +29,4 @@

__all__ = ['__version__']

__version__ = '1.3.4'
__version__ = '1.3.5'
4 changes: 2 additions & 2 deletions coil/web.py
Original file line number Diff line number Diff line change
@@ -141,9 +141,9 @@ def configure_site():
_site.config['NAVIGATION_LINKS'] = {
'en': (
(app.config['NIKOLA_URL'],
'<i class="fa fa-globe"></i>'),
'<i class="fa fa-globe"></i> View Site'),
('https://coil.readthedocs.org/en/latest/user/',
'<i class="fa fa-question-circle"></i>'),
'<i class="fa fa-question-circle"></i> Help'),
)
}
_site.GLOBAL_CONTEXT['navigation_links'] = _site.config['NAVIGATION_LINKS']
5 changes: 4 additions & 1 deletion docs/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -2,7 +2,10 @@
Appendix A. Changelog
=====================

:Version: 1.3.4
:Version: 1.3.5

1.3.5
* Add icon descriptions for the navigation bar

1.3.4
* Link to demo site in documentation
4 changes: 2 additions & 2 deletions docs/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -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-08
:Version: 1.3.4
:Date: 2015-08-17
:Version: 1.3.5

.. index:: contributing

4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
version = '1.3.4'
version = '1.3.5'
# The full version, including alpha/beta/rc tags.
release = '1.3.4'
release = '1.3.5'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
dependencies = [l.strip() for l in fh]

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