Skip to content
Permalink
Browse files

Merge branch 'master' into drop-reveal-theme-settings

  • Loading branch information
ralsina committed May 12, 2017
2 parents 5f2e302 + 3d77845 commit ae0bffd66774f2fa391aed198e6406af589dff04
Showing with 6,958 additions and 116 deletions.
  1. +2 −1 AUTHORS.txt
  2. +13 −0 CHANGES.txt
  3. +12 −4 CONTRIBUTING.rst
  4. +8 −1 docs/manual.txt
  5. +14 −31 nikola/conf.py.in
  6. +2 −0 nikola/data/themes/base/messages/messages_ar.py
  7. +2 −0 nikola/data/themes/base/messages/messages_az.py
  8. +2 −0 nikola/data/themes/base/messages/messages_bg.py
  9. +2 −0 nikola/data/themes/base/messages/messages_bs.py
  10. +2 −0 nikola/data/themes/base/messages/messages_ca.py
  11. +2 −0 nikola/data/themes/base/messages/messages_cs.py
  12. +2 −0 nikola/data/themes/base/messages/messages_da.py
  13. +2 −0 nikola/data/themes/base/messages/messages_de.py
  14. +2 −0 nikola/data/themes/base/messages/messages_el.py
  15. +2 −0 nikola/data/themes/base/messages/messages_en.py
  16. +2 −0 nikola/data/themes/base/messages/messages_eo.py
  17. +2 −0 nikola/data/themes/base/messages/messages_es.py
  18. +2 −0 nikola/data/themes/base/messages/messages_et.py
  19. +2 −0 nikola/data/themes/base/messages/messages_eu.py
  20. +2 −0 nikola/data/themes/base/messages/messages_fa.py
  21. +2 −0 nikola/data/themes/base/messages/messages_fi.py
  22. +2 −0 nikola/data/themes/base/messages/messages_fil.py
  23. +2 −0 nikola/data/themes/base/messages/messages_fr.py
  24. +2 −0 nikola/data/themes/base/messages/messages_gl.py
  25. +2 −0 nikola/data/themes/base/messages/messages_he.py
  26. +2 −0 nikola/data/themes/base/messages/messages_hi.py
  27. +2 −0 nikola/data/themes/base/messages/messages_hr.py
  28. +2 −0 nikola/data/themes/base/messages/messages_hu.py
  29. +2 −0 nikola/data/themes/base/messages/messages_id.py
  30. +2 −0 nikola/data/themes/base/messages/messages_it.py
  31. +2 −0 nikola/data/themes/base/messages/messages_ja.py
  32. +2 −0 nikola/data/themes/base/messages/messages_ko.py
  33. +2 −0 nikola/data/themes/base/messages/messages_lt.py
  34. +2 −0 nikola/data/themes/base/messages/messages_nb.py
  35. +2 −0 nikola/data/themes/base/messages/messages_nl.py
  36. +2 −0 nikola/data/themes/base/messages/messages_pa.py
  37. +2 −0 nikola/data/themes/base/messages/messages_pl.py
  38. +2 −0 nikola/data/themes/base/messages/messages_pt.py
  39. +2 −0 nikola/data/themes/base/messages/messages_pt_br.py
  40. +2 −0 nikola/data/themes/base/messages/messages_ru.py
  41. +2 −0 nikola/data/themes/base/messages/messages_si_lk.py
  42. +2 −0 nikola/data/themes/base/messages/messages_sk.py
  43. +2 −0 nikola/data/themes/base/messages/messages_sl.py
  44. +2 −0 nikola/data/themes/base/messages/messages_sq.py
  45. +2 −0 nikola/data/themes/base/messages/messages_sr.py
  46. +2 −0 nikola/data/themes/base/messages/messages_sr_latin.py
  47. +2 −0 nikola/data/themes/base/messages/messages_sv.py
  48. +2 −0 nikola/data/themes/base/messages/messages_te.py
  49. +2 −0 nikola/data/themes/base/messages/messages_tl.py
  50. +2 −0 nikola/data/themes/base/messages/messages_tr.py
  51. +2 −0 nikola/data/themes/base/messages/messages_uk.py
  52. +2 −0 nikola/data/themes/base/messages/messages_ur.py
  53. +2 −0 nikola/data/themes/base/messages/messages_zh_cn.py
  54. +2 −0 nikola/data/themes/base/messages/messages_zh_tw.py
  55. +6 −0 nikola/filters.py
  56. +6 −0 nikola/image_processing.py
  57. +26 −5 nikola/nikola.py
  58. +13 −5 nikola/plugin_categories.py
  59. +1 −1 nikola/plugins/command/auto/__init__.py
  60. +5 −3 nikola/plugins/command/serve.py
  61. +1 −1 nikola/plugins/compile/markdown/mdx_podcast.py
  62. +7 −4 nikola/plugins/compile/rest/__init__.py
  63. +4 −1 nikola/plugins/compile/rest/listing.py
  64. +13 −0 nikola/plugins/shortcode/emoji.plugin
  65. +46 −0 nikola/plugins/shortcode/emoji/__init__.py
  66. +418 −0 nikola/plugins/shortcode/emoji/data/Activity.json
  67. +998 −0 nikola/plugins/shortcode/emoji/data/Flags.json
  68. +274 −0 nikola/plugins/shortcode/emoji/data/Food.json
  69. +25 −0 nikola/plugins/shortcode/emoji/data/LICENSE
  70. +594 −0 nikola/plugins/shortcode/emoji/data/Nature.json
  71. +718 −0 nikola/plugins/shortcode/emoji/data/Objects.json
  72. +1,922 −0 nikola/plugins/shortcode/emoji/data/People.json
  73. +1,082 −0 nikola/plugins/shortcode/emoji/data/Symbols.json
  74. +466 −0 nikola/plugins/shortcode/emoji/data/Travel.json
  75. +0 −6 nikola/plugins/shortcode/gist.py
  76. +7 −4 nikola/plugins/task/archive.py
  77. +2 −2 nikola/plugins/task/authors.py
  78. +2 −2 nikola/plugins/task/categories.py
  79. +1 −1 nikola/plugins/task/indexes.py
  80. +3 −3 nikola/plugins/task/listings.py
  81. +1 −1 nikola/plugins/task/page_index.py
  82. +7 −5 nikola/plugins/task/sections.py
  83. +2 −2 nikola/plugins/task/tags.py
  84. +2 −2 nikola/post.py
  85. +70 −22 nikola/shortcodes.py
  86. +6 −6 nikola/utils.py
  87. +2 −2 requirements-tests.txt
  88. +1 −1 scripts/generate_conf.py
  89. +2 −0 scripts/import_po.py
  90. +2 −0 scripts/jinjify.py
  91. +1 −0 scripts/langmatrix.py
  92. +4 −0 tests/base.py
  93. +49 −0 tests/test_integration.py
  94. +22 −0 tests/test_shortcodes.py
@@ -27,7 +27,6 @@
* `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>`_
* `David Beath <https://github.com/DBeath>`_
* `Dhruv Baldawa <https://github.com/dhruvbaldawa>`_
@@ -45,8 +44,10 @@
* `Felix Schwarz <https://github.com/FelixSchwarz>`_
* `Florian Finkernagel <https://github.com/TyberiusPrime>`_
* `follower <https://github.com/follower>`_
* `George Leslie-Waksman <https://github.com/gwax>`_
* `Grzegorz Śliwiński <https://github.com/fizyk>`_
* `Guillermo O. Freschi <https://github.com/Tordek>`_
* `h4ckninja <https://github.com/h4ckninja>`_
* `Hardening <https://github.com/hardening>`_
* `Hong Xu <https://www.topbug.net>`_
* `Ivan Teoh <https://github.com/ivanteoh>`_
@@ -15,17 +15,30 @@ Features

* Get rid of ``THEME_REVEAL_CONFIG_*`` settings, use global context
instead (Issue #2485)
* New emoji shortcode
* Add ``SECTION_PATH`` support to move the section indexes to a
user-defined location (Issue #2738)
* Add a list of template variables to documentation (Issues #2328,
#2712, #2259) and update the theming reference (Issue #2259)
* Add ``{post_title}`` tag for Read More links (Issue #2709)
* Include MathJax config only when needed (via Issue #2715)
* Include KaTeX CSS automatically when needed (Issue #2715)
* Split out math code into new ``math_helper.tmpl`` template (Issue
#2715)
* Added ``jpegoptim_progressive`` filter to convert jpeg images to progressive
jpegs.

Bugfixes
--------

* Open ``127.0.0.1`` when using ``nikola serve -b`` and default
``0.0.0.0`` hostname to avoid resolution issues — the site is still
available on all interfaces (Issue #2755)
* Don't break animated GIFs in postprocessing (Issue #2750)
* More robust shortcodes, no need to escape URLs in reSt, work better
with LaTeX, etc.
* No longer creates empty subarchive pages, and no longer create broken
archive navigation links on day level (Issue #2734)
* Fixes post scanner plugin order (Issue #2720)
* Rename ``POSTS_SECTION_ARE_INDEXES`` to ``POSTS_SECTIONS_ARE_INDEXES``
* Make date ranges work in shortcode-based post lists (Issue #2690)
@@ -56,12 +56,20 @@ Here are some guidelines about how you can contribute to Nikola:
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.)
easily testable.
* **Test your code.** If you can, run the test suite. You will find instructions
in ``tests/README.rst``. (alternatively, you can push and wait for Travis to pick
up and test your changes)

If running tests is not feasible, please at least confirm that:

* the demo site (created with ``nikola init -qd demosite``) builds without errors
* the bugs you were trying to fix do not occur anymore (if applicable)
* the features you added work properly (if applicable)

* 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!
.. [2] For example, logging, or always making sure directories are created using ``utils.makedirs()``
.. [2] For example, logging or always making sure directories are created using ``utils.makedirs()``.
@@ -1057,6 +1057,13 @@ chart
'Others', [14.2, 15.4, 15.3, 8.9, 9, 10.4]
{{% /chart %}}{{% /raw %}}

emoji
Insert an emoji. For example::

{{% raw %}}{{% emoji crying_face %}}{{% /raw %}}

This generates a ``span`` with ``emoji`` CSS class, so you can style it with a nice font if you want.

gist
Show GitHub gists. If you know the gist's ID, this will show it in your site:

@@ -1741,7 +1748,7 @@ Do this if you want to be absolutely sure that no sensitive information should e
Preserve all EXIF data
~~~~~~~~~~~~~~~~~~~~~~

Do this if you really don't mind people knowing where pictures were taken, or camera settings.
Do this if you really don't mind people knowing where pictures were taken, or camera settings::

PRESERVE_EXIF_DATA = True
EXIF_WHITELIST = {'*': '*'}
@@ -243,6 +243,12 @@ POSTS_SECTIONS = True
# are the default and will apply GENERATE_ATOM if set.
# POSTS_SECTIONS_ARE_INDEXES = True

# Final locations are:
# output / TRANSLATION[lang] / SECTION_PATH / SECTION_NAME / index.html (list of posts for a section)
# output / TRANSLATION[lang] / SECTION_PATH / SECTION_NAME / rss.xml (RSS feed for a section)
# (translatable)
# SECTION_PATH = ""

# Each post and section page will have an associated color that can be used
# to style them with a recognizable color detail across your site. A color
# is assigned to each section based on shifting the hue of your THEME_COLOR
@@ -747,34 +753,11 @@ IMAGE_FOLDERS = {'images': 'images'}
# Color scheme to be used for code blocks. If your theme provides
# "assets/css/code.css" this is ignored. Leave empty to disable.
# Can be any of:
# algol
# algol_nu
# arduino
# autumn
# borland
# bw
# colorful
# default
# emacs
# friendly
# fruity
# igor
# lovelace
# manni
# monokai
# murphy
# native
# paraiso_dark
# paraiso_light
# pastie
# perldoc
# rrt
# tango
# trac
# vim
# vs
# xcode
# algol, algol_nu, autumn, borland, bw, colorful, default, emacs, friendly,
# fruity, igor, lovelace, manni, monokai, murphy, native, paraiso-dark,
# paraiso-light, pastie, perldoc, rrt, tango, trac, vim, vs, xcode
# This list MAY be incomplete since pygments adds styles every now and then.
# Check with list(pygments.styles.get_all_styles()) in an interpreter.
# CODE_COLOR_SCHEME = 'default'

# FAVICONS contains (name, file, size) tuples.
@@ -944,7 +927,7 @@ PRETTY_URLS = ${PRETTY_URLS}
# Do you want a add a Mathjax config file?
# MATHJAX_CONFIG = ""

# If you want support for the $.$ syntax (wihch may conflict with running
# If you want support for the $.$ syntax (which may conflict with running
# text!), just use this config:
# MATHJAX_CONFIG = """
# <script type="text/x-mathjax-config">
@@ -991,7 +974,7 @@ PRETTY_URLS = ${PRETTY_URLS}
# The default is ['fenced_code', 'codehilite']
MARKDOWN_EXTENSIONS = ['fenced_code', 'codehilite', 'extra']

# Extra options to pass to the pandoc comand.
# Extra options to pass to the pandoc command.
# by default, it's empty, is a list of strings, for example
# ['-F', 'pandoc-citeproc', '--bibliography=/Users/foo/references.bib']
# Pandoc does not demote headers by default. To enable this, you can use, for example
@@ -1040,11 +1023,11 @@ MARKDOWN_EXTENSIONS = ['fenced_code', 'codehilite', 'extra']
# between each other. Old Atom feeds with no changes are marked as archived.
# GENERATE_ATOM = False

# Only inlclude teasers in Atom and RSS feeds. Disabling include the full
# Only include teasers in Atom and RSS feeds. Disabling include the full
# content. Defaults to True.
# FEED_TEASERS = True

# Strip HTML from Atom annd RSS feed summaries and content. Defaults to False.
# Strip HTML from Atom and RSS feed summaries and content. Defaults to False.
# FEED_PLAIN = False

# Number of posts in Atom and RSS feeds.
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {
@@ -1,4 +1,6 @@
# -*- encoding:utf-8 -*-
"""Autogenerated file, do not edit."""

from __future__ import unicode_literals

MESSAGES = {

0 comments on commit ae0bffd

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