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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e0c5df3538f4^
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: def2e4f7f0a6
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on May 22, 2017

  1. Why are we breaking panoramas on purpose, and in a non-configurable w… 

    …ay? I don't know.
    Roberto Alsina committed May 22, 2017
    Copy the full SHA
    e0c5df3 View commit details

  2. Updated changelog

    Roberto Alsina committed May 22, 2017
    Copy the full SHA
    def2e4f View commit details
Showing with 5 additions and 4 deletions.
  1. +1 −0 CHANGES.txt
  2. +2 −2 nikola/plugins/task/galleries.py
  3. +2 −2 nikola/plugins/task/scale_images.py
1 change: 1 addition & 0 deletions CHANGES.txt
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ Features
Bugfixes
--------

* Resize panoramas in a more reasonable way (Issue #2780)
* Disable ``archive_rss`` link handler, which was useless because no
such RSS was ever generated (Issue #2783)
* Ignore files ending wih "bak" (Issue #2740)
4 changes: 2 additions & 2 deletions nikola/plugins/task/galleries.py
View file
Original file line number Diff line number Diff line change
@@ -479,7 +479,7 @@ def create_target_images(self, img, input_path):
'targets': [thumb_path],
'actions': [
(self.resize_image,
(img, thumb_path, self.kw['thumbnail_size'], False, self.kw['preserve_exif_data'],
(img, thumb_path, self.kw['thumbnail_size'], True, self.kw['preserve_exif_data'],
self.kw['exif_whitelist']))
],
'clean': True,
@@ -495,7 +495,7 @@ def create_target_images(self, img, input_path):
'targets': [orig_dest_path],
'actions': [
(self.resize_image,
(img, orig_dest_path, self.kw['max_image_size'], False, self.kw['preserve_exif_data'],
(img, orig_dest_path, self.kw['max_image_size'], True, self.kw['preserve_exif_data'],
self.kw['exif_whitelist']))
],
'clean': True,
4 changes: 2 additions & 2 deletions nikola/plugins/task/scale_images.py
View file
Original file line number Diff line number Diff line change
@@ -71,8 +71,8 @@ def process_tree(self, src, dst):

def process_image(self, src, dst, thumb):
"""Resize an image."""
self.resize_image(src, dst, self.kw['max_image_size'], False, preserve_exif_data=self.kw['preserve_exif_data'], exif_whitelist=self.kw['exif_whitelist'])
self.resize_image(src, thumb, self.kw['image_thumbnail_size'], False, preserve_exif_data=self.kw['preserve_exif_data'], exif_whitelist=self.kw['exif_whitelist'])
self.resize_image(src, dst, self.kw['max_image_size'], True, preserve_exif_data=self.kw['preserve_exif_data'], exif_whitelist=self.kw['exif_whitelist'])
self.resize_image(src, thumb, self.kw['image_thumbnail_size'], True, preserve_exif_data=self.kw['preserve_exif_data'], exif_whitelist=self.kw['exif_whitelist'])

def gen_tasks(self):
"""Copy static files into the output folder."""