Skip to content
Permalink
Browse files
Merge branch 'master' into emoji-sc
  • Loading branch information
ralsina committed May 9, 2017
2 parents af7ff6c + bb6d8f6 commit 20d6e9272ffee637f75c3d5d08913aa7864a981e
Showing with 119 additions and 5 deletions.
  1. +1 −1 AUTHORS.txt
  2. +3 −0 CHANGES.txt
  3. +6 −0 nikola/conf.py.in
  4. +2 −0 nikola/data/themes/base/messages/messages_ar.py
  5. +2 −0 nikola/data/themes/base/messages/messages_az.py
  6. +2 −0 nikola/data/themes/base/messages/messages_bg.py
  7. +2 −0 nikola/data/themes/base/messages/messages_bs.py
  8. +2 −0 nikola/data/themes/base/messages/messages_ca.py
  9. +2 −0 nikola/data/themes/base/messages/messages_cs.py
  10. +2 −0 nikola/data/themes/base/messages/messages_da.py
  11. +2 −0 nikola/data/themes/base/messages/messages_de.py
  12. +2 −0 nikola/data/themes/base/messages/messages_el.py
  13. +2 −0 nikola/data/themes/base/messages/messages_en.py
  14. +2 −0 nikola/data/themes/base/messages/messages_eo.py
  15. +2 −0 nikola/data/themes/base/messages/messages_es.py
  16. +2 −0 nikola/data/themes/base/messages/messages_et.py
  17. +2 −0 nikola/data/themes/base/messages/messages_eu.py
  18. +2 −0 nikola/data/themes/base/messages/messages_fa.py
  19. +2 −0 nikola/data/themes/base/messages/messages_fi.py
  20. +2 −0 nikola/data/themes/base/messages/messages_fil.py
  21. +2 −0 nikola/data/themes/base/messages/messages_fr.py
  22. +2 −0 nikola/data/themes/base/messages/messages_gl.py
  23. +2 −0 nikola/data/themes/base/messages/messages_he.py
  24. +2 −0 nikola/data/themes/base/messages/messages_hi.py
  25. +2 −0 nikola/data/themes/base/messages/messages_hr.py
  26. +2 −0 nikola/data/themes/base/messages/messages_hu.py
  27. +2 −0 nikola/data/themes/base/messages/messages_id.py
  28. +2 −0 nikola/data/themes/base/messages/messages_it.py
  29. +2 −0 nikola/data/themes/base/messages/messages_ja.py
  30. +2 −0 nikola/data/themes/base/messages/messages_ko.py
  31. +2 −0 nikola/data/themes/base/messages/messages_lt.py
  32. +2 −0 nikola/data/themes/base/messages/messages_nb.py
  33. +2 −0 nikola/data/themes/base/messages/messages_nl.py
  34. +2 −0 nikola/data/themes/base/messages/messages_pa.py
  35. +2 −0 nikola/data/themes/base/messages/messages_pl.py
  36. +2 −0 nikola/data/themes/base/messages/messages_pt.py
  37. +2 −0 nikola/data/themes/base/messages/messages_pt_br.py
  38. +2 −0 nikola/data/themes/base/messages/messages_ru.py
  39. +2 −0 nikola/data/themes/base/messages/messages_si_lk.py
  40. +2 −0 nikola/data/themes/base/messages/messages_sk.py
  41. +2 −0 nikola/data/themes/base/messages/messages_sl.py
  42. +2 −0 nikola/data/themes/base/messages/messages_sq.py
  43. +2 −0 nikola/data/themes/base/messages/messages_sr.py
  44. +2 −0 nikola/data/themes/base/messages/messages_sr_latin.py
  45. +2 −0 nikola/data/themes/base/messages/messages_sv.py
  46. +2 −0 nikola/data/themes/base/messages/messages_te.py
  47. +2 −0 nikola/data/themes/base/messages/messages_tl.py
  48. +2 −0 nikola/data/themes/base/messages/messages_tr.py
  49. +2 −0 nikola/data/themes/base/messages/messages_uk.py
  50. +2 −0 nikola/data/themes/base/messages/messages_ur.py
  51. +2 −0 nikola/data/themes/base/messages/messages_zh_cn.py
  52. +2 −0 nikola/data/themes/base/messages/messages_zh_tw.py
  53. +2 −0 nikola/nikola.py
  54. +1 −1 nikola/plugins/task/listings.py
  55. +1 −1 nikola/plugins/task/sections.py
  56. +1 −1 requirements-tests.txt
  57. +1 −1 scripts/generate_conf.py
  58. +2 −0 scripts/import_po.py
  59. +2 −0 scripts/jinjify.py
  60. +1 −0 scripts/langmatrix.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>`_
@@ -48,6 +47,7 @@
* `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>`_
@@ -13,7 +13,10 @@ Math support changes
Features
--------


* 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)
@@ -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
@@ -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 = {
@@ -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 = {
@@ -584,6 +584,7 @@ def __init__(self, **config):
'SOCIAL_BUTTONS_CODE': '',
'SITE_URL': 'https://example.com/',
'PAGE_INDEX': False,
'SECTION_PATH': '',
'STRIP_INDEXES': False,
'SITEMAP_INCLUDE_FILELESS_DIRS': True,
'TAG_PATH': 'categories',
@@ -673,6 +674,7 @@ def __init__(self, **config):
'TAGS_INDEX_PATH',
'CATEGORY_PATH',
'CATEGORIES_INDEX_PATH',
'SECTION_PATH',
'INDEX_PATH',
'RSS_PATH',
'AUTHOR_PATH',

0 comments on commit 20d6e92

Please sign in to comment.