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: 1b620dbbcc54
Choose a base ref
...
head repository: getnikola/nikola
compare: 8326cf759731
Choose a head ref
  • 9 commits
  • 1 file changed
  • 3 contributors

Commits on Dec 24, 2015

  1. Proofread: fix typos, grammar, markup 

    I noticed a typo which broke formatting (line 259), and while fixing
that I tidied up some other bits.
    @jean
    jean committed Dec 24, 2015
    Copy the full SHA
    5dcba82 View commit details
    Browse the repository at this point in the history

  2. Missed the original typo!

    @jean
    jean committed Dec 24, 2015
    Copy the full SHA
    46a48e2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2197 from jean/proofread-extending 

    Proofread: fix typos, grammar, markup
    @Kwpolska
    Kwpolska committed Dec 24, 2015
    Copy the full SHA
    7243344 View commit details
    Browse the repository at this point in the history

  4. Remove note that does not apply to Nikola

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

Commits on Dec 27, 2015

  1. add extra key used in post sorting to enable sticky posts

    Determinant committed Dec 27, 2015
    Copy the full SHA
    472357e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/getnikola/nikola

    Determinant committed Dec 27, 2015
    Copy the full SHA
    6ee67ac View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into sorting-with-priority

    Determinant committed Dec 27, 2015
    Copy the full SHA
    1bd9876 View commit details
    Browse the repository at this point in the history

  4. correct indentation

    Determinant committed Dec 27, 2015
    Copy the full SHA
    e5f2ca4 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2016

  1. Merge pull request #2201 from Determinant/sorting-with-priority 

    Sorting with priority
    @Kwpolska
    Kwpolska committed Jan 4, 2016
    Copy the full SHA
    8326cf7 View commit details
    Browse the repository at this point in the history