[ckan-changes] [ckan/ckan] 555007: [#3233} Fix recline map config helpers

[GitHub]

  Branch: refs/heads/3196-common-url_for
  Home:   https://github.com/ckan/ckan
  Commit: 555007db740d42b0c981a0c1797d69394cdb6dac
      https://github.com/ckan/ckan/commit/555007db740d42b0c981a0c1797d69394cdb6dac
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-06 (Tue, 06 Sep 2016)

  Changed paths:
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/templates/recline_view.html

  Log Message:
  -----------
  [#3233} Fix recline map config helpers

Previously recline_view and recline_map_view registered to separate
names for the same helper function, and the template checked for both.
But if you didn't load one of the plugins then you got a HelperError as
it hadn't been registered.

This makes all recline plugins load the same helper so it only has one
name.


  Commit: 98725d97fe111c70bc94e7cd239ea3487db21d40
      https://github.com/ckan/ckan/commit/98725d97fe111c70bc94e7cd239ea3487db21d40
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2016-09-07 (Wed, 07 Sep 2016)

  Changed paths:
    M ckan/public/base/vendor/moment-with-locales.js

  Log Message:
  -----------
  Update moment.js to 2.14.1

the previous version 2.10.13 is vulnerable to regular expression denial
of service (see https://nodesecurity.io/advisories/55)


  Commit: cfdf867b2fbf57d6ee785e995cf052816302da76
      https://github.com/ckan/ckan/commit/cfdf867b2fbf57d6ee785e995cf052816302da76
  Author: Ian Ward <ian at excess.org>
  Date:   2016-09-08 (Thu, 08 Sep 2016)

  Changed paths:
    M doc/contributing/architecture.rst
    A doc/images/architecture.png
    A doc/images/architecture.svg

  Log Message:
  -----------
  [#3237] add architecture diagram


  Commit: 45b8e4f964fd3631866fce0630d3d15fbeff9abd
      https://github.com/ckan/ckan/commit/45b8e4f964fd3631866fce0630d3d15fbeff9abd
  Author: Ian Ward <ian at excess.org>
  Date:   2016-09-08 (Thu, 08 Sep 2016)

  Changed paths:
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/templates/recline_view.html

  Log Message:
  -----------
  Merge pull request #3235 from ckan/3233-recline-view-config

[#3233] Fix recline map config helpers


  Commit: 130ab3e26ab813b19b13940c8d5cbceb80d8495e
      https://github.com/ckan/ckan/commit/130ab3e26ab813b19b13940c8d5cbceb80d8495e
  Author: Ian Ward <ian at excess.org>
  Date:   2016-09-09 (Fri, 09 Sep 2016)

  Changed paths:
    M doc/contributing/architecture.rst

  Log Message:
  -----------
  [#3237] reorder architecture.rst sections to match diagram, some new content


  Commit: 29be748b7d43c3cd2a7676207254fe22885b2577
      https://github.com/ckan/ckan/commit/29be748b7d43c3cd2a7676207254fe22885b2577
  Author: Ian Ward <ian at excess.org>
  Date:   2016-09-09 (Fri, 09 Sep 2016)

  Changed paths:
    M doc/contributing/architecture.rst

  Log Message:
  -----------
  [#3237] more views and logic layer discussion


  Commit: faa243fb7fa884eaf5fe3d74ed17c0b53c2345d3
      https://github.com/ckan/ckan/commit/faa243fb7fa884eaf5fe3d74ed17c0b53c2345d3
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-14 (Wed, 14 Sep 2016)

  Changed paths:
    M doc/contributing/architecture.rst
    A doc/images/architecture.png
    A doc/images/architecture.svg

  Log Message:
  -----------
  Merge branch '3237-architecture-diagram'


  Commit: 628cbc0381b40727925f6388a13dbe2fae1f6418
      https://github.com/ckan/ckan/commit/628cbc0381b40727925f6388a13dbe2fae1f6418
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-09-14 (Wed, 14 Sep 2016)

  Changed paths:
    M ckan/public/base/vendor/moment-with-locales.js

  Log Message:
  -----------
  Merge pull request #3236 from liip-forks/update-momentjs

Update moment.js to 2.14.1


  Commit: d73326ad4beb3743cb4a347b15c04dace8c8654b
      https://github.com/ckan/ckan/commit/d73326ad4beb3743cb4a347b15c04dace8c8654b
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-14 (Wed, 14 Sep 2016)

  Changed paths:
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [#3238] Fix formatters in zn_CN string


  Commit: 63693ae3cccd7723e76156b8e58b15b86b4582e9
      https://github.com/ckan/ckan/commit/63693ae3cccd7723e76156b8e58b15b86b4582e9
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/public/base/vendor/moment-with-locales.js
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/templates/recline_view.html
    M doc/contributing/architecture.rst
    A doc/images/architecture.png
    A doc/images/architecture.svg

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-url_for


Compare: https://github.com/ckan/ckan/compare/23f9c5327eca...63693ae3cccd