Added a simple scale filter to image_operations.

.gitignore

@@ -13,6 +13,8 @@
 npm-debug.log*
 *.idea/
 /*.egg/
+/.cache/
+/.pytest_cache/
 
 ### JetBrains
 .idea/

.travis.yml

@@ -49,13 +49,21 @@ matrix:
    - env: TOXENV=py36-dj20-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
      python: 3.6
      sudo: true
+   - env: TOXENV=py36-dj111-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
+     python: 3.6
+     sudo: true
+   - env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
+     python: 3.6
+     sudo: true
   allow_failures:
     # Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
     - env: TOXENV=py35-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
     - env: TOXENV=py36-dj111-postgres-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
     - env: TOXENV=py36-dj20-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
     - env: TOXENV=py36-dj111-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
     - env: TOXENV=py36-dj20-postgres-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
+    - env: TOXENV=py36-dj111-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
+    - env: TOXENV=py36-dj20-postgres-elasticsearch6 INSTALL_ELASTICSEARCH6=yes
 
 # Services
 services:
@@ -66,6 +74,7 @@ install:
   - pip install tox codecov
   - 'if [[ -n "$INSTALL_ELASTICSEARCH2" ]]; then ./scripts/travis/install_elasticsearch2.sh; fi'
   - 'if [[ -n "$INSTALL_ELASTICSEARCH5" ]]; then ./scripts/travis/install_elasticsearch5.sh; fi'
+  - 'if [[ -n "$INSTALL_ELASTICSEARCH6" ]]; then ./scripts/travis/install_elasticsearch6.sh; fi'
 
 # Pre-test configuration
 before_script:

.tx/config

@@ -96,3 +96,4 @@ file_filter = wagtail/contrib/table_block/locale/<lang>/LC_MESSAGES/django.po
 source_file = wagtail/contrib/table_block/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type = PO
+

CHANGELOG.txt

@@ -1,10 +1,21 @@
 Changelog
 =========
 
+2.2 (xx.xx.xxx) - IN DEVELOPMENT
+~~~~~~~~~~~~~~~
+
+ * Added another valid AudioBoom oEmbed pattern (Bertrand Bordage)
+ * Added `annotate_score` support to PostgreSQL search backend (Bertrand Bordage)
+
+
 2.1 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~
 
  * Add `HelpPanel` to add HTML within an edit form (Keving Chung)
+ * Added direct profile picture upload to account preferences (Daniel Chimeno, Pierre Geier, Matt Westcott)
+ * Added API endpoint for finding pages by HTML path (Karl Hobley)
+ * Added time zone setting to account preferences (David Moore)
+ * Added Elasticsearch 6 support (Karl Hobley)
  * Persist tab hash in URL to allow direct navigation to tabs in the admin interface (Ben Weatherman)
  * Animate the chevron icon when opening sub-menus in the admin (Carlo Ascani)
  * Look through the target link and target page slug (in addition to the old slug) when searching for redirects in the admin (Michael Harrison)
@@ -13,6 +24,18 @@ Changelog
  * Add JavaScript source maps in production build for packaged Wagtail (Thibaud Colas)
  * Removed `assert` statements from Wagtail API (Kim Chee Leong)
  * Update `jquery-datetimepicker` dependency to make Wagtail more CSP-friendly (`unsafe-eval`) (Mike Kamermans)
+ * Added error notification when running the `wagtail` command on Python <3.4 (Matt Westcott)
+ * `update_index` management command now accepts a `--chunk_size` option to determine the number of items to load at once (Dave Bell)
+ * Added hook `register_account_menu_item` to add new account preference items (Michael van Tellingen)
+ * Added change email functionality from the account settings (Alejandro Garza, Alexs Mathilda)
+ * Add request parameter to edit handlers (Rajeev J Sebastian)
+ * ImageChooser now sets a default title based on filename (Coen van der Kamp)
+ * Added error handling to the Draftail editor (Thibaud Colas)
+ * Add new `wagtail_icon` template tag to facilitate making admin icons accessible (Sander Tuit)
+ * Set `ALLOWED_HOSTS` in the project template to allow any host in development (Tom Dyson)
+ * Expose reusable client-side code to build Draftail extensions (Thibaud Colas)
+ * Added `WAGTAILFRONTENDCACHE_LANGUAGES` setting to specify the languages whose URLs are to be purged when using `i18n_patterns` (PyMan Claudio Marinozzi)
+ * Added `extra_footer_actions` template blocks for customising the add/edit page views (Arthur Holzner)
  * Fix: Status button on 'edit page' now links to the correct URL when live and draft slug differ (LB (Ben Johnston))
  * Fix: Image title text in the gallery and in the chooser now wraps for long filenames (LB (Ben Johnston), Luiz Boaretto)
  * Fix: Move image editor action buttons to the bottom of the form on mobile (Julian Gallo)
@@ -29,11 +52,34 @@ Changelog
  * Fix: Editing setting object with no site configured no longer crashes (Harm Zeinstra)
  * Fix: Creating a new object with inlines while mandatory fields are empty no longer crashes (Bertrand Bordage)
  * Fix: Localization of image and apps verbose names
+ * Fix: Draftail editor no longer crashes after deleting image/embed using DEL key (Thibaud Colas)
+ * Fix: Breadcrumb navigation now respects custom `get_admin_display_title` methods (Arthur Holzner, Wietze Helmantel, Matt Westcott)
+ * Fix: Inconsistent order of heading features when adding h1, h5 or h6 as default feature for Hallo RichText editor (Loic Teixeira)
+ * Fix: Add invalid password reset link error message (Coen van der Kamp)
+ * Fix: Bypass select/prefetch related optimisation on `update_index` for `ParentalManyToManyField` to fix crash (Tim Kamanin)
+ * Fix: 'Add user' is now rendered as a button due to the use of quotes within translations (Benoît Vogel)
+ * Fix: Menu icon no longer overlaps with title in Modeladmin on mobile (Coen van der Kamp)
+ * Fix: Background color overflow within the Wagtail documentation (Sergey Fedoseev)
+ * Fix: Page count on homepage summary panel now takes account of user permissions (Andy Chosak)
+ * Fix: Explorer view now prevents navigating outside of the common ancestor of the user's permissions (Andy Chosak)
+ * Fix: Generate URL for the current site when multiple sites share the same root page (Codie Roelf)
+ * Fix: Restored ability to use non-model fields with FieldPanel (Matt Westcott, LB (Ben Johnston))
+ * Fix: Stop revision comparison view from crashing when non-model FieldPanels are in use (LB (Ben Johnston))
+ * Fix: Ordering in the page explorer now respects custom `get_admin_display_title` methods when sorting <100 pages (Matt Westcott)
+ * Fix: Use index-specific Elasticsearch endpoints for bulk insertion, for compatibility with providers that lock down the root endpoint (Karl Hobley)
+
+
+2.0.2 (xx.xx.xxxx) - IN DEVELOPMENT
+~~~~~~~~~~~~~~~~~~
 
+ * Fix: Restored ability to use non-model fields with FieldPanel (Matt Westcott, LB (Ben Johnston))
 
-2.0.1 (xx.xx.xxxx) - IN DEVELOPMENT
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+2.0.1 (04.04.2018)
+~~~~~~~~~~~~~~~~~~
+
+ * Added error notification when running the `wagtail` command on Python <3.4 (Matt Westcott)
+ * Added error handling to the Draftail editor (Thibaud Colas)
  * Fix: Draftail now supports features specified via the `WAGTAILADMIN_RICH_TEXT_EDITORS` setting (Todd Dembrey)
  * Fix: Password reset form no longer indicates whether the email is recognised, as per standard Django behaviour (Bertrand Bordage)
  * Fix: `UserAttributeSimilarityValidator` is now correctly enforced on user creation / editing forms (Tim Heap)
@@ -131,8 +177,8 @@ Changelog
  * Fix: Prevented intermittent failures on Postgres search backend when a field is defined as both a `SearchField` and a `FilterField` (Matt Westcott)
 
 
-1.13 (16.10.2017)
-~~~~~~~~~~~~~~~~~
+1.13 LTS (16.10.2017)
+~~~~~~~~~~~~~~~~~~~~~
 
  * Front-end cache invalidator now supports purging URLs as a batch (Karl Hobley)
  * Custom document model is now documented (Emily Horsman)

CONTRIBUTORS.rst

@@ -282,11 +282,22 @@ Contributors
 * Sebastian Brestin
 * Casper Timmers
 * Kevin Chung
+* Codie Roelf
 * Kim Chee Leong
 * Dan Swain
 * Alexs Mathilda
 * Tony Yates
 * Mike Kamermans
+* Arthur Holzner
+* Alejandro Garza
+* Rajeev J Sebastian
+* Coen van der Kamp
+* Sander Tuit
+* Tim Kamanin
+* Sergey Fedoseev
+* Harm Zeinstra
+* David Moore
+* Pierre Geier
 
 Translators
 ===========
@@ -297,15 +308,15 @@ Translators
 * Bulgarian: Lyuboslav Petrov
 * Catalan: Antoni Aloy, David Llop, Roger Pons
 * Chinese: hanfeng, Lihan Li, Leway Colin, Orangle Liu
-* Chinese (China): hanfeng, Daniel Hwang, Jian Li, Listeng Teng, Feng Wang, Fred Zeng, Joey Zhao, Vincent Zhao, zhushajun
+* Chinese (China): hanfeng, Daniel Hwang, Jian Li, Listeng Teng, Feng Wang, whuim, Fred Zeng, Joey Zhao, Vincent Zhao, zhushajun
 * Chinese (Taiwan): gogobook, Lihan Li, Jp Shieh
 * Croatian (Croatia): Luka Matijević
 * Czech: Ales Dvorak, Martin Galda, Sophy O, Ivan Pomykacz, Jiri Stepanek, Marek Turnovec, Stanislav Vasko
-* Danish: Asger Sørensen
+* Danish: Mads Kronborg, Asger Sørensen
 * Dutch: benny_AT_it_digin.com, Bram, Brecht Dervaux, Huib Keemink, Thijs Kramer, Samuel Leeuwenburg, mahulst, Rob Moorman, Michael van Tellingen, Arne Turpyn
 * Dutch (Netherlands): Bram, Kees Hink, Franklin Kingma, Maarten Kling, Thijs Kramer
 * Finnish: Eetu Häivälä, Niklas Jerva, Aarni Koskela, Rauli Laine, Glen Somerville, Juha Yrjölä
-* French: Adrien, Timothy Allen, Sebastien Andrivet, Bertrand Bordage, André Bouatchidzé, Aurélien Debord, Romain Dorgueil, Tom Dyson, Antonin Enfrun, Axel Haustant, Léo, Pierre Marfoure, nahuel, Dominique Peretti, Loïc Teixeira, Benoît Vogel
+* French: Adrien, Timothy Allen, Sebastien Andrivet, Bertrand Bordage, André Bouatchidzé, Aurélien Debord, Romain Dorgueil, Tom Dyson, Antonin Enfrun, Axel Haustant, Léo, Pierre Marfoure, nahuel, Sophy O, Dominique Peretti, Loïc Teixeira, Benoît Vogel
 * Galician: fooflare
 * Georgian: André Bouatchidzé
 * German: Ettore Atalan, Patrick Craston, Henrik Kröger, Tammo van Lessen, Martin Löhle, Wasilis Mandratzis-Walz, Daniel Manser, m0rph3u5, Max Pfeiffer, Moritz Pfeiffer, Herbert Poul, Karl Sander, Tobias Schmidt, Johannes Spielmann, Raphael Stolt, Jannis Vajen, Vorlif, Matthew Westcott
@@ -320,19 +331,19 @@ Translators
 * Latvian: Reinis Rozenbergs, Maris Serzans
 * Lithuanian: Matas Dailyda
 * Mongolian: Delgermurun Purevkhuu
-* Norwegian Bokmål: Eirik Krogstad, Robin Skahjem-Eriksen
+* Norwegian Bokmål: Eirik Krogstad, Robin Skahjem-Eriksen, Stein Strindhaug
 * Persian: Mohammad reza Jelveh, Mohammad Hossein Mojtahedi, Py Zenberg
 * Polish: Konrad Lalik, Mateusz, Miłosz Miśkiewicz, Bartek Sielicki, utek, Grzegorz Wasilewski, Bartosz Wiśniewski
 * Portuguese (Brazil): Claudemiro Alves Feitosa Neto, Bruno Bertoldi, Luiz Boaretto, Gladson Brito, Thiago Cangussu, Gilson Filho, Joao Garcia, João Luiz Lorencetti, Marcio Mazza, Douglas Miranda, Guilherme Nabanete
 * Portuguese (Portugal): Gladson Brito, Thiago Cangussu, Tiago Henriques, Jose Lourenco, Nuno Matos, Douglas Miranda, Manuela Silva
 * Romanian: Dan Braghis
-* Russian: ajk, Andrey Avdey, Daniil, gsstver, Sergey Khalymon, Sergey Komarov, Arseni M, Eugene MechanisM, Rustam Mirzaev, Mikalai Radchuk, Alexandr Romantsov, Nikita Viktorovich, Vassiliy Vorobyov
+* Russian: ajk, Andrey Avdey, Daniil, gsstver, Sergey Khalymon, Sergey Komarov, Arseni M, Eugene MechanisM, Rustam Mirzaev, Alexander Penshin, Mikalai Radchuk, Alexandr Romantsov, Nikita Viktorovich, Vassiliy Vorobyov
 * Slovak (Slovakia): Stevo Backor, dellax, Martin Janšto, Jozef Karabelly
 * Slovenian: Mitja Pagon
 * Spanish: Mauricio Baeza, Daniel Chimeno, fonso, fooflare, José Luis, Joaquín Tita, Unai Zalakain
 * Swedish: Andreas Bergström, Jim Brouzoulis, Alexander Holmbäck, André Karlsson, Jon Karlsson, Ludwig Kjellström, Thomas Kunambi, Andreas Lans, Hannes Lohmander
 * Turkish: Zafer Cengiz, Cihad Gündoǧdu, Ragıp Ünal
 * Turkish (Turkey): Saadettin Yasir Akel, Cihad Gündoǧdu, José Luis, Ragıp Ünal
-* Ukrainian: Viktor Shytiuk, Mykola Zamkovoi
+* Ukrainian: Sergiy Shkodenko, Viktor Shytiuk, Mykola Zamkovoi
 * Vietnamese: Luan Nguyen, Nguyễn Hồng Quân
 * Welsh: Adam Hughes

client/src/components/Draftail/Draftail.scss

@@ -17,6 +17,7 @@ $draftail-editor-font-family: $font-serif;
 @import '../../../../node_modules/draftail/lib/index';
 
 @import './Tooltip/Tooltip';
+@import './EditorFallback/EditorFallback';
 
 @import './decorators/TooltipEntity';
 

client/src/components/Draftail/EditorFallback/EditorFallback.js

@@ -0,0 +1,149 @@
+import PropTypes from 'prop-types';
+import React, { PureComponent } from 'react';
+import { convertFromRaw } from 'draft-js';
+
+import { STRINGS } from '../../../config/wagtailConfig';
+
+const MAX_EDITOR_RELOADS = 3;
+
+class EditorFallback extends PureComponent {
+  constructor(props) {
+    super(props);
+
+    const { field } = props;
+
+    this.state = {
+      error: null,
+      info: null,
+      reloads: 0,
+      showContent: false,
+      showError: false,
+      initialContent: field.value,
+    };
+
+    this.renderError = this.renderError.bind(this);
+    this.toggleContent = this.toggleContent.bind(this);
+    this.toggleError = this.toggleError.bind(this);
+    this.onReloadEditor = this.onReloadEditor.bind(this);
+  }
+
+  componentDidCatch(error, info) {
+    const { field } = this.props;
+    const { initialContent } = this.state;
+
+    this.setState({ error, info });
+
+    field.value = initialContent;
+  }
+
+  onReloadEditor() {
+    const { reloads } = this.state;
+
+    this.setState({
+      error: null,
+      info: null,
+      reloads: reloads + 1,
+      showContent: false,
+      showError: false,
+    });
+  }
+
+  toggleContent() {
+    const { showContent } = this.state;
+    this.setState({ showContent: !showContent });
+  }
+
+  toggleError() {
+    const { showError } = this.state;
+    this.setState({ showError: !showError });
+  }
+
+  renderError() {
+    const { field } = this.props;
+    const { error, info, reloads, showContent, showError } = this.state;
+    const content =
+      field.rawContentState &&
+      convertFromRaw(field.rawContentState).getPlainText();
+
+    return (
+      <div className="Draftail-Editor">
+        <div className="Draftail-Toolbar">
+          {content && (
+            <button
+              type="button"
+              className="Draftail-ToolbarButton"
+              onClick={this.toggleContent}
+            >
+              {STRINGS.SHOW_LATEST_CONTENT}
+            </button>
+          )}
+
+          <button
+            type="button"
+            className="Draftail-ToolbarButton"
+            onClick={this.toggleError}
+          >
+            {STRINGS.SHOW_ERROR}
+          </button>
+
+          {/* At first we propose reloading the editor. If it still crashes, reload the whole page. */}
+          {reloads < MAX_EDITOR_RELOADS ? (
+            <button
+              type="button"
+              className="Draftail-ToolbarButton"
+              onClick={this.onReloadEditor}
+            >
+              {STRINGS.RELOAD_EDITOR}
+            </button>
+          ) : (
+            <button
+              type="button"
+              className="Draftail-ToolbarButton"
+              onClick={() => window.location.reload(false)}
+            >
+              {STRINGS.RELOAD_PAGE}
+            </button>
+          )}
+        </div>
+
+        <div className="DraftEditor-root">
+          <div className="public-DraftEditor-content">
+            <div className="public-DraftEditorPlaceholder-inner">
+              {STRINGS.EDITOR_CRASH}
+
+              {showContent && (
+                <textarea
+                  className="EditorFallback__textarea"
+                  value={content}
+                  readOnly
+                />
+              )}
+
+              {showError && (
+                <pre className="help-block help-critical">
+                  <code className="EditorFallback__error">
+                    {`${error.name}: ${error.message}\n\n${error.stack}\n${info.componentStack}`}
+                  </code>
+                </pre>
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  render() {
+    const { children } = this.props;
+    const { error } = this.state;
+
+    return error ? this.renderError() : children;
+  }
+}
+
+EditorFallback.propTypes = {
+  children: PropTypes.node.isRequired,
+  field: PropTypes.object.isRequired,
+};
+
+export default EditorFallback;

client/src/components/Draftail/EditorFallback/EditorFallback.scss

@@ -0,0 +1,22 @@
+.EditorFallback__textarea {
+    min-height: 150px;
+    margin-top: 1rem;
+    resize: vertical;
+}
+
+// Override over-reaching styles definition for all textareas in full fields.
+@mixin wagtail-textarea-overrides {
+    padding: 1rem;
+    border-width: 1px;
+    border-radius: 6px;
+}
+
+.EditorFallback__textarea,
+.object.full .EditorFallback__textarea {
+    @include wagtail-textarea-overrides;
+}
+
+.EditorFallback__error {
+    background: none;
+    box-shadow: none;
+}