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
base: 4c950ac5e52e
Choose a base ref
...
head repository: getnikola/nikola
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
    Browse the repository at this point in the history

  2. pytest==2.8.0 [typo, sorry]

    @Kwpolska
    Kwpolska committed Sep 19, 2015
    Copy the full SHA
    0414043 View commit details
    Browse the repository at this point in the history

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
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history

  3. Update requirements-tests.txt

    @Kwpolska
    Kwpolska committed Sep 20, 2015
    Copy the full SHA
    24bf731 View commit details
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history

  7. forgot one instance

    @da2x
    da2x committed Sep 20, 2015
    Copy the full SHA
    0013aac View commit details
    Browse the repository at this point in the history

  8. flake8

    @da2x
    da2x committed Sep 20, 2015
    Copy the full SHA
    87004a5 View commit details
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history

  10. flake8

    @da2x
    da2x committed Sep 20, 2015
    Copy the full SHA
    9c892a1 View commit details
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history