Skip to content
Permalink
Browse files
merged master
  • Loading branch information
ralsina committed May 4, 2015
2 parents 6100d41 + a3e27f7 commit 3717534cb4cfe7542c7ec109488c412124389282
Showing with 8 additions and 6 deletions.
  1. +2 −0 CHANGES.txt
  2. +2 −2 docs/manual.txt
  3. +1 −1 dodo.py
  4. +1 −1 nikola/filters.py
  5. +2 −2 nikola/plugins/command/check.py
@@ -5,6 +5,7 @@ Features
--------

* Plugins can manipulate task dependencies (Issue #1679)
* LINK_CHECK_WHITELIST now works with output relative and full fs paths
* Four new filters: html_tidy_nowrap, html_tidy_wrap, html_tidy_wrap_attr,
and html_tidy_mini for prettification and minification. Requires tidy5.
* Multilingual sitemaps (Issue #1610)
@@ -22,6 +23,7 @@ Features
Bugfixes
--------

* `nikola check -l` didn’t scan posts
* Don’t use sets for ``FAVICONS`` (Issue #1674)
* Posts/Pages that use post-list will never be up to date (Issue #1671)
* Support using post.text() in post_list_directive.tmpl (Issue #1671)
@@ -1229,7 +1229,7 @@ You can disable comments for a post by adding a "nocomments" metadata field to i
#639).

An alternative or complement to comments are annotations. Nikola integrates
the annotation service provided by `AnnotateIt. <annotateit.org>`_
the annotation service provided by `AnnotateIt. <http://annotateit.org/>`_
To use it, set the ``ANNOTATIONS`` option to True. This is specially useful
if you want feedback on specific parts of your writing.

@@ -1273,7 +1273,7 @@ The ``conf.py`` options affecting images and gallery pages are these::
# destination folder. A thumbnail will also be created in the same folder with
# ``.thumbnail`` inserted in the file name before the file extension
# (e.g. ``tesla.thumbnail.jpg``).
IMAGE_FOLDERS = {'images': ''}
IMAGE_FOLDERS = {'images': 'images'}
# More image/gallery options:
THUMBNAIL_SIZE = 180
IMAGE_THUMBNAIL_SIZE = 400
@@ -38,7 +38,7 @@ def set_nikola_test_locales():
lang = line.split('_')[0]
if lang not in languages:
try:
locale.setlocale(locale.LC_ALL, line)
locale.setlocale(locale.LC_ALL, str(line))
except:
continue
languages.add(lang)
@@ -168,7 +168,7 @@ def _html_tidy_runner(infile, options):
try:
status = runinplace(r"tidy5 " + options, infile)
except subprocess.CalledProcessError as err:
status = 0 if err.returncode is 1 else err.returncode
status = 0 if err.returncode == 1 else err.returncode
return status


@@ -217,7 +217,7 @@ def analyze(self, task, find_sources=False):
fs_rel_path = fs_relpath_from_url_path(url_rel_path)
target_filename = os.path.join(self.site.config['OUTPUT_FOLDER'], fs_rel_path)

if any(re.match(x, target_filename) for x in self.whitelist):
if any(re.search(x, target_filename) for x in self.whitelist):
continue
elif target_filename not in self.existing_targets:
if os.path.exists(target_filename):
@@ -244,7 +244,7 @@ def scan_links(self, find_sources=False):
if task.split(':')[0] in (
'render_tags', 'render_archive',
'render_galleries', 'render_indexes',
'render_pages'
'render_pages', 'render_posts',
'render_site') and '.html' in task:
if self.analyze(task, find_sources):
failure = True

0 comments on commit 3717534

Please sign in to comment.