Skip to content
Permalink
Browse files

Merge branch 'master' into fix-2651

  • Loading branch information
ralsina committed Feb 21, 2017
2 parents 8bd206c + 200f023 commit 36bd5f852b01d964020c286be9a6314552a9ad14
Showing 324 changed files with 106,012 additions and 59,233 deletions.
@@ -0,0 +1,23 @@
<!--
Before creating an issue:
* make sure you are using an up-to-date version of Nikola
* search for existing issues that might be related
If you are reporting a bug:
* provide information about your environment (below)
* include all the output you get, and any other information related to your problem
Nikola v7.6.4, as provided by Debian/Ubuntu, is NOT SUPPORTED.
If you are using this version, you should upgrade: https://getnikola.com/getting-started.html
-->

### Environment (if reporting a bug)

**Python Version:**

**Nikola Version:**

**Operating System:**

### Description:

@@ -0,0 +1,7 @@
### Pull Request Checklist

- [ ] I’ve read the [guidelines for contributing](https://github.com/getnikola/nikola/blob/master/CONTRIBUTING.rst).
- [ ] I updated AUTHORS.txt and CHANGES.txt (if the change is non-trivial) and documentation (if applicable).
- [ ] I tested my changes.

### Description
@@ -25,6 +25,7 @@
* `Daniel Aleksandersen <https://github.com/Aeyoun>`_
* `Daniel Devine <https://github.com/DDevine>`_
* `Daniel F. Moisset <https://github.com/dmoisset>`_
* `Daniel Harding <https://github.com/living180>`_
* `dastagg <https://github.com/dastagg>`_
* `dastagg <https://github.com/dastagg>`_
* `David Barragán Merino <https://github.com/bameda>`_
@@ -6,6 +6,8 @@ Features

* Append file name (generated from title) if ``nikola new_post``
receives directory name as path (Issue #2651)
* Add a ``require_all_tags`` parameter to the ``post-list`` directive to
show only posts that have all specified tags. (Issue #2665)
* Add ``META_GENERATOR_TAG`` option in conf.py allowing the meta generator
tag to be disabled (Issue #2628)
* Add ``YUI_COMPRESSOR_EXECUTABLE``, ``CLOSURE_COMPILER_EXECUTABLE``,
@@ -16,6 +18,11 @@ Features
Bugfixes
--------

* Fix mimetype guessing in auto mode (Issue #2645)
* Fix filters.html5lib_xmllike for laters html5lib (Issue #2648)
* Skip the current post in post lists (Issue #2666)
* Fix poor performance when compiling multiple markdown documents with
the markdown compiler. (Issue #2660)
* Fix crash if ``SHOW_INDEX_PAGE_NAVIGATION`` is ``True`` while
``INDEXES_STATIC`` is ``False``. (Issue #2654)
* Make ``NEW_POST_DATE_PATH`` follow ``rrule`` if it exists (issue #2653)
@@ -4,11 +4,11 @@ Patch submission guidelines [1]_
Here are some guidelines about how you can contribute to Nikola:

* First, make sure there is an open issue for your change. Perhaps,
if it's a new feature, you probably want to
if its a new feature, you probably want to
`discuss it first <http://groups.google.com/group/nikola-discuss>`_

* **Create a new Git branch specific to your change(s).** For example, if
you're adding a new feature to foo the bars, do something like the
youre adding a new feature to foo the bars, do something like the
following::

$ git checkout master
@@ -26,38 +26,40 @@ Here are some guidelines about how you can contribute to Nikola:

.. admonition:: A corollary:

Please **don't put multiple fixes/features in the same
branch/pull request**! In other words, if you're hacking on new feature X
and find a bugfix that doesn't *require* new feature X, **make a new
Please **dont put multiple fixes/features in the same
branch/pull request**! In other words, if youre hacking on new feature X
and find a bugfix that doesnt *require* new feature X, **make a new
distinct branch and PR** for the bugfix.

* You may want to use the `Tim Pope’s Git commit messages standard
<http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html>`_.
It’s not necessary, but if you are doing something big, we recommend
describing it in the commit message.
* While working, **rebase instead of merging** (if possible). We encourage
using ``git rebase`` instead of ``git merge``. If you are using
``git pull``, please run ``git config pull.rebase true`` to prevent merges
from happening and replace them with rebase goodness. There is also an
“emergency switch” in case rebases fail and you do not know what to do:
``git pull --no-rebase``.
* While working, rebase instead of merging (if possible). You can use rebase
instead of merge by default with ``git config pull.rebase true``. If rebases
fail, you can just use ``git pull --no-rebase``.
* **Make sure documentation is updated** — at the very least, keep docstrings
current, and if necessary, update the reStructuredText documentation in ``docs/``.
* **Add a changelog entry** at the top of ``CHANGES.txt`` mentioning issue number
and in the correct Features/Bugfixes section. (while creating the new
changelog entry, put it in the version that does not exist (consult
setup.py) or create a new section)
* **Run flake8** for style consistency. Use ``flake8 --ignore=E501 .``
* **Add a CHANGELOG entry** at the *top* of ``CHANGES.txt`` mentioning issue number
and in the correct Features/Bugfixes section. Put it under *New in master*.
Create that section if it does not exist yet. Do not add an entry if the
change is trivial (documentation, typo fixes) or if the change is internal
(not noticeable to end users in any way).
* Add your name to ``AUTHORS.txt`` if the change is non-trivial.
* If you are fixing an issue, **include the issue number in commit** and/or pull
request text (eg. ``fix #1234``) so the issue `is automatically closed
<https://help.github.com/articles/closing-issues-via-commit-messages/>`_.
* Run ``flake8 nikola`` for **style consistency**.
* Ensure your Git name and e-mail are set correctly (they will be public)
and `added to GitHub <https://github.com/settings/emails>`_
* **Try writing some tests** if possible — again, following existing tests is
often easiest, and a good way to tell whether the feature you are modifying is
easily testable. You will find instructions in ``tests/README.rst``.
(alternatively you can push and wait for Travis to pick up and test your changes,
but we encourage to run them locally before pushing.)
* Make sure to mention the issue it affects in the description of your pull request,
so it's clear what to test and how to do it.
* There are some quirks to how Nikola's codebase is structured, and to how
some things need to be done [2]_ but don't worry, we'll guide you!
* There are some quirks to how Nikola’s codebase is structured, and to how
some things need to be done [2]_ but don’t worry, we’ll guide you!

.. [1] Very inspired by `fabric's <https://github.com/fabric/fabric/blob/master/CONTRIBUTING.rst>`_ thanks!
.. [1] Very inspired by `fabrics <https://github.com/fabric/fabric/blob/master/CONTRIBUTING.rst>`_ thanks!
.. [2] For example, logging, or always making sure directories are created using ``utils.makedirs()``
@@ -11,8 +11,8 @@
"dependencies": {
"bootstrap": "~3.3.7",
"jquery": "<2.0.0",
"jquery-colorbox": "~1.6.0",
"moment": "~2.10.3",
"livereload-js": "~2.2.1"
"jquery-colorbox": "~1",
"moment": "~2",
"livereload-js": "~2"
}
}
@@ -45,6 +45,6 @@
"commit": "54c8a883aa3fe2cb39ebda4c401bd92783fc9d7a"
},
"_source": "https://github.com/jackmoore/colorbox.git",
"_target": "~1.6.0",
"_target": "~1",
"_originalSource": "jquery-colorbox"
}
@@ -33,8 +33,7 @@
"tag": "v2.2.1",
"commit": "91fdfa00a3e7fac0482397a315e18947c54bbfd3"
},
"_source": "git://github.com/livereload/livereload-js.git",
"_target": "~2.2.1",
"_originalSource": "livereload-js",
"_direct": true
"_source": "https://github.com/livereload/livereload-js.git",
"_target": "~2",
"_originalSource": "livereload-js"
}
@@ -1,5 +1,6 @@
{
"name": "moment",
"license": "MIT",
"main": "moment.js",
"ignore": [
"**/.*",
@@ -17,17 +18,19 @@
"Gruntfile.js",
"Moment.js.nuspec",
"package.js",
"package.json"
"package.json",
"ISSUE_TEMPLATE.md",
"typing-tests"
],
"homepage": "https://github.com/moment/moment",
"version": "2.10.6",
"_release": "2.10.6",
"version": "2.17.1",
"_release": "2.17.1",
"_resolution": {
"type": "version",
"tag": "2.10.6",
"commit": "446ce77eb08c5c862d7b0b11ef1d2e884d12e3d7"
"tag": "2.17.1",
"commit": "c83c4058b4c88d0a2ab10aac28ac787e31993c39"
},
"_source": "git://github.com/moment/moment.git",
"_target": "~2.10.3",
"_source": "https://github.com/moment/moment.git",
"_target": "~2",
"_originalSource": "moment"
}

0 comments on commit 36bd5f8

Please sign in to comment.
You can’t perform that action at this time.