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: 7c689694b328
Choose a base ref
...
head repository: getnikola/nikola
compare: 04396765dfd3
Choose a head ref
  • 17 commits
  • 9 files changed
  • 3 contributors

Commits on May 17, 2017

  1. Add bootswatch setting to theme INIs 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed May 17, 2017
    Copy the full SHA
    30e4461 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2017

  1. Nicer error handling (Fix #2771)

    Roberto Alsina committed May 18, 2017
    Copy the full SHA
    1f144c3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into fix-2771

    @ralsina
    ralsina committed May 18, 2017
    Copy the full SHA
    c5904c4 View commit details
    Browse the repository at this point in the history

  3. Hmmm

    Roberto Alsina committed May 18, 2017
    Copy the full SHA
    efbe9fd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'fix-2772' of https://github.com/getnikola/nikola into f… 

    …ix-2771
    Roberto Alsina committed May 18, 2017
    Copy the full SHA
    81dccdb View commit details
    Browse the repository at this point in the history

  5. return 1

    Roberto Alsina committed May 18, 2017
    Copy the full SHA
    4a690bb View commit details
    Browse the repository at this point in the history

  6. Don't let doit do noisy exception printing

    Roberto Alsina committed May 18, 2017
    Copy the full SHA
    05ca9ab View commit details
    Browse the repository at this point in the history

  7. We don't run

    Roberto Alsina committed May 18, 2017
    Copy the full SHA
    43cbf69 View commit details
    Browse the repository at this point in the history

  8. Ok, so that code does do something ;-)

    Roberto Alsina committed May 18, 2017
    Copy the full SHA
    02bfc27 View commit details
    Browse the repository at this point in the history

  9. Just exit(3) if can't load tasks

    Roberto Alsina committed May 18, 2017
    Copy the full SHA
    b657585 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2017

  1. Merge branch 'fix-2772'

    Roberto Alsina committed May 19, 2017
    Copy the full SHA
    356a1c4 View commit details
    Browse the repository at this point in the history

  2. Flowr no jquery (#2776) 

    * Flowr.js without JQuery, working on base theme

* updated changelog
    @ralsina
    ralsina committed May 19, 2017
    Copy the full SHA
    8a98477 View commit details
    Browse the repository at this point in the history

  3. There are some minor problems with flowr on responsive mode

    Roberto Alsina committed May 19, 2017
    Copy the full SHA
    2964c60 View commit details
    Browse the repository at this point in the history

  4. Responsive mode not very broken anymore

    Roberto Alsina committed May 19, 2017
    Copy the full SHA
    fe2c5cd View commit details
    Browse the repository at this point in the history

Commits on May 20, 2017

  1. Re-raise task exceptions in debug mode 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed May 20, 2017
    Copy the full SHA
    fc39108 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into header-deduplication

    @Kwpolska
    Kwpolska committed May 20, 2017
    Copy the full SHA
    e3eaca0 View commit details
    Browse the repository at this point in the history

  3. Update at most 1 headerlink 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed May 20, 2017
    Copy the full SHA
    0439676 View commit details
    Browse the repository at this point in the history