[ckan-changes] [ckan/ckan] b670bb: Add a submit_all command to datapusher.

• Previous message: [ckan-changes] [ckan/ckan] 868dcb: Only create dataset link on activity stream if eno...
• Next message: [ckan-changes] [ckan/ckan] 05e357: Fix conflict merge
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/poc-flask-views
  Home:   https://github.com/ckan/ckan
  Commit: b670bbfe0dc05b831ef8a4798f44784a4345ac7d
      https://github.com/ckan/ckan/commit/b670bbfe0dc05b831ef8a4798f44784a4345ac7d
  Author: Carl Lange <carl at flax.ie>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M ckanext/datapusher/cli.py

  Log Message:
  -----------
  Add a submit_all command to datapusher.

this allows you to add every resource of every package to the datastore.
this is useful if you're setting up datastore for a a ckan that's
already got datasets.
Also renames the existing submit_all function to resubmit_all, because
it would not act on resources that had not already been submitted to
datastore.


  Commit: 30a3c8485b8e639744e28864f1754be1e6c20a3c
      https://github.com/ckan/ckan/commit/30a3c8485b8e639744e28864f1754be1e6c20a3c
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#2604] - File Upload UX

Note: These changes only apply to data upload/linking.

I've changed the label from 'File' to 'Data' when there's no file/link.

When uploading a file from a local machine to a resource, the label will
change to 'File'. When adding a link to a resource, the label will
change to 'URL'.

When editing a resource, if the data is an upload, the data field will
only display the filename, rather than the url. The label for an upload
will also display as 'File'.

The remove data icon now uses text 'Remove' instead of an icon.


  Commit: 67129e15953f0f25c8e778faabe257d9075972b2
      https://github.com/ckan/ckan/commit/67129e15953f0f25c8e778faabe257d9075972b2
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css

  Log Message:
  -----------
  [#2604] - File Upload UX CSS

Updated main.css


  Commit: a2e30febe25aabcbcb34b4678489655086fa81f2
      https://github.com/ckan/ckan/commit/a2e30febe25aabcbcb34b4678489655086fa81f2
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-10 (Fri, 10 Jun 2016)

  Changed paths:
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/templates/base.html

  Log Message:
  -----------
  [#3103] Use helper for version instead of context

Instead of adding the ckan version as a value on `c`, this commit adds a
new template helper that returns `ckan.__version__`.


  Commit: d9f3a5036a99c5e447ad93977e99ba745e2868c3
      https://github.com/ckan/ckan/commit/d9f3a5036a99c5e447ad93977e99ba745e2868c3
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

  Changed paths:
    R ckan/config/middleware.py
    A ckan/config/middleware/__init__.py
    A ckan/config/middleware/common_middleware.py
    A ckan/config/middleware/flask_app.py
    A ckan/config/middleware/pylons_app.py
    M ckan/tests/config/test_middleware.py

  Log Message:
  -----------
  [#3116] Refactor middleware module.

It was starting to become unmanageably large with a lot of separate
concerns in one place.

- Separate the flask and pylons app code into separate modules.
- Separate the common middleware code into a separate module.


  Commit: 8866961fe236ecdd8b2ed6eaf7510b6bd6f3daf3
      https://github.com/ckan/ckan/commit/8866961fe236ecdd8b2ed6eaf7510b6bd6f3daf3
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3120] Move _get_page_number to helpers


  Commit: 0d9f680fbdaa2abfc758b974d4c30ea67299ed55
      https://github.com/ckan/ckan/commit/0d9f680fbdaa2abfc758b974d4c30ea67299ed55
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#3120] Remove module var PAGINATE_ITEMS_PER_PAGE

The PAGINATE_ITEMS_PER_PAGE variable was used in previous versions of
the BaseController, but the related code has since been removed.


  Commit: 811d8889bf6a49d5eb2f1a833fa26a0d45eec4f2
      https://github.com/ckan/ckan/commit/811d8889bf6a49d5eb2f1a833fa26a0d45eec4f2
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#3120] Remove module var ALLOWED_FIELDSET_PARAMS.

ALLOWED_FIELDSET_PARAMS was used in the BaseController, but the method
that used it has since been removed.


  Commit: 5ce8284c1f127f1f8b4279bbc96a2422b13bef6a
      https://github.com/ckan/ckan/commit/5ce8284c1f127f1f8b4279bbc96a2422b13bef6a
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/controllers/test_feed.py

  Log Message:
  -----------
  [#3120] Change working of abort message.

'key' can be defined in the call, so may not always be 'page'.


  Commit: 82fe4fd9bbe50c7e8285968f2caeb4688fc19f66
      https://github.com/ckan/ckan/commit/82fe4fd9bbe50c7e8285968f2caeb4688fc19f66
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    R ckan/lib/util.py
    M ckan/tests/test_coding_standards.py
    M doc/conf.py

  Log Message:
  -----------
  [#3126] remove backported `subprocess.check_output`


  Commit: 1efb47a879877d88250cf1016be2bda48c1ff54c
      https://github.com/ckan/ckan/commit/1efb47a879877d88250cf1016be2bda48c1ff54c
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M ckan/model/extension.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  [#3126] don't check if methodcaller is available

- `operator.methodcaller` was implemented in python2.7. Now that ckan
  only supports 2.7 it is no longer required to check if the import is
  possible or not. We can besure that it is there.


  Commit: f8bd2cd72abfea9911892543309269d59d2925c8
      https://github.com/ckan/ckan/commit/f8bd2cd72abfea9911892543309269d59d2925c8
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_mailer.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_theme/custom_emails/tests.py

  Log Message:
  -----------
  [#3126] remove assert_(not)_in from helpers

- `assert_in` and `assert_not_in` were duplicated
  in `ckan/tests/legacy/__init__.py` and
  `ckan.tests.helpers` because they were not
  available in python2.6
- This commit removes the back porting from those
  files and just imports from nose.tools directly
  everywhere


  Commit: 7ec19e36c7c9049a650ba88f8f4bd310ae4e5fb8
      https://github.com/ckan/ckan/commit/7ec19e36c7c9049a650ba88f8f4bd310ae4e5fb8
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#3126] remove check for skipping tests

- removes some code that was used to skip tests and change solr settings
  under python2.6 which is not tested against anymore


  Commit: ac69f064ce3a17aee89a1d4c8977fff4c718c700
      https://github.com/ckan/ckan/commit/ac69f064ce3a17aee89a1d4c8977fff4c718c700
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M doc/contributing/python.rst
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  [#3126] only reference py2.7 in documentation


  Commit: 9ee75b530a687e43b9eee4fc049ef412b5ad432a
      https://github.com/ckan/ckan/commit/9ee75b530a687e43b9eee4fc049ef412b5ad432a
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl

  Log Message:
  -----------
  [#3126] remove py2.6 from paster templates


  Commit: 1fe29c72b8770a3bc7db097fe2e1f44fd53da984
      https://github.com/ckan/ckan/commit/1fe29c72b8770a3bc7db097fe2e1f44fd53da984
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/controllers/test_package.py

  Log Message:
  -----------
  [#3128] Render resource view descriptions as Markdown.

Previously, CKAN rendered resource view descriptions as plain text, in
contrast to the help text given in the resource view edit form which
says that Markdown is supported.


  Commit: 7529b0dd1a72644354defcf9a6c57682d6aa6344
      https://github.com/ckan/ckan/commit/7529b0dd1a72644354defcf9a6c57682d6aa6344
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/controllers/test_package.py

  Log Message:
  -----------
  Merge pull request #3129 from torfsen/3128-render-resource-view-description-as-markdown

[#3128] Render resource view descriptions as Markdown.


  Commit: 6d7a9c30765d3e5319a0a83b56d611e47a9c6ea7
      https://github.com/ckan/ckan/commit/6d7a9c30765d3e5319a0a83b56d611e47a9c6ea7
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    R ckan/lib/util.py
    M ckan/model/extension.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M doc/conf.py
    M doc/contributing/python.rst
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Merge pull request #3127 from k-nut/3126-remove-python-2.6-support

Remove Python 2.6 compability


  Commit: 954205d44bbfb6ebd28aa9019d2fd7b152b819f9
      https://github.com/ckan/ckan/commit/954205d44bbfb6ebd28aa9019d2fd7b152b819f9
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    R ckan/config/middleware.py
    A ckan/config/middleware/__init__.py
    A ckan/config/middleware/common_middleware.py
    A ckan/config/middleware/flask_app.py
    A ckan/config/middleware/pylons_app.py
    M ckan/tests/config/test_middleware.py

  Log Message:
  -----------
  Merge pull request #3116 from ckan/3116-middleware-refactor

Refactor config/middleware.py to more closely match poc-flask-views


  Commit: dfd2a9187cde6161fc85ba2aba5feefa2516e227
      https://github.com/ckan/ckan/commit/dfd2a9187cde6161fc85ba2aba5feefa2516e227
  Author: Carl Lange <carl at flax.ie>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M ckanext/datapusher/cli.py

  Log Message:
  -----------
  Fix Pep8 error (long comment)


  Commit: 8396d7c6090defefd5f515054afac9362c70c6ff
      https://github.com/ckan/ckan/commit/8396d7c6090defefd5f515054afac9362c70c6ff
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M bin/running_stats.py

  Log Message:
  -----------
  Add encoding specification.


  Commit: e7513d1df9bfa0b90347216e7199e3e58b23ed5b
      https://github.com/ckan/ckan/commit/e7513d1df9bfa0b90347216e7199e3e58b23ed5b
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Add test to ensure string literals have a `u`, `b` or `ur` prefix.

All existing Python source code files are explicitly white-listed. Over
time, these should be fixed and delisted. New files should not be added
to the list.


  Commit: dfd0af9b23ff2c2c704a324bbc35646c16a45cb6
      https://github.com/ckan/ckan/commit/dfd0af9b23ff2c2c704a324bbc35646c16a45cb6
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M bin/running_stats.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge pull request #3122 from torfsen/3006-test-string-literal-prefix

Test that string literals have an `b`, `u` or `ur` prefix


  Commit: a10edd33ee4e097068f5f4295167c15899a0be3c
      https://github.com/ckan/ckan/commit/a10edd33ee4e097068f5f4295167c15899a0be3c
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M ckanext/datapusher/cli.py

  Log Message:
  -----------
  Merge pull request #3024 from CarlQLange/patch-2

Add a submit_all command to datapusher.


  Commit: 2545f74e44aee3e80630f672ce76e74c46d1e101
      https://github.com/ckan/ckan/commit/2545f74e44aee3e80630f672ce76e74c46d1e101
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-23 (Thu, 23 Jun 2016)

  Changed paths:
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#3132] Clarify package_relationship_update docs.

This action is limited to only updating the comment property. subject,
object and type are required to identify the relationship to update.


  Commit: bcc47010f0ba4d4a2718ffb3ad510701fc70a060
      https://github.com/ckan/ckan/commit/bcc47010f0ba4d4a2718ffb3ad510701fc70a060
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/tests/logic/action/test_update.py

  Log Message:
  -----------
  [#2661] Add revision if owner-org updated.

package_owner_org_update is called during a package_update to handle
updating the owner organization. A package revision is created during
this by package_update. If package_owner_org_update is called in
isolation, no revision is created and an error occurs in vdm. This
commit ensures a revision is created when package_owner_org_update is
called outside of a package_update.


  Commit: f240a8cf79e4a8d3a2a592f4cd3d6fa934a23ff7
      https://github.com/ckan/ckan/commit/f240a8cf79e4a8d3a2a592f4cd3d6fa934a23ff7
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  [#2661] Add 'add_revision' to ctx in pkg create.

package_create also calls package_owner_org_update, and requires the
'add_revision' property adding to the context to prevent
package_owner_org_update from creating an unecessary revision.


  Commit: 88e1a9c09342169c433d2601efb319463accf3e9
      https://github.com/ckan/ckan/commit/88e1a9c09342169c433d2601efb319463accf3e9
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Merge pull request #3132 from ckan/3132-relationship-update-docs

Clarify package_relationship_update documentation


  Commit: 0b8f4d4e480f6d002369876e4e0bcc12557ddb92
      https://github.com/ckan/ckan/commit/0b8f4d4e480f6d002369876e4e0bcc12557ddb92
  Author: Nick Such <nicksuch at gmail.com>
  Date:   2016-06-27 (Mon, 27 Jun 2016)

  Changed paths:
    M doc/contributing/python.rst

  Log Message:
  -----------
  Fix broken link to Google's Python style guide


  Commit: 9548412999ee3710b3f8d1887625cb99848f9247
      https://github.com/ckan/ckan/commit/9548412999ee3710b3f8d1887625cb99848f9247
  Author: Michael Fincham <michael.fincham at catalyst.net.nz>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/maintaining/configuration.rst
    M test.ini

  Log Message:
  -----------
  Change all example uses of domain names to be RFC compliant special-use names


  Commit: 59d1043ec10bdf1a61f62dd67bbdcf994d890355
      https://github.com/ckan/ckan/commit/59d1043ec10bdf1a61f62dd67bbdcf994d890355
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    M doc/contributing/python.rst

  Log Message:
  -----------
  Merge pull request #3138 from nicksuch/docs-google-python-style-guide

Fix broken link to Google's Python style guide


  Commit: f58e6841d6d6661417a6602b05a6fdc6441908d3
      https://github.com/ckan/ckan/commit/f58e6841d6d6661417a6602b05a6fdc6441908d3
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2016-06-29 (Wed, 29 Jun 2016)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-filters-form.js

  Log Message:
  -----------
  Fix autocomplete request url.

Wrapped previously hardcoded url into ckan.url function


  Commit: 7173fbe055294f8a5bfd8cf1ceee702539cd385b
      https://github.com/ckan/ckan/commit/7173fbe055294f8a5bfd8cf1ceee702539cd385b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/tests/logic/action/test_update.py

  Log Message:
  -----------
  Merge pull request #3133 from ckan/2661-owner-org-update

Allow package_owner_org_update action to be called stand-alone


  Commit: d993b207122856f3dc6e945fdac24f92dd505b34
      https://github.com/ckan/ckan/commit/d993b207122856f3dc6e945fdac24f92dd505b34
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-30 (Thu, 30 Jun 2016)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-filters-form.js

  Log Message:
  -----------
  Merge pull request #3144 from smotornyuk/3143-wrong-autocomplete-requests-for-resource-view

Fix autocomplete request url.


  Commit: e2162f0a42b093f0b5ddc50a92af9fd0088112c1
      https://github.com/ckan/ckan/commit/e2162f0a42b093f0b5ddc50a92af9fd0088112c1
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/maintaining/configuration.rst
    M test.ini

  Log Message:
  -----------
  Merge pull request #3139 from fincham/master

Change all example uses of domain names to be RFC compliant special-use names


  Commit: b52909dec4e777d77b6e46c067dbbc7ca1953d95
      https://github.com/ckan/ckan/commit/b52909dec4e777d77b6e46c067dbbc7ca1953d95
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    R .travis.yml
    M Dockerfile
    M MANIFEST.in
    M README.rst
    M circle.yml
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/install.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/partyline.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/exceptions.py
    M ckan/i18n/__init__.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/extract.py
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/formatters.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    R ckan/lib/lazyjson.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/search/sql.py
    M ckan/lib/uploader.py
    M ckan/lib/util.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/patch.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/manage.py
    M ckan/migration/versions/001_add_existing_tables.py
    M ckan/migration/versions/002_add_author_and_maintainer.py
    M ckan/migration/versions/003_add_user_object.py
    M ckan/migration/versions/004_add_group_object.py
    M ckan/migration/versions/005_add_authorization_tables.py
    M ckan/migration/versions/006_add_ratings.py
    M ckan/migration/versions/007_add_system_roles.py
    M ckan/migration/versions/008_update_vdm_ids.py
    M ckan/migration/versions/009_add_creation_timestamps.py
    M ckan/migration/versions/010_add_user_about.py
    M ckan/migration/versions/011_add_package_search_vector.py
    M ckan/migration/versions/012_add_resources.py
    M ckan/migration/versions/013_add_hash.py
    M ckan/migration/versions/014_hash_2.py
    M ckan/migration/versions/015_remove_state_object.py
    M ckan/migration/versions/016_uuids_everywhere.py
    M ckan/migration/versions/017_add_pkg_relationships.py
    M ckan/migration/versions/018_adjust_licenses.py
    M ckan/migration/versions/019_pkg_relationships_state.py
    M ckan/migration/versions/020_add_changeset.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/023_add_harvesting.py
    M ckan/migration/versions/024_add_harvested_document.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/migration/versions/026_authorization_group_user_pk.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/028_drop_harvest_source_status.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/030_additional_user_attributes.py
    M ckan/migration/versions/031_move_openid_to_new_field.py
    M ckan/migration/versions/032_add_extra_info_field_to_resources.py
    M ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    M ckan/migration/versions/034_resource_group_table.py
    M ckan/migration/versions/035_harvesting_doc_versioning.py
    M ckan/migration/versions/036_lockdown_roles.py
    M ckan/migration/versions/037_role_anon_editor.py
    M ckan/migration/versions/038_delete_migration_tables.py
    M ckan/migration/versions/039_add_expired_id_and_dates.py
    M ckan/migration/versions/040_reset_key_on_user.py
    M ckan/migration/versions/041_resource_new_fields.py
    M ckan/migration/versions/042_user_revision_indexes.py
    M ckan/migration/versions/043_drop_postgres_search.py
    M ckan/migration/versions/044_add_task_status.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/046_drop_changesets.py
    M ckan/migration/versions/047_rename_package_group_member.py
    M ckan/migration/versions/048_add_activity_streams_tables.py
    M ckan/migration/versions/049_add_group_approval_status.py
    M ckan/migration/versions/050_term_translation_table.py
    M ckan/migration/versions/051_add_tag_vocabulary.py
    M ckan/migration/versions/052_update_member_capacities.py
    M ckan/migration/versions/053_add_group_logo.py
    M ckan/migration/versions/054_add_resource_created_date.py
    M ckan/migration/versions/055_update_user_and_activity_detail.py
    M ckan/migration/versions/056_add_related_table.py
    M ckan/migration/versions/057_tracking.py
    M ckan/migration/versions/058_add_follower_tables.py
    M ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/migration/versions/060_add_system_info_table.py
    M ckan/migration/versions/061_add_follower__group_table.py
    M ckan/migration/versions/062_add_dashboard_table.py
    M ckan/migration/versions/063_org_changes.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    M ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/migration/versions/068_add_package_extras_index.py
    M ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/migration/versions/072_add_resource_view.py
    M ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/migration/versions/074_remove_resource_groups.py
    M ckan/migration/versions/075_rename_view_plugins.py
    M ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/migration/versions/077_add_revisions_to_system_info.py
    M ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/migration/versions/079_resource_revision_index.py
    M ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/migration/versions/081_set_datastore_active.py
    M ckan/migration/versions/082_create_index_creator_user_id.py
    M ckan/migration/versions/083_remove_related_items.py
    M ckan/migration/versions/084_add_metadata_created.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/system_info.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/MANIFEST.in_tmpl
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    A ckan/pastertemplates/template/requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/less/module.less
    M ckan/templates/base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/feeds.html
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read_base.html
    A ckan/templates/package/snippets/cannot_create_package.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/revision/__init__.py
    M ckan/templates/snippets/debug.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/language_selector.html
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/__init__.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    M ckan/tests/legacy/functional/api/test_misc.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_resource_search.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/base.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_error.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_tag.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/lib/__init__.py
    M ckan/tests/legacy/lib/test_alphabet_pagination.py
    M ckan/tests/legacy/lib/test_authenticator.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_email_notifications.py
    M ckan/tests/legacy/lib/test_hash.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/lib/test_resource_search.py
    M ckan/tests/legacy/lib/test_simple_search.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/lib/test_solr_schema_version.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/lib/test_tag_search.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/logic/test_init.py
    M ckan/tests/legacy/logic/test_member.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/logic/test_validators.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/mock_plugin.py
    M ckan/tests/legacy/models/test_activity.py
    M ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_follower.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/models/test_misc.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/models/test_package_relationships.py
    M ckan/tests/legacy/models/test_purge_revision.py
    M ckan/tests/legacy/models/test_resource.py
    M ckan/tests/legacy/models/test_revision.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/pylons_controller.py
    M ckan/tests/legacy/schema/test_schema.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/navl/test_dictization_functions.py
    M ckan/tests/lib/navl/test_validators.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_auth_tkt.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    A ckan/tests/lib/test_navl.py
    M ckan/tests/logic/action/__init__.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/__init__.py
    M ckan/tests/logic/auth/test_create.py
    M ckan/tests/logic/auth/test_delete.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_conversion.py
    M ckan/tests/logic/test_converters.py
    M ckan/tests/logic/test_schema.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/migration/__init__.py
    M ckan/tests/model/__init__.py
    M ckan/tests/model/test_license.py
    M ckan/tests/model/test_resource.py
    M ckan/tests/model/test_resource_view.py
    M ckan/tests/model/test_system_info.py
    M ckan/tests/model/test_user.py
    M ckan/tests/plugins/__init__.py
    M ckan/tests/plugins/test_toolkit.py
    M ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_factories.py
    M ckan/websetup.py
    M ckanext/__init__.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/auth.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_action.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/plugin_v1.py
    M ckanext/example_iauthfunctions/plugin_v2.py
    M ckanext/example_iauthfunctions/plugin_v3.py
    M ckanext/example_iauthfunctions/plugin_v4.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    A ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/controller.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/plugin_v1.py
    M ckanext/example_iconfigurer/plugin_v2.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/plugin.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_itemplatehelpers/plugin.py
    M ckanext/example_itranslation/plugin.py
    M ckanext/example_itranslation/plugin_v1.py
    M ckanext/example_itranslation/tests/test_plugin.py
    A ckanext/example_iuploader/__init__.py
    A ckanext/example_iuploader/plugin.py
    A ckanext/example_iuploader/test/__init__.py
    A ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    M ckanext/example_theme/custom_emails/plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/example_theme/v01_empty_extension/plugin.py
    M ckanext/example_theme/v02_empty_template/plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/plugin.py
    M ckanext/example_theme/v15_fanstatic/plugin.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/public/__init__.py
    M ckanext/stats/public/ckanext/__init__.py
    M ckanext/stats/public/ckanext/stats/__init__.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    A contrib/docker/docker-cloud.yml
    A contrib/docker/docker-compose.yml
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml
    A contrib/docker/solr/solrconfig.xml
    M dev-requirements.txt
    M doc/contributing/index.rst
    M doc/contributing/python.rst
    A doc/contributing/unicode.rst
    M doc/extensions/best-practices.rst
    M doc/maintaining/configuration.rst
    M profile_tests.py
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3002-jsonp-get


  Commit: f879df191970934b42228bf2eb643b2d03188ba9
      https://github.com/ckan/ckan/commit/f879df191970934b42228bf2eb643b2d03188ba9
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M bin/running_stats.py
    M ckan/config/deployment.ini_tmpl
    R ckan/config/middleware.py
    A ckan/config/middleware/__init__.py
    A ckan/config/middleware/common_middleware.py
    A ckan/config/middleware/flask_app.py
    A ckan/config/middleware/pylons_app.py
    R ckan/lib/util.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/model/extension.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M doc/conf.py
    M doc/contributing/python.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-source.rst
    M test.ini

  Log Message:
  -----------
  Merge branch 'master' into 3002-jsonp-get

Conflicts:
	ckan/tests/controllers/test_api.py


  Commit: 644144a15a40962d783fc10f77c041055a4d9d0b
      https://github.com/ckan/ckan/commit/644144a15a40962d783fc10f77c041055a4d9d0b
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    R ckan/controllers/partyline.py
    M ckan/tests/config/test_middleware.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#3148] Remove WSGI Party

When the App Dispatcher middleware was implemented on #2905 we used WSGI Party
to allow communication between the Pylons and Flask applications. After having
worked extensively on the Flask POC branches this has turned out to be
unnecessary and to add quite a lot of complexity, specially with the language
used around parties, invites, etc.

To set it up there were two internal requests that were done while the app was
being initialized, which were really confusing when trying to debug things. We
didn't find any use case for having the two applications actually talk to each
other, and the asking each app if they can handle the incoming request can be
done just by calling a method directly.

This commit removes all WSGI Party logic and its requirement, and extends the
Flask and PylonsApp app objects with our own can_handle_request(environ)
method, which is directly called by AskAppDispatcherMiddleware on each request.


  Commit: 2df4a09dbeff727dc5a516e25ff9ed154762f5b7
      https://github.com/ckan/ckan/commit/2df4a09dbeff727dc5a516e25ff9ed154762f5b7
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M ckan/tests/config/test_middleware.py

  Log Message:
  -----------
  [#3148] Remove partyline import


  Commit: c73908f86a8cc77de55901455ef885296e5eb13a
      https://github.com/ckan/ckan/commit/c73908f86a8cc77de55901455ef885296e5eb13a
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add information about moved helper to changelog


  Commit: 0629933a25ac982f87f95743faf001126d3cc2e1
      https://github.com/ckan/ckan/commit/0629933a25ac982f87f95743faf001126d3cc2e1
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  Added strict comparison and removed whitespace

=== used for `this.options.field_url` and `this.options.field_upload` in
determining `this.is_data_resource`

Removed whitespace in variable assignments


  Commit: 8177dbc8fd6ee1a4d02e997e7c19b0675c4fce50
      https://github.com/ckan/ckan/commit/8177dbc8fd6ee1a4d02e997e7c19b0675c4fce50
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/theming/javascript.rst

  Log Message:
  -----------
  Improve JavaScript i18n documentation.

Reorganizes the existing documentation in a single place that is linked
to from related topics. Also adds more details, for example regarding
`paster trans js`.


  Commit: d9a2c6a61e8a234141d54dc7197423b711ebddb2
      https://github.com/ckan/ckan/commit/d9a2c6a61e8a234141d54dc7197423b711ebddb2
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    M ckan/tests/config/test_middleware.py

  Log Message:
  -----------
  [#3148] Simplify app references and tests


  Commit: 9f635844a2c69f70f33004488622f40cd39f055f
      https://github.com/ckan/ckan/commit/9f635844a2c69f70f33004488622f40cd39f055f
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M ckan/lib/munge.py
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  Make sure that `ckan.lib.munge.munge_filename` returns Unicode.


  Commit: 9ba0ecf89b05a626f7068cbdb94d1465225259a0
      https://github.com/ckan/ckan/commit/9ba0ecf89b05a626f7068cbdb94d1465225259a0
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    A ckan/lib/io.py
    A ckan/tests/lib/test_io.py
    M doc/contributing/unicode.rst

  Log Message:
  -----------
  Documentation and tools for Unicode filename handling.

Documents best practices for dealing with Unicode filenames. Also adds
the module `ckan.lib.io` which provides `decode_path` and `encode_path`
for de-/encoding Unicode filenames.


  Commit: 4b56e2344c180b4c16150e1e20df30afcb4796b7
      https://github.com/ckan/ckan/commit/4b56e2344c180b4c16150e1e20df30afcb4796b7
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-07-08 (Fri, 08 Jul 2016)

  Changed paths:
    M ckan/lib/cli.py
    M doc/contributing/database-migrations.rst
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst
    A doc/maintaining/database-management.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-source.rst

  Log Message:
  -----------
  [#2952] Depcreate `db load` and `db dump`

Deprecates the paster commands `db load` and `db dump` in favor of
PostgreSQL's `pg_dump` and `pg_restore`. `db load` and `db dump` are
kept but print a warning, and their documentation is replaced with a
documentation of how to dump/import the database using `pg_dump` and
`pg_restore`.


  Commit: 50fb9554c4c9a02ff13546ca0a04d65951d0e6d3
      https://github.com/ckan/ckan/commit/50fb9554c4c9a02ff13546ca0a04d65951d0e6d3
  Author: Ian Ward <ian at excess.org>
  Date:   2016-07-09 (Sat, 09 Jul 2016)

  Changed paths:
    M ckan/lib/cli.py
    M doc/contributing/database-migrations.rst
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst
    A doc/maintaining/database-management.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-source.rst

  Log Message:
  -----------
  Merge pull request #3158 from torfsen/2952-deprecate-db-load-and-db-dump

[#2952] Depcreate `db load` and `db dump`


  Commit: 601eec2726cec5b9589c19c37dfa610c89d9ec2e
      https://github.com/ckan/ckan/commit/601eec2726cec5b9589c19c37dfa610c89d9ec2e
  Author: Rômulo Barroso Victor <rbvictor at gmail.com>
  Date:   2016-07-11 (Mon, 11 Jul 2016)

  Changed paths:
    M ckan/templates/organization/bulk_process.html

  Log Message:
  -----------
  Defining 'count' for search_form snippet

Parameter 'count' was not defined as an input for search_form snippet. 
The template bulk_process was getting an UndefinedError from within the snippet. 
I included this parameter and the error was fixed.


  Commit: 646f4ea9e49675eb4777621b24cb8c0964f8afb1
      https://github.com/ckan/ckan/commit/646f4ea9e49675eb4777621b24cb8c0964f8afb1
  Author: Ian Ward <ian at excess.org>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    R ckan/controllers/partyline.py
    M ckan/tests/config/test_middleware.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #3148 from ckan/3148-remove-wsgiparty

Remove WSGIParty requirement


  Commit: 9eb47a115bf1a2c404eb092b5a6afe2698cf1503
      https://github.com/ckan/ckan/commit/9eb47a115bf1a2c404eb092b5a6afe2698cf1503
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-07-12 (Tue, 12 Jul 2016)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/legacy/logic/test_action.py
    M doc/api/index.rst

  Log Message:
  -----------
  Merge pull request #3002 from ckan/3002-jsonp-get

Only allow JSONP callbacks on GET requests


  Commit: 048632d73588ed462a1133e796681056fe89ef37
      https://github.com/ckan/ckan/commit/048632d73588ed462a1133e796681056fe89ef37
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    M ckan/lib/app_globals.py
    M ckan/plugins/core.py
    M ckan/tests/legacy/test_plugins.py

  Log Message:
  -----------
  [#2842] Refactor evironment loading, initialize Flask configuration

Call `load_environment` before making both stacks rather than from the
Pylons one. Call the app_globals code on the common environment code,
not just on the Pylons stack.

Update the Flask config object with all the CKAN values.

Don't pass explicitly the configuration object to the `load_all` plugins
function, use the one in common.


  Commit: 4c377288a1a81b99a56f917d8b9e9a6ca8cdcd4f
      https://github.com/ckan/ckan/commit/4c377288a1a81b99a56f917d8b9e9a6ca8cdcd4f
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#2842] Wrap Pylons requests in a Flask application context

On this particular branch this is needed so the common CKAN config
object can forward config options to the Flask app config object, but
this will be required anyway as more Flask features need to be available
during a Pylons request (see 62f55d2c96).


  Commit: ad46dce51cd570c814355c833efffb5d7e72cf59
      https://github.com/ckan/ckan/commit/ad46dce51cd570c814355c833efffb5d7e72cf59
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    A ckan/tests/test_common.py

  Log Message:
  -----------
  [#2842] New CKAN config object

Rather than rely on the Pylons (or Flask) config object we define our
own in ckan.common. This is a dict-like object (so fully backwards compatible)
that also proxies any changes to the Flask and Pylons configuration objects
(if they are available)

This should be the only configuration object used in all code unless we really
need to access the underlying Flask or Pylons objects for some reason.

The `ckan.common.config` instance is initialized in the `load_environment`
method with the values of the ini file or env vars.

This is actually a proxy to a property from a Werkzeug Local object, meaning
that `config` is thread-local safe, like its Flask and Pylons counterparts.

See http://werkzeug.pocoo.org/docs/0.11/local/

I tried to separate all Pylons specific stuff (things like `pylons.paths`,
`routes.map` etc) to Pylons own config object to keep the main config object
clean but it proved too difficult, not only because we access these keys from
different parts of the code (which can be solved) but also because when
clearing the config (done on the tests) we lose keys that were added on
`load_environment` and we would need to keep track of those.


  Commit: a77ff9c021c80eee949d2ed11cbafd743ee5c04a
      https://github.com/ckan/ckan/commit/a77ff9c021c80eee949d2ed11cbafd743ee5c04a
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/migration/versions/081_set_datastore_active.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/model/test_license.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/multilingual/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/tests/test_view.py
    M doc/extensions/custom-config-settings.rst

  Log Message:
  -----------
  [#2842] Update all core imports to ckan.common.config


  Commit: 37ecbe8bd44dc0dc03e05d82bf09048c7d1feed6
      https://github.com/ckan/ckan/commit/37ecbe8bd44dc0dc03e05d82bf09048c7d1feed6
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2842] Add config to the plugins toolkit


  Commit: aa396e274f1417b16f67c83c415f47d864d33b16
      https://github.com/ckan/ckan/commit/aa396e274f1417b16f67c83c415f47d864d33b16
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M ckan/tests/test_common.py

  Log Message:
  -----------
  [#2842] Restore Pylons config on config clear test


  Commit: cf9b4c57d1a8b5a16b04c4b6b2377e3d9796c309
      https://github.com/ckan/ckan/commit/cf9b4c57d1a8b5a16b04c4b6b2377e3d9796c309
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    M ckan/controllers/api.py
    R ckan/controllers/partyline.py
    M ckan/lib/cli.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/legacy/logic/test_action.py
    M doc/api/index.rst
    M doc/contributing/database-migrations.rst
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst
    A doc/maintaining/database-management.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-source.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 2842-common-config

Conflicts:
	ckan/config/middleware/flask_app.py
	ckan/config/middleware/pylons_app.py


  Commit: 5a92e2c39e7dbc5b14b66ecfbd67327a61cbbf44
      https://github.com/ckan/ckan/commit/5a92e2c39e7dbc5b14b66ecfbd67327a61cbbf44
  Author: Ian Ward <ian at excess.org>
  Date:   2016-07-13 (Wed, 13 Jul 2016)

  Changed paths:
    A ckan/lib/io.py
    M ckan/lib/munge.py
    A ckan/tests/lib/test_io.py
    M ckan/tests/lib/test_munge.py
    M doc/contributing/unicode.rst

  Log Message:
  -----------
  Merge pull request #3136 from torfsen/3006-document-unicode-filename-handling

Document Unicode filename handling


  Commit: 552ae7b0f6345e05e5a9460276c57a8229e0fe70
      https://github.com/ckan/ckan/commit/552ae7b0f6345e05e5a9460276c57a8229e0fe70
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Merge pull request #3150 from k-nut/3103-b-update-changelog

Add information about moved helper to changelog


  Commit: 3e44254f4b41652286a67dd6debd38877e6e8efe
      https://github.com/ckan/ckan/commit/3e44254f4b41652286a67dd6debd38877e6e8efe
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M ckan/templates/organization/bulk_process.html

  Log Message:
  -----------
  Merge pull request #3161 from rbvictor/patch-1

Defining 'count' for search_form snippet


  Commit: 696c66a6988b90df80c5a0ec34787bc416833b1b
      https://github.com/ckan/ckan/commit/696c66a6988b90df80c5a0ec34787bc416833b1b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  Merge pull request #3079 from HighwayThree/2604-file-upload-ux

[#2604] file upload ux


  Commit: ee9d2de8f2b10d7913a1800731d46c1b6cb9cbd6
      https://github.com/ckan/ckan/commit/ee9d2de8f2b10d7913a1800731d46c1b6cb9cbd6
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/templates/base.html

  Log Message:
  -----------
  Merge pull request #3103 from ckan/3103-version-tmpl-helper

ckan.__version__ available as template helper


  Commit: 875aff8c3773652df87376a8a71ba2b59681ed1a
      https://github.com/ckan/ckan/commit/875aff8c3773652df87376a8a71ba2b59681ed1a
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/theming/javascript.rst

  Log Message:
  -----------
  Merge pull request #3153 from torfsen/improve-js-i18n-docs

Improve JavaScript i18n documentation.


  Commit: a476eb2186c212417ba3f2281ec7c2856557ae1b
      https://github.com/ckan/ckan/commit/a476eb2186c212417ba3f2281ec7c2856557ae1b
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/controllers/test_feed.py

  Log Message:
  -----------
  [#3120] Format abort message with key


  Commit: ea21f16d9b710b3466e66476e17cd74119d1ca56
      https://github.com/ckan/ckan/commit/ea21f16d9b710b3466e66476e17cd74119d1ca56
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/tests/controllers/test_feed.py

  Log Message:
  -----------
  Merge pull request #3120 from ckan/3120-get-page-number

Tidy-up BaseController pagination code


  Commit: bfd71bfdfd142c81be15a989e6a110febefe92f4
      https://github.com/ckan/ckan/commit/bfd71bfdfd142c81be15a989e6a110febefe92f4
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2842] Remove debug command


  Commit: f0ab2b39b32d16f07b215a82a44d0ee3a3d93021
      https://github.com/ckan/ckan/commit/f0ab2b39b32d16f07b215a82a44d0ee3a3d93021
  Author: Ian Ward <ian at excess.org>
  Date:   2016-07-14 (Thu, 14 Jul 2016)

  Changed paths:
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    M ckan/controllers/admin.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/migration/versions/081_set_datastore_active.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/model/test_license.py
    A ckan/tests/test_common.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/multilingual/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/tests/test_view.py
    M doc/extensions/custom-config-settings.rst

  Log Message:
  -----------
  Merge pull request #3163 from ckan/2842-common-config

[#2842] New CKAN config object, decoupled from Pylons


  Commit: 8b3bb459aeae16f4760582f7caeef8f663698098
      https://github.com/ckan/ckan/commit/8b3bb459aeae16f4760582f7caeef8f663698098
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-15 (Fri, 15 Jul 2016)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#3167] Fix q parameter on followee_list

The data_dict for followee_list was validated using
default_follow_user_schema, which didn't have validators for q, so the
 data_dict ended up like:

{'__extras': {'q': u'Environment}, 'id': u'6cdc2a4c-2814-4a29-98f4-'}

Added q to the schema and a couple of tests


  Commit: f3e251c947a2bcd28abfde987d39836857b85a82
      https://github.com/ckan/ckan/commit/f3e251c947a2bcd28abfde987d39836857b85a82
  Author: Ian Ward <ian at excess.org>
  Date:   2016-07-19 (Tue, 19 Jul 2016)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge pull request #3167 from ckan/3167-followee_list-q

`q` parameter in followee_list action has no effect


  Commit: f754749be6a9c661be984fe6f0470880b0baa8c9
      https://github.com/ckan/ckan/commit/f754749be6a9c661be984fe6f0470880b0baa8c9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-07-21 (Thu, 21 Jul 2016)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  Docs, spelling, pep8


  Commit: 40cf640397dae3548b228082194c5e4ce7e62d17
      https://github.com/ckan/ckan/commit/40cf640397dae3548b228082194c5e4ce7e62d17
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-07-22 (Fri, 22 Jul 2016)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Completed pep8 of dictization_functions. Moved validate_flattened into test as its only used there (I checked all projects on github too).


  Commit: 5f4949c924f3a95c59ab4faf0026629804b83f7a
      https://github.com/ckan/ckan/commit/5f4949c924f3a95c59ab4faf0026629804b83f7a
  Author: Ian Ward <ian at excess.org>
  Date:   2016-07-27 (Wed, 27 Jul 2016)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Merge pull request #3171 from ckan/flatten_schema_tidy

Docs, spelling, pep8


  Commit: 52c1cdf4f7a606543e2ee8e0a971d5ce30fbef30
      https://github.com/ckan/ckan/commit/52c1cdf4f7a606543e2ee8e0a971d5ce30fbef30
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-04 (Thu, 04 Aug 2016)

  Changed paths:
    M CHANGELOG.rst
    M bin/running_stats.py
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/common_middleware.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    M ckan/controllers/admin.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    R ckan/controllers/partyline.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    A ckan/lib/io.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/uploader.py
    R ckan/lib/util.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/migration/versions/081_set_datastore_active.py
    M ckan/model/extension.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/pastertemplates/template/+dot+travis.yml_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/less/forms.less
    M ckan/templates/base.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_datapreview.py
    A ckan/tests/lib/test_io.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/model/test_license.py
    M ckan/tests/test_coding_standards.py
    A ckan/tests/test_common.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/multilingual/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/tests/test_view.py
    M doc/conf.py
    M doc/contributing/database-migrations.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/python.rst
    M doc/contributing/string-i18n.rst
    M doc/contributing/unicode.rst
    M doc/extensions/custom-config-settings.rst
    M doc/extensions/translating-extensions.rst
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst
    A doc/maintaining/database-management.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/index.rst
    M doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-source.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/theming/javascript.rst
    M requirements.in
    M requirements.txt
    M test.ini

  Log Message:
  -----------
  Merge branch 'master' into poc-flask-views

Conflicts:
	ckan/common.py
	ckan/config/middleware/__init__.py
	ckan/config/middleware/common_middleware.py
	ckan/config/middleware/flask_app.py
	ckan/config/middleware/pylons_app.py
	ckan/lib/base.py
	ckan/plugins/core.py
	ckan/tests/config/test_middleware.py
	ckan/tests/controllers/test_admin.py
	ckan/tests/controllers/test_api.py
	ckan/tests/controllers/test_feed.py
	ckan/tests/controllers/test_organization.py
	ckan/tests/helpers.py
	ckanext/datapusher/tests/test.py
	ckanext/datastore/tests/test_create.py
	ckanext/datastore/tests/test_upsert.py
	ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
	ckanext/example_igroupform/tests/test_controllers.py
	ckanext/multilingual/plugin.py
	ckanext/resourceproxy/tests/test_proxy.py
	requirements.txt


Compare: https://github.com/ckan/ckan/compare/ba34ce0b0380...52c1cdf4f7a6

• Previous message: [ckan-changes] [ckan/ckan] 868dcb: Only create dataset link on activity stream if eno...
• Next message: [ckan-changes] [ckan/ckan] 05e357: Fix conflict merge
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]