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/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4c950ac5e52e
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b417c821ccde
Choose a head ref
  • 13 commits
  • 6 files changed
  • 2 contributors

Commits on Sep 19, 2015

  1. pytest==2.7.0

    @Kwpolska
    Kwpolska committed Sep 19, 2015
    Copy the full SHA
    9f28f6f View commit details

  2. pytest==2.8.0 [typo, sorry]

    @Kwpolska
    Kwpolska committed Sep 19, 2015
    Copy the full SHA
    0414043 View commit details

Commits on Sep 20, 2015

  1. Fix #2102 -- exclude .py[cod] files in MANIFEST.in 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Sep 20, 2015
    Copy the full SHA
    1a4cd48 View commit details

  2. Fix #2104 -- fix post-list date formatting 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Sep 20, 2015
    Copy the full SHA
    7ab1862 View commit details

  3. Update requirements-tests.txt

    @Kwpolska
    Kwpolska committed Sep 20, 2015
    Copy the full SHA
    24bf731 View commit details

  4. Python 3.5! 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Sep 20, 2015
    Copy the full SHA
    7f8debc View commit details

  5. Revert "Update requirements-tests.txt" 

    incompatible with pytest-cov

This reverts commit 24bf731.
    @Kwpolska
    Kwpolska committed Sep 20, 2015
    Copy the full SHA
    a390487 View commit details

  6. New option FEED_PREVIEWIMAGE includes post previewimage meta (Issue #… 

    …2095)

Checks to see if the previewimage is found in the content before
including it. Avoids duplicate imagery. <figure><img></figure> is
recommended by Flipboard and supported by Apple News and Feedly.

* Deprecated RSS_PLAIN in favor of FEED_PLAIN for Atom and RSS
* Deprecated RSS_TEASERS in favor of FEED_TEASER for Atom and RSS
* Hi mom
    @da2x
    da2x committed Sep 20, 2015
    Copy the full SHA
    8b98798 View commit details

  7. forgot one instance

    @da2x
    da2x committed Sep 20, 2015
    Copy the full SHA
    0013aac View commit details

  8. flake8

    @da2x
    da2x committed Sep 20, 2015
    Copy the full SHA
    87004a5 View commit details

  9. Deprecated RSS_READ_MORE_LINK and RSS_LINKS_APPEND_QUERY 

    Replaced by FEED_READ_MORE_LINK and FEED_LINKS_APPEND_QUERY.
    @da2x
    da2x committed Sep 20, 2015
    Copy the full SHA
    f611ec8 View commit details

  10. flake8

    @da2x
    da2x committed Sep 20, 2015
    Copy the full SHA
    9c892a1 View commit details

  11. Merge branch 'feed-previewimage' of https://github.com/getnikola/nikola… 

    … into feed-previewimage

Conflicts:
	CHANGES.txt
    @da2x
    da2x committed Sep 20, 2015
    Copy the full SHA
    b417c82 View commit details
Showing with 10 additions and 3 deletions.
  1. +1 −0 .travis.yml
  2. +2 −1 CHANGES.txt
  3. +3 −0 MANIFEST.in
  4. +2 −1 nikola/plugins/compile/rest/post_list.py
  5. +1 −1 requirements-tests.txt
  6. +1 −0 setup.py
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ python:
- "2.7"
- "3.3"
- "3.4"
- "3.5"
matrix:
include:
- python: "2.7"
3 changes: 2 additions & 1 deletion CHANGES.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
New in Master
New in master
=============

Features
@@ -10,6 +10,7 @@ Features
Bugfixes
--------

* Fix reST post list date formatting error (Issue #2104)
* Deprecated ``RSS_TEASERS``, ``RSS_PLAIN``, ``RSS_READ_MORE_LINK``, and
``RSS_LINKS_APPEND_QUERY`` in favor of ``FEED_TEASERS``, ``FEED_PLAIN``,
``FEED_READ_MORE_LINK``, and ``FEED_LINKS_APPEND_QUERY`` for both Atom
3 changes: 3 additions & 0 deletions MANIFEST.in
View file
Original file line number Diff line number Diff line change
@@ -5,3 +5,6 @@ graft tests
include *.txt
include *.rst
include *.py
global-exclude *.pyc
global-exclude *.pyo
global-exclude *.pyd
3 changes: 2 additions & 1 deletion nikola/plugins/compile/rest/post_list.py
View file
Original file line number Diff line number Diff line change
@@ -204,7 +204,8 @@ def run(self):
template_data = {
'lang': lang,
'posts': posts,
'date_format': self.site.GLOBAL_CONTEXT.get('date_format'),
# Need to provide str, not TranslatableSetting (Issue #2104)
'date_format': self.site.GLOBAL_CONTEXT.get('date_format')[lang],
'post_list_id': post_list_id,
}
output = self.site.template_system.render_template(
2 changes: 1 addition & 1 deletion requirements-tests.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-r requirements-extras.txt
mock==1.3.0
coverage==3.7.1
pytest==2.7.3
pytest==2.8.0
pytest-cov==2.1.0
freezegun==0.3.5
python-coveralls==2.5.0
1 change: 1 addition & 0 deletions setup.py
View file
Original file line number Diff line number Diff line change
@@ -136,6 +136,7 @@ def run(self):
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Topic :: Internet',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Text Processing :: Markup'),