[ckan-changes] [ckan/ckan] 30de08: [#1792] Minor refactoring removing not DRY code

GitHub noreply at github.com
Tue Feb 17 11:32:53 UTC 2015


  Branch: refs/heads/2158-resource-extras
  Home:   https://github.com/ckan/ckan
  Commit: 30de087fc1e97de5d1382991e8b3529f91a929d5
      https://github.com/ckan/ckan/commit/30de087fc1e97de5d1382991e8b3529f91a929d5
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1792] Minor refactoring removing not DRY code


  Commit: 200c8a2d50e9fb7f049b5ed34a06c973c8fd6fac
      https://github.com/ckan/ckan/commit/200c8a2d50e9fb7f049b5ed34a06c973c8fd6fac
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M ckan/lib/helpers.py
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html

  Log Message:
  -----------
  [#1792] Create filters dropdowns when displaying resource view


  Commit: f3765333b96a0cd8eac760aa513a786646437322
      https://github.com/ckan/ckan/commit/f3765333b96a0cd8eac760aa513a786646437322
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

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

  Log Message:
  -----------
  [#1792] Add current filters' dropdowns on load and fix filter removal/change


  Commit: 73380451723f17893626c2278ecba4978831bf36
      https://github.com/ckan/ckan/commit/73380451723f17893626c2278ecba4978831bf36
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

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

  Log Message:
  -----------
  [#1792] Show dropdowns only for columns with filters set


  Commit: 8b56c600516e1ea28959c63a01af34e32407040a
      https://github.com/ckan/ckan/commit/8b56c600516e1ea28959c63a01af34e32407040a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

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

  Log Message:
  -----------
  [#1792] ALlow the user to filter by new columns


  Commit: 0d71de08fb0b16356d6e49e5df23cfdafdf71be0
      https://github.com/ckan/ckan/commit/0d71de08fb0b16356d6e49e5df23cfdafdf71be0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/resource-view.less
    M ckan/templates/package/snippets/resource_view_filters.html

  Log Message:
  -----------
  [#1792] Styling filters


  Commit: 04422ef8695e7157c6318c42bc5d63fd98e49e70
      https://github.com/ckan/ckan/commit/04422ef8695e7157c6318c42bc5d63fd98e49e70
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

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

  Log Message:
  -----------
  [#1792] Allow clearing filters

Unfortunately, select2 require not only setting `allowClear`, but also having a
`placeholder`. As I don't want to have a `placeholder`, I've set it to `' '` as
a workaround.


  Commit: b87b9bb60d0216edad5833008388d9901bde1b0d
      https://github.com/ckan/ckan/commit/b87b9bb60d0216edad5833008388d9901bde1b0d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

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

  Log Message:
  -----------
  [#1792] Set the filters' width using CSS


  Commit: 3e264835eb8f451e3fbf486b219f4f0820048263
      https://github.com/ckan/ckan/commit/3e264835eb8f451e3fbf486b219f4f0820048263
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html

  Log Message:
  -----------
  [#1792] Keep filters persistent when changing across views

The idea is simple. I changed the links for the other resource views of the
same resource to keep the `filters` query string, if it exist. I do this even
for resource views that aren't filterable, so even if you go from resource view
Foo, which is filterable, and set some filters, then move to resource view Bar
which isn't filterable, then to resource view Baz which is filterable, the
filters you've set in Foo are still set when you visit Baz.


  Commit: d764e11484455e7a72fbca382b523e99b33e5409
      https://github.com/ckan/ckan/commit/d764e11484455e7a72fbca382b523e99b33e5409
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

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

  Log Message:
  -----------
  [#1792] Add polyfill for Object.keys() and remove usage of Array.filter

We need this to make sure the code works on older browsers.


  Commit: 8e77d4433c0e3a95e79dcbbb595c3f6d4d7057e3
      https://github.com/ckan/ckan/commit/8e77d4433c0e3a95e79dcbbb595c3f6d4d7057e3
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

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

  Log Message:
  -----------
  [#1792] Minor refactorings


  Commit: 1f859646deedd1cab8041cac512be43ce9321698
      https://github.com/ckan/ckan/commit/1f859646deedd1cab8041cac512be43ce9321698
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M ckan/templates/package/snippets/resource_views_list_item.html

  Log Message:
  -----------
  [#1792] Don't set filters on links when there're no filters


  Commit: 09170d8ad7fec3bc58a2ce6f7cb1ec8e84ae5b22
      https://github.com/ckan/ckan/commit/09170d8ad7fec3bc58a2ce6f7cb1ec8e84ae5b22
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

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

  Log Message:
  -----------
  [#1792] Fix bug where filters weren't appearing


  Commit: 223e1dfaaac880162d6114575723dcc46df93134
      https://github.com/ckan/ckan/commit/223e1dfaaac880162d6114575723dcc46df93134
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

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

  Log Message:
  -----------
  [#1792] Fix bug where we were unable to remove filters

Instead of removing the filters, we were setting them to `undefined`.


  Commit: 43a6fe8719373075b61fc21b07483d6ec7bbaafd
      https://github.com/ckan/ckan/commit/43a6fe8719373075b61fc21b07483d6ec7bbaafd
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M ckan/templates/package/snippets/resource_views_list_item.html

  Log Message:
  -----------
  [#1792] Fix bug where filters weren't persisting

The problem was that I mistyped `current_filter` instead of `current_filters`


  Commit: 4f214847cb2f5ddcb869587d0b1cb73ec5555116
      https://github.com/ckan/ckan/commit/4f214847cb2f5ddcb869587d0b1cb73ec5555116
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/viewhelpers-filters.js
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  [#1792] Pass the filters to iframed resource views

It works simply by passing the `filters` query string to the iframed URL. As
iframed resources don't add JS files outside of the iframe, and we need
`ckan.views.viewhelpers.filters` to create the filters, I needed to move that
core from `ckanext-viewhelpers` to core and load it.

In the future, `ckanext-viewhelpers` will be completely merged into core and
will be removed.


  Commit: 39d9227dc74fc2b92aeda8811eef4e44a759b4b3
      https://github.com/ckan/ckan/commit/39d9227dc74fc2b92aeda8811eef4e44a759b4b3
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M ckanext/reclinepreview/plugin.py

  Log Message:
  -----------
  [#1792] Configure Recline's previews as filterable


  Commit: d47265ea1966f555cbc6e940d2e65fec7826aa7d
      https://github.com/ckan/ckan/commit/d47265ea1966f555cbc6e940d2e65fec7826aa7d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/templates/package/snippets/resource_view_filters.html

  Log Message:
  -----------
  [#1792] Fix bug with fields with more than 5000 values

Before, we tried to load 5000 values for every resource. If the resource had
more records than that, we simply ignored it. This meant the user couldn't add
filters to it anymore.

Now, instead of pre-loading the values, we simply get the field list and use
select2 to search the datastore when the user tries to add a filter. This means
that we now can handle resources of any size.

There're a few problems because `datastore_search` doesn't support returning
only DISTINCT values, so we have to do this on the client. It also messes with
the results in other ways. I created an issue #1815 to add this feature. When
that's done, we can improve this code.


  Commit: f48e6f2806780d8ce1dc0b775bbb391f91445ccc
      https://github.com/ckan/ckan/commit/f48e6f2806780d8ce1dc0b775bbb391f91445ccc
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M ckan/new_tests/logic/action/test_create.py

  Log Message:
  -----------
  Merge branch '1251-resource-view' into 1792-filterable-resource-views


  Commit: e5e0e156faaaf356eebe19a97290c5efe484a84e
      https://github.com/ckan/ckan/commit/e5e0e156faaaf356eebe19a97290c5efe484a84e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/new_tests/logic/action/test_create.py

  Log Message:
  -----------
  [#1792] Add filters to the filterable resource view's schemas

We add filter_fields and filter_values fields to their schema, and also convert
them to a single filters dict, to make it easier for the rest of our code.


  Commit: 49036f3d99ce9a7441af8344ef18befbd38516c0
      https://github.com/ckan/ckan/commit/49036f3d99ce9a7441af8344ef18befbd38516c0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1792] Don't require "title" on resource_view_update

We just require the ResourceView's id.


  Commit: ef42941ecc6af634614be189663d7ae8e0764b38
      https://github.com/ckan/ckan/commit/ef42941ecc6af634614be189663d7ae8e0764b38
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

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

  Log Message:
  -----------
  [#1792] resource_view_update works with filter_fields and filter_values

As added for resource_view_create on e5e0e15, this does the same for
resource_view_update.


  Commit: cc317b3b9d91f067ff8d333ff8f9e963080026cf
      https://github.com/ckan/ckan/commit/cc317b3b9d91f067ff8d333ff8f9e963080026cf
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    A Dockerfile
    M bin/travis-install-dependencies
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    A ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/search/__init__.py
    A ckan/new_tests/lib/search/test_index.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/public/base/less/forms.less
    M ckan/templates/admin/base.html
    A ckan/templates/admin/trash.html
    M ckan/templates/package/new_package_form.html
    R ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/snippets/package_form.html
    R ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/plugin.py
    R ckanext/datastore/bin/__init__.py
    R ckanext/datastore/bin/datastore_setup.py
    R ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    A ckanext/datastore/helpers.py
    A ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/set_permissions.sql
    A ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_interface.py
    A ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    A contrib/docker/apache.conf
    A contrib/docker/apache.wsgi
    A contrib/docker/main.cf
    A contrib/docker/nginx.conf
    A contrib/docker/postgresql/Dockerfile
    A contrib/docker/solr/Dockerfile
    A contrib/docker/solr/schema.xml
    A contrib/docker/svc/ckan/run
    A contrib/docker/svc/nginx/run
    A contrib/docker/svc/postfix/run
    M doc/api/index.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/python.rst
    A doc/images/ckan_importing_diagram.graphml
    A doc/images/ckan_importing_diagram.png
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/install-using-docker.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch '1251-resource-view' into 1792-filterable-resource-views


  Commit: 7511cb01063df379342a5e357bfe2405372ecbc4
      https://github.com/ckan/ckan/commit/7511cb01063df379342a5e357bfe2405372ecbc4
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  [#1792] Don't show filters UI when previewing resource views


  Commit: 85ea7f3bdaba6026f74b93870a6de23346c60d86
      https://github.com/ckan/ckan/commit/85ea7f3bdaba6026f74b93870a6de23346c60d86
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1792] Fix bug where we weren't using the converted data

We were using the data straight from the POST request, and not the converted
data.


  Commit: 5e93512331cbfcd771623388f3fad589b352674a
      https://github.com/ckan/ckan/commit/5e93512331cbfcd771623388f3fad589b352674a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1792] PEP8


  Commit: d937650a733adcf97345daf4be24292e1ebba53d
      https://github.com/ckan/ckan/commit/d937650a733adcf97345daf4be24292e1ebba53d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/resource-view.less
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html

  Log Message:
  -----------
  [#1792] Add filters UI to filterable resource view's manage page

Most of the code was extracted from ckanext-basiccharts and
ckanext-viewhelpers.


  Commit: 179056af57a6c1e013d4ff42040b6995ede48bd4
      https://github.com/ckan/ckan/commit/179056af57a6c1e013d4ff42040b6995ede48bd4
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-filters.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#1792] Move Object.keys() polyfill to its own file

We need it on more than one module, so we move it to its own file and always
load it when IE <= 8, so the other JS files can rely on Object.keys() being
available.


  Commit: 70900c1d4b9d7571258575eef7054ea8389d3fdd
      https://github.com/ckan/ckan/commit/70900c1d4b9d7571258575eef7054ea8389d3fdd
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckan/templates/package/snippets/view_form.html

  Log Message:
  -----------
  [#1792] Add form filters inside a block

This allows extensions to overwrite it if they want.


  Commit: a0cb8494cfaa24dd1706f6c0c6764c2cc44ee6f1
      https://github.com/ckan/ckan/commit/a0cb8494cfaa24dd1706f6c0c6764c2cc44ee6f1
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    R ckan/public/base/javascript/viewhelpers-filters.js
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#1792] Rename ckan.views.viewhelpers.filters -> ckan.views.filters


  Commit: 12739b88c02acb61e47ab7f4192baa6f22b86c0e
      https://github.com/ckan/ckan/commit/12739b88c02acb61e47ab7f4192baa6f22b86c0e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html

  Log Message:
  -----------
  [#1792] str_queryvars is deprecated. Change it to str_GET


  Commit: 2895dacffac9c62c7e7d67a384504310d27848be
      https://github.com/ckan/ckan/commit/2895dacffac9c62c7e7d67a384504310d27848be
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M ckan/public/base/javascript/view-filters.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js

  Log Message:
  -----------
  [#1792] Adds tests for ckan.views.filters


  Commit: 4c9db506954591baf6d46ab4dd59b415d4208283
      https://github.com/ckan/ckan/commit/4c9db506954591baf6d46ab4dd59b415d4208283
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M ckanext/reclinepreview/theme/public/preview_recline.js

  Log Message:
  -----------
  [#1792] Fix ReclinePreviews to use default filters

We were using just the URL's filters, and not the filters configured by the
admins on the manage page. This is fixed now.


  Commit: d0b96fb092a37f71f348b0252ab14ec67b3d1190
      https://github.com/ckan/ckan/commit/d0b96fb092a37f71f348b0252ab14ec67b3d1190
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

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

  Log Message:
  -----------
  [#1792] Get only distinct values from the datastore

This code depends on code from pull request #1815.


  Commit: d93cf29cdd2cfa283d1c36e2241882165b56e8c6
      https://github.com/ckan/ckan/commit/d93cf29cdd2cfa283d1c36e2241882165b56e8c6
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

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

  Log Message:
  -----------
  [#1792] Limit to 20, instead of 100 results

We don't need that many results at once on a selectbox, and getting less means
a faster query and less data to transmit.


  Commit: 7d3cfb2b1bb535c24eeb1dc352eaa912824023a5
      https://github.com/ckan/ckan/commit/7d3cfb2b1bb535c24eeb1dc352eaa912824023a5
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M Dockerfile
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py
    M ckan/tests/functional/api/test_package_search.py
    M ckanext/datastore/db.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py
    M contrib/docker/apache.conf
    M doc/api/index.rst
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  Merge branch 'master' into 1792-filterable-resource-views

Conflicts:
	ckanext/datastore/tests/test_search.py


  Commit: 21e2fc79d541c813af09890e39e1c8929b68448d
      https://github.com/ckan/ckan/commit/21e2fc79d541c813af09890e39e1c8929b68448d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge branch '1838-fts-on-specific-columns' into 1792-filterable-resource-views

Conflicts:
	ckanext/datastore/plugin.py


  Commit: 94c2abf0f52426f4a37d7cf512257ac07980a660
      https://github.com/ckan/ckan/commit/94c2abf0f52426f4a37d7cf512257ac07980a660
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-21 (Mon, 21 Jul 2014)

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

  Log Message:
  -----------
  [#1792] Autocomplete using the specific field, and not all text

For this, we now depend on #1838 being merged before.


  Commit: 2011d7d05b360e506ea8832aa8c1b09c8801872e
      https://github.com/ckan/ckan/commit/2011d7d05b360e506ea8832aa8c1b09c8801872e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-21 (Mon, 21 Jul 2014)

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

  Log Message:
  -----------
  [#1792] Show distinct values on manage view filters' autocomplete


  Commit: 2b37ef98382f869a511074b1f57ae5e2ee7c363e
      https://github.com/ckan/ckan/commit/2b37ef98382f869a511074b1f57ae5e2ee7c363e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-21 (Mon, 21 Jul 2014)

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

  Log Message:
  -----------
  [#1792] Show all values on the dropdown if nothing was written

This is for when the user haven't written anything, just clicked on the
dropdown's arrow. She'll be able to see what are the options for that field.


  Commit: c6739d2652cc4358bb4441cd0c71e8ee967e726d
      https://github.com/ckan/ckan/commit/c6739d2652cc4358bb4441cd0c71e8ee967e726d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-22 (Tue, 22 Jul 2014)

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

  Log Message:
  -----------
  [#1792] Refactoring resource views filters' dropdowns

I've cleaned the detection if there's more data than what's displayed, removed
some useless code toremove repeated values (now we have the DISTINCT
parameter), and made the dropdown at the resource view manage page just load 20
results, the same as the other dropdowns.


  Commit: 86c295b8561198bb333b90fee86e7b1222059fe9
      https://github.com/ckan/ckan/commit/86c295b8561198bb333b90fee86e7b1222059fe9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-07-22 (Tue, 22 Jul 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/new_tests/helpers.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch '1838-fts-on-specific-columns' into 1792-filterable-resource-views

Conflicts:
	ckanext/datastore/plugin.py


  Commit: 6ef5acae5568aca5b770f3dd9413368067c40fd2
      https://github.com/ckan/ckan/commit/6ef5acae5568aca5b770f3dd9413368067c40fd2
  Author: amercader <amercadero at gmail.com>
  Date:   2014-07-23 (Wed, 23 Jul 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/cli.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/migration/versions/072_add_resource_view.py
    M ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/model/user.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/model/test_user.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/read.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/user/edit_user_form.html
    M ckanext/datapusher/logic/action.py
    R ckanext/pdfpreview/__init__.py
    R ckanext/pdfpreview/plugin.py
    R ckanext/pdfpreview/tests/__init__.py
    R ckanext/pdfpreview/tests/test_view.py
    R ckanext/pdfpreview/theme/public/css/pdf.css
    R ckanext/pdfpreview/theme/public/css/recline.css
    R ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfpreview/theme/public/preview_pdf.js
    R ckanext/pdfpreview/theme/public/resource.config
    R ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/pdfview/__init__.py
    A ckanext/pdfview/plugin.py
    A ckanext/pdfview/tests/__init__.py
    A ckanext/pdfview/tests/test_view.py
    A ckanext/pdfview/theme/public/css/pdf.css
    A ckanext/pdfview/theme/public/css/recline.css
    A ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfview/theme/public/pdf_view.js
    A ckanext/pdfview/theme/public/resource.config
    A ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    A ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfview/theme/templates/pdf.html
    R ckanext/reclinepreview/__init__.py
    R ckanext/reclinepreview/plugin.py
    R ckanext/reclinepreview/tests/__init__.py
    R ckanext/reclinepreview/tests/test_view.py
    R ckanext/reclinepreview/theme/public/css/recline.css
    R ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    R ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/resource.config
    R ckanext/reclinepreview/theme/public/vendor/backbone/1.0.0/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/ckan.js/ckan.js
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    R ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    R ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    R ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    R ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    R ckanext/reclinepreview/theme/public/widget.recordcount.js
    R ckanext/reclinepreview/theme/templates/recline_graph_form.html
    R ckanext/reclinepreview/theme/templates/recline_map_form.html
    R ckanext/reclinepreview/theme/templates/recline_view.html
    A ckanext/reclineview/__init__.py
    A ckanext/reclineview/plugin.py
    A ckanext/reclineview/tests/__init__.py
    A ckanext/reclineview/tests/test_view.py
    A ckanext/reclineview/theme/public/css/recline.css
    A ckanext/reclineview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclineview/theme/public/recline_view.js
    A ckanext/reclineview/theme/public/resource.config
    A ckanext/reclineview/theme/public/vendor/backbone/1.0.0/backbone.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/bootstrap.js
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap-responsive.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/css/bootstrap.css
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings-white.png
    A ckanext/reclineview/theme/public/vendor/bootstrap/2.3.2/img/glyphicons-halflings.png
    A ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclineview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclineview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclineview/theme/public/vendor/json/json2.js
    A ckanext/reclineview/theme/public/vendor/json/json2.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    A ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    A ckanext/reclineview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.css
    A ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.js
    A ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    A ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclineview/theme/public/vendor/showdown/20120615/showdown.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowmovemanager.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/plugins/slick.rowselectionmodel.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckanext/reclineview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclineview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/widget.recordcount.js
    A ckanext/reclineview/theme/templates/recline_graph_form.html
    A ckanext/reclineview/theme/templates/recline_map_form.html
    A ckanext/reclineview/theme/templates/recline_view.html
    R ckanext/textpreview/__init__.py
    R ckanext/textpreview/plugin.py
    R ckanext/textpreview/tests/__init__.py
    R ckanext/textpreview/tests/test_view.py
    R ckanext/textpreview/theme/public/LICENSE
    R ckanext/textpreview/theme/public/css/text.css
    R ckanext/textpreview/theme/public/preview_text.js
    R ckanext/textpreview/theme/public/resource.config
    R ckanext/textpreview/theme/public/styles/default.css
    R ckanext/textpreview/theme/public/styles/github.css
    R ckanext/textpreview/theme/public/vendor/highlight.pack.js
    R ckanext/textpreview/theme/templates/text_form.html
    R ckanext/textpreview/theme/templates/text_view.html
    A ckanext/textview/__init__.py
    A ckanext/textview/plugin.py
    A ckanext/textview/tests/__init__.py
    A ckanext/textview/tests/test_view.py
    A ckanext/textview/theme/public/LICENSE
    A ckanext/textview/theme/public/css/text.css
    A ckanext/textview/theme/public/resource.config
    A ckanext/textview/theme/public/styles/default.css
    A ckanext/textview/theme/public/styles/github.css
    A ckanext/textview/theme/public/text_view.js
    A ckanext/textview/theme/public/vendor/highlight.pack.js
    A ckanext/textview/theme/templates/text_form.html
    A ckanext/textview/theme/templates/text_view.html
    M doc/extensions/tutorial.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/theming/templates.rst
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1792-filterable-resource-views


  Commit: b673f48a7fbfce44c6e99826aef7b2868531d8f8
      https://github.com/ckan/ckan/commit/b673f48a7fbfce44c6e99826aef7b2868531d8f8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-04 (Mon, 04 Aug 2014)

  Changed paths:
    M Dockerfile
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/uploader.py
    A ckan/lib/util.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    A ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/new_tests/lib/search/test_index.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/test_coding_standards.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/member_new.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_upsert.py
    A contrib/docker/my_init.d/50_configure
    A contrib/docker/my_init.d/70_initdb
    M contrib/docker/svc/ckan/run
    M doc/api.rst
    M doc/conf.py
    M doc/contributing/i18n.rst
    M doc/contributing/test.rst
    M doc/extensions/adding-custom-fields.rst
    M doc/maintaining/paster.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' into 1792-filterable-resource-views


  Commit: abb030fd86c0852710a78d2b4b4c4dcfe9581fca
      https://github.com/ckan/ckan/commit/abb030fd86c0852710a78d2b4b4c4dcfe9581fca
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-04 (Mon, 04 Aug 2014)

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

  Log Message:
  -----------
  [#1792] Fix bug with autocomplete


  Commit: dab0d74d7d9e9bf5e95365379a40b6e909295b4b
      https://github.com/ckan/ckan/commit/dab0d74d7d9e9bf5e95365379a40b6e909295b4b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-04 (Mon, 04 Aug 2014)

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

  Log Message:
  -----------
  [#1792] Fix bug when parsing filters with numeric values

queryStringToJSON() casts strings with numeric values to numbers, so our code
breaks when trying to call split() on a number. To solve this, we simply cast
all values to strings.


  Commit: 68fe1248370ee1d5bcb2c5d6cb1ec41272d5a747
      https://github.com/ckan/ckan/commit/68fe1248370ee1d5bcb2c5d6cb1ec41272d5a747
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-05 (Tue, 05 Aug 2014)

  Changed paths:
    M ckan/public/base/javascript/view-filters.js
    M ckan/public/base/test/spec/view-filters.spec.js

  Log Message:
  -----------
  [#1792] Fix XSS and bug with numeric/quoted values in filters

The problem is with the function `queryStringToJSON` that we use in
`ckan/public/base/javascript/view-filters.js` to convert the URL's query string
into a JavaScript object to then parse it.

To understand the bug, take a look at this example:

```javascript
> "filters=country:Brazil|year:2014".queryStringToJSON()
Object {filters: "country:Brazil|year:2014"}
> "filters=country:Brazil".queryStringToJSON()
Object {filters: "country:Brazil"}
> "filters=year:2014".queryStringToJSON()
Object {filters: 2014} // The correct result would be { filters: "year:2014" }
```

Looking at `queryStringToJSON` code, I found the problematic part at
https://github.com/ckan/ckan/blob/1792-filterable-resource-views/ckan/public/base/javascript/view-filters.js#L49-L57

```javascript
// ...

// Fix
key = decodeURIComponent(key);
value = decodeURIComponent(value);
try {
  // value can be converted
  value = eval(value);
} catch ( e ) {
  // value is a normal string
}

// ...
```

This code tries to `eval` the query string's values. "Normal" strings throw an
error when eval'd, which the code ignores. But unfortunately `"year:2014"`
isn't a normal string. See:

```javascript
> eval("year:2014")
2014
> year: 2014
2014
> { year: 2014 }
2014
> eval("year:2014|country:Brazil")
SyntaxError: Unexpected token :
> eval("country:Brazil")
ReferenceError: Brazil is not defined
```

We'll have the same problem if the filter value is between quotes, as in:

```javascript
> "filters=country:'Brazil'".queryStringToJSON()
Object {filters: "Brazil"}
```

The XSS issue is related to us calling `eval()` on all parameters, so some
malicious user could send a link to e.g.
`http://demo.ckan.org/?param=alert('abc')` and execute JS code on anyone that
clicks on that. This was discovered in https://github.com/balupton/jquery-sparkle/pull/5


  Commit: e40324a17230f90ee2811d0e401f824327c53bbe
      https://github.com/ckan/ckan/commit/e40324a17230f90ee2811d0e401f824327c53bbe
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1792] Fix issue on FTS' where clause on specific fields

We were adding the value to the where_values with no need. We ended up with
more where_values than "%s" used in the where string, which could lead to
problems.


  Commit: b3e997e05a695cf5ef4bc5d2b8261fe40ede5460
      https://github.com/ckan/ckan/commit/b3e997e05a695cf5ef4bc5d2b8261fe40ede5460
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1792] Small refactoring on the FTS where clause creation

It was easy to miss that we were creating a list with one element.


  Commit: e183eba495cfee6fa491c381ff34356902e5333d
      https://github.com/ckan/ckan/commit/e183eba495cfee6fa491c381ff34356902e5333d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ckan/public/base/javascript/view-filters.js
    M ckan/public/base/test/spec/view-filters.spec.js

  Log Message:
  -----------
  [#1792] Accept filters with colons in their values

For example, "time:12:00" should be recognized as { "time": "12:00" }. I've
also changed the code to use .match() instead of .split() because of a bug in
IE8.


  Commit: 3e850ff05f0e9fa49e0d4b5c8d00dc352181262b
      https://github.com/ckan/ckan/commit/3e850ff05f0e9fa49e0d4b5c8d00dc352181262b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

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

  Log Message:
  -----------
  [#1792] Fix bug with select2 and non-textual filters

select2 requires that the "text" attribute on each autocomplete field is a
string, so we cast to string before sending to it.


  Commit: b4a16d53cfa8963dba4ceac4efd56742b1deb801
      https://github.com/ckan/ckan/commit/b4a16d53cfa8963dba4ceac4efd56742b1deb801
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#1792] Enable FTS on non-textual fields

We need this because our filters' autocomplete use full-text searching. If we
want to allow autocomplete on all fields, we also need to allow FTS on all
fields.


  Commit: aa516301ec455b1d58841147ad3aee78838565ea
      https://github.com/ckan/ckan/commit/aa516301ec455b1d58841147ad3aee78838565ea
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py

  Log Message:
  -----------
  [#1792] Create FTS indexes on fields textual and numeric fields

Unfortunately we couldn't create indexes on other field types as well because I
wasn't able to cast them to text in PostgreSQL using an IMMUTABLE function, so
it would work on the index creation.


  Commit: c033efbb7f660a0ac03eee731a68439580a2d4b9
      https://github.com/ckan/ckan/commit/c033efbb7f660a0ac03eee731a68439580a2d4b9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#1792] Optimize FTS queries on non-indexed fields

As per the commit aa51630, we can't create full-text search indexes on all
field types. Specifically, we're only indexing textual and numeric fields. Even
though we don't index other fields, the users are still able to do FTS queries
on them, and we also use them on the autocomplete, so we'd like them to be
relatively fast.

When creating a datastore table, we add a "_full_text" column with the content
of all the other columns. This is used when the user wants to do a FTS on the
entire resource, regardless of columns.

The idea behind the optimization in this patch is to use that "_full_text"
column to limit the number of rows Postgres will search. While testing, I've
used a sample table with 1 million rows and 540 MB. Among others, it has a
column named "timestamp" with (obviously) a timestamp. There're no indexes on
this column. I've done 2 tests: (a) do a FTS only on the timestamp column, and;
(b) do a FTS on both the timestamp and _full_text columns.

The results below are the average of running the tests 5 times.

(a) Querying for '06' just on the timestamp field took 5682ms;
(b) Querying for '06' both on the _full_text and timestamp fields took 90ms

For this test, querying for both _full_text and timestamp made the query ~63
times faster. Unfortunately, the result depends a lot on the query terms and
the data. On our test data, every timestamp is from 2014. If instead of
searching for '06' we search for '2014', this is what we get (again, repeated 5
times and averaged out):

(a) Querying for '2014' just on the timestamp field took 12455ms;
(a) Querying for '2014' just on the _full_text and timestamp fields took 14534ms;

Using the _full_text field made this query ~17% slower. The problem here is
that this optimization only makes sense if quering the _full_text reduces the
number of rows that we have to query on the timestamp field. When that's not
the case, it makes the query slower.

In my opinion, this patch is still worthy.


  Commit: 0c7c62a5c2726d0a8899130ec1431b7f1bb5565b
      https://github.com/ckan/ckan/commit/0c7c62a5c2726d0a8899130ec1431b7f1bb5565b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_db.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1792] Make the FTS index method configurable

GiST indexes are faster to create and take less memory, but are about 3 times
slower than GIN indexes. Depending on the use-case, one is better than the
other. As we can't foresee all ways CKAN will be used, with this patch we allow
the sysadmin to pick what suits best for her.


  Commit: 3ab51d4e803c0fd8c8482ba928a14cf44efae1a0
      https://github.com/ckan/ckan/commit/3ab51d4e803c0fd8c8482ba928a14cf44efae1a0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-08 (Fri, 08 Aug 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1792] Fix hyperlink on the docs

I forgot the trailing colon.


  Commit: 6fa21da08ff627b87f1a2169e8172d7f3777a975
      https://github.com/ckan/ckan/commit/6fa21da08ff627b87f1a2169e8172d7f3777a975
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#1792] Fix issue when sorting by field with whitespaces


  Commit: ac3fcc748194f9e47dbe542d828c82f371bd5260
      https://github.com/ckan/ckan/commit/ac3fcc748194f9e47dbe542d828c82f371bd5260
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js

  Log Message:
  -----------
  [#1792] Fix bug when filtering fields with ampersands

The issue was that ckan.js didn't escape the data before sending it through
AJAX. It was fixed upstream at
https://github.com/okfn/ckan.js/commit/d0d911692e4517037b9e0d8d71d90751eb58699e


  Commit: 5d96bc508f2ea9fa51a1d58d6b86a47618851be3
      https://github.com/ckan/ckan/commit/5d96bc508f2ea9fa51a1d58d6b86a47618851be3
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_db.py
    M setup.py

  Log Message:
  -----------
  [#1792] Add "datapusher submit" paster command to migrate data

I've changed how we create the datastore resources in this issue, both adding
indexes and changing how the "_full_text" column is created. This means that we
have to migrate existing data when this is merged.

The best way I found to do so was creating a new "paster datapusher submit"
command, which reloads every resource in the datastore, ignoring if the file
haven't changed. This is equivalent to deleting every datastore table and
reloading the resource.

The disadvantage of this is that it'll only work if the source data is still
available, and it'll remove any data that isn't on the source data (that was,
for example, added through the API).


  Commit: 1fb28aec50e94f7c7693c9dc79c9f17ba438ed60
      https://github.com/ckan/ckan/commit/1fb28aec50e94f7c7693c9dc79c9f17ba438ed60
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#1792] Fix get_all_resources_ids_in_datastore() on legacy mode


  Commit: 9529970762612d697c3cb0d7cc87806883b6fcd0
      https://github.com/ckan/ckan/commit/9529970762612d697c3cb0d7cc87806883b6fcd0
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  PEP8 before changes


  Commit: fa707a8bc6ef05e1a0b4028357de131ca11f56ea
      https://github.com/ckan/ckan/commit/fa707a8bc6ef05e1a0b4028357de131ca11f56ea
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M ckan/lib/cli.py
    A ckan/new_tests/lib/test_cli.py

  Log Message:
  -----------
  [#1244] Fix UnicodeEncodeError when adding user.

When using the paster user add command, if a user is added with a
fullname arg that contains non-ascii characters, a UnicodeEncodeError is
raised. This change allows non-ascii characters to be used in the
fullname, providing parity with the web interface.


  Commit: 7f7c33ae096bb4f1f89c84eadcb3eb00a49173a4
      https://github.com/ckan/ckan/commit/7f7c33ae096bb4f1f89c84eadcb3eb00a49173a4
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M ckan/new_tests/lib/test_cli.py

  Log Message:
  -----------
  Fix test for python2.6


  Commit: ff9827a81afa85f023b570b2935232ec12f265a3
      https://github.com/ckan/ckan/commit/ff9827a81afa85f023b570b2935232ec12f265a3
  Author: groundrace <groundrace at me.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M ckanext/multilingual/plugin.py

  Log Message:
  -----------
  added resource and orgs in sidebar translation

added translation support of the organization strings when it's embedded in the package dict, used in the package/read.html and the snippets/organization.html that is included when a package is member of an organization. Furthermore it include a new plugin class for providing translations of the resource dict used in the package/resource_read.html view


  Commit: e3fd93599275c12eac3331ea6fa04e93353de63f
      https://github.com/ckan/ckan/commit/e3fd93599275c12eac3331ea6fa04e93353de63f
  Author: groundrace <groundrace at me.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  added multilingual_resource translation support

Added entry point for the multilingual resource support


  Commit: 466746ffb6c9b074649b8a773e4411cc82242ea4
      https://github.com/ckan/ckan/commit/466746ffb6c9b074649b8a773e4411cc82242ea4
  Author: groundrace <groundrace at me.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  resource_read multilingual support

added multingual support for the embedded package_dict marking explicitelly it in the context to be "for_view"


  Commit: 0d3ae0f65ce2f29282633d6eb4ef2f36173c4358
      https://github.com/ckan/ckan/commit/0d3ae0f65ce2f29282633d6eb4ef2f36173c4358
  Author: Jari Voutilainen <jari.voutilainen at iki.fi>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Do not include datasets in function that dont need them


  Commit: 895306991576ed0ad0a0d5db3fd48ad98512a0df
      https://github.com/ckan/ckan/commit/895306991576ed0ad0a0d5db3fd48ad98512a0df
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M ckan/lib/datapreview.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1852] Remove unused code and add docstrings in datapreview


  Commit: b5e7085b83027f2383e6d48012ebb66b10a1e1e3
      https://github.com/ckan/ckan/commit/b5e7085b83027f2383e6d48012ebb66b10a1e1e3
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M ckan/lib/datapreview.py
    A ckan/new_tests/lib/test_datapreview.py
    R ckan/tests/lib/test_datapreview.py
    M doc/maintaining/configuration.rst
    M setup.py

  Log Message:
  -----------
  [#1852] Add a function to get default views on new resources

The default view types are defined via the `ckan.views.default_views`
configuration option. If this is not set (as opposed to empty, which means
no default views), the value of DEFAULT_RESOURCE_VIEW_TYPES is used to
look up the plugins.

If `get_datastore_views` is False, only the ones not requiring data to be in
the DataStore are returned, and if True, only the ones requiring it are.

To flag a view plugin as requiring the DataStore, it must have the
`requires_datastore` key set to True in the dict returned by its `info()`
method


  Commit: d1516e48594a80d63d167658f7dbf4b61b797b9f
      https://github.com/ckan/ckan/commit/d1516e48594a80d63d167658f7dbf4b61b797b9f
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/new_tests/lib/test_datapreview.py

  Log Message:
  -----------
  [#1852] Create default views on dataset creation and update

Rather than relying on system plugins implementing `after_update` and
`after_create` to create default views, we now call the necessary
functions in `datapreview` to create them depeding on the default views
configuration setting.

The resources on the dataset dict that need to be passed to this
function on `package_create` and `package_update` didn't originally have
the ids, as the commit hadn't take place yet. We now do a flush just
before passing the dicts and add the ids so they can be used to create
the resource views.

There is no need to specifically create the default views on
`resource_create` and `resource_update`, as these call `package_update`
anyway.


  Commit: 337d5df54b63557e446d623c814a4b6a917bef9e
      https://github.com/ckan/ckan/commit/337d5df54b63557e446d623c814a4b6a917bef9e
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M ckanext/imageview/plugin.py
    M ckanext/webpageview/plugin.py
    M setup.py

  Log Message:
  -----------
  [#1852] Update image and web view plugins

Refactor them to work under the new default views behaviour. Basically
remove all `IPackageController` stuff and move the logic to `can_view`
for deciding if a view should be created.


  Commit: d9bf703b4add9fc4d47fb038631166b84d7446b3
      https://github.com/ckan/ckan/commit/d9bf703b4add9fc4d47fb038631166b84d7446b3
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M ckanext/imageview/theme/templates/image_view.html

  Log Message:
  -----------
  [#1852] No need to proxy images when used on a img tag


  Commit: 76969f9fefe4b7f7e4a9afe12fda2b32a5436956
      https://github.com/ckan/ckan/commit/76969f9fefe4b7f7e4a9afe12fda2b32a5436956
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/lib/datapreview.py

  Log Message:
  -----------
  [#1852] Fix typo


  Commit: 3f2fe927764af5db479cfa4996e6bc6c37a453a7
      https://github.com/ckan/ckan/commit/3f2fe927764af5db479cfa4996e6bc6c37a453a7
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/logic/action/get.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#1852] Multiple test fixes

Basically the `image_view` and `webpage_view` are no longer loaded by
default so you need to load them explicitly on your test class if
needed.

Also fixed log warnings and sphinx errors.


  Commit: 87fd74cdc3fec9b3882dca79d3a2d5c21b4ab581
      https://github.com/ckan/ckan/commit/87fd74cdc3fec9b3882dca79d3a2d5c21b4ab581
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    A ckan/new_tests/lib/test_munge.py

  Log Message:
  -----------
  [#2041] Test for munge_filename idempotence


  Commit: 401d9803ebcfe68b908a288b40dc830fc8153961
      https://github.com/ckan/ckan/commit/401d9803ebcfe68b908a288b40dc830fc8153961
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M bin/travis-install-dependencies
    M ckan/config/deployment.ini_tmpl
    M ckan/config/solr/schema.xml
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/exceptions.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/cli.py
    A ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.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/index.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/074_remove_resource_groups.py
    M ckan/model/__init__.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/resource.py
    A ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/dictization/__init__.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/navl/test_dictization_functions.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_config_tool.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/test_conversion.py
    M ckan/new_tests/logic/test_converters.py
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    R ckan/public/base/less/resource-view-embed.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/scripts/application.js
    M ckan/templates/admin/config.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/page.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/user/login.html
    R ckan/tests/functional/test_cors.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_iresourcecontroller/__init__.py
    A ckanext/example_iresourcecontroller/plugin.py
    A ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    A ckanext/example_ivalidators/__init__.py
    A ckanext/example_ivalidators/plugin.py
    A ckanext/example_ivalidators/tests/__init__.py
    A ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/testing.rst
    M doc/extensions/adding-custom-fields.rst
    R doc/extensions/converters.rst
    M doc/extensions/index.rst
    M doc/extensions/tutorial.rst
    M doc/extensions/validators.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/form-integration.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/solr-multicore.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into filterable-resource-views-master #1792

Conflicts:
	ckan/logic/schema.py
	ckan/logic/validators.py
	ckan/new_tests/lib/test_helpers.py
	ckan/public/base/less/ckan.less
	ckan/templates/package/snippets/resource_views_list.html
	ckan/templates/package/snippets/resource_views_list_item.html
	ckanext/datastore/db.py
	ckanext/datastore/helpers.py
	ckanext/datastore/tests/test_helpers.py
	ckanext/datastore/tests/test_search.py


  Commit: 64f632f53069f92115a217228244b89b3c9a551d
      https://github.com/ckan/ckan/commit/64f632f53069f92115a217228244b89b3c9a551d
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#1852] Fix resource view auhtorization functions

The auth functions correctly forward to the relevant `resource_*` ones,
but they were passing the data_dict as is, so `id` referred to the
resource view, not the resource.

Added new auth tests. There is a failing one that depends on #2037


  Commit: 41ad38d7c88f476b256688a306c8723380ff7971
      https://github.com/ckan/ckan/commit/41ad38d7c88f476b256688a306c8723380ff7971
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1852] Move rest of resource views tests from old to new ones


  Commit: 3c298bb91be8f6420c07c1153c4ac88ad7963f80
      https://github.com/ckan/ckan/commit/3c298bb91be8f6420c07c1153c4ac88ad7963f80
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/reclineview/plugin.py

  Log Message:
  -----------
  [#1852] Create default views on end of DataPusher submit

Similarly to d1516e4859, we call the relevant functions on datapreview
to explicitly create the default resource views when the process of
uploading data to the DataStore via the DataPusher ends.

Marked the Recline based plugins as requiring data in the DataStore.

Added tests in ckanext/datapusher


  Commit: eddd090859d16e4c543af9b30664b950bd23254f
      https://github.com/ckan/ckan/commit/eddd090859d16e4c543af9b30664b950bd23254f
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/who.ini
    M ckan/lib/cli.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/new_tests/lib/test_base.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/templates/package/read_base.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/stats/tests/test_stats_plugin.py
    M doc/maintaining/paster.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 2041-munge-filename


  Commit: 1fe0c61492a3e2b7b7e13fbf889d731fe2f74b07
      https://github.com/ckan/ckan/commit/1fe0c61492a3e2b7b7e13fbf889d731fe2f74b07
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  [#2041] PEP8


  Commit: 2b920f067c19db21780eddba50ce4c9db8aae0f8
      https://github.com/ckan/ckan/commit/2b920f067c19db21780eddba50ce4c9db8aae0f8
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/new_tests/lib/test_munge.py
    R ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  [#2041] Move old munge tests to new_tests


  Commit: d4fb0fedc0de357faddbc5132efd4a439f63026e
      https://github.com/ckan/ckan/commit/d4fb0fedc0de357faddbc5132efd4a439f63026e
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  [#2041] Not 'foreign', just non-ascii


  Commit: cb956d2c7cd91b1c39c41234a96bbad708d5a1ab
      https://github.com/ckan/ckan/commit/cb956d2c7cd91b1c39c41234a96bbad708d5a1ab
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckanext/datastore/tests/test_helpers.py

  Log Message:
  -----------
  fix datastore tests


  Commit: 495602265f10fba1b986d41e4d39877b86684cbc
      https://github.com/ckan/ckan/commit/495602265f10fba1b986d41e4d39877b86684cbc
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

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

  Log Message:
  -----------
  [#2041] munge_filename and munge_tag allow hyphens


  Commit: 6f7ab7fec2d1150d8c22fc0fa26f3099d0b61a76
      https://github.com/ckan/ckan/commit/6f7ab7fec2d1150d8c22fc0fa26f3099d0b61a76
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#2041] Remove munge.py from pep8 blacklist


  Commit: 10560baa7524a12b6595df9bbbd0cc125958875e
      https://github.com/ckan/ckan/commit/10560baa7524a12b6595df9bbbd0cc125958875e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  fix merge


  Commit: 31acc951a85906b5d9725ec17db8a0b26ec1d5e9
      https://github.com/ckan/ckan/commit/31acc951a85906b5d9725ec17db8a0b26ec1d5e9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

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

  Log Message:
  -----------
  [#2095] Allow partial update documented for 2 action funcs. Not in docstring to stop it showing over the API where it cannot be set - it is just for internal callers.


  Commit: ec9b0b8a5e575c46b25b12113ccfcfe27cc28835
      https://github.com/ckan/ckan/commit/ec9b0b8a5e575c46b25b12113ccfcfe27cc28835
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ckan/new_tests/lib/test_munge.py

  Log Message:
  -----------
  [#2041] Tweak title to name test


  Commit: df7a1e48444f742322123cc647ef94763f034cd9
      https://github.com/ckan/ckan/commit/df7a1e48444f742322123cc647ef94763f034cd9
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/accept.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    R ckan/lib/field_types.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    A ckan/logic/action/patch.py
    M ckan/logic/auth/create.py
    A ckan/logic/auth/patch.py
    M ckan/logic/converters.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/new_authz.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_patch.py
    M ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/test_authz.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/rating.py
    M ckan/templates/footer.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/package_basic_fields.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/test_stats_plugin.py
    M doc/api/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/paster.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 1852-default-resource-views

Conflicts:
	ckan/new_tests/logic/auth/test_create.py


  Commit: c49708d47cdc03300cb252cd99d918568e40ba3d
      https://github.com/ckan/ckan/commit/c49708d47cdc03300cb252cd99d918568e40ba3d
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.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/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/plugins.py
    R ckan/lib/repoze_patch.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/model/__init__.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/tag.py
    M ckan/model/user.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/new_tests/lib/test_auth_tkt.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/package/read_base.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/plugin.py
    M doc/maintaining/configuration.rst
    M requirements.in
    M requirements.txt
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1852-default-resource-views


  Commit: fe8961d2db4b96c0910d025812bfbc16640b8588
      https://github.com/ckan/ckan/commit/fe8961d2db4b96c0910d025812bfbc16640b8588
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/auth/test_create.py

  Log Message:
  -----------
  [#1852] Fix PEP8 and reenable auth test


  Commit: d982e4c904475733235937c55a022aafe1f5dbbe
      https://github.com/ckan/ckan/commit/d982e4c904475733235937c55a022aafe1f5dbbe
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M ckanext/imageview/tests/test_view.py
    M ckanext/webpageview/tests/test_view.py

  Log Message:
  -----------
  [#1852] Fix tests for image and webpage plugins


  Commit: 67a4e4221ef45b7e2a06e0d00f332c2fb43d11f9
      https://github.com/ckan/ckan/commit/67a4e4221ef45b7e2a06e0d00f332c2fb43d11f9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

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

  Log Message:
  -----------
  [#2095] Fix typo.


  Commit: 670d1bd5a8af72f9a70b93119c84872942855e64
      https://github.com/ckan/ckan/commit/670d1bd5a8af72f9a70b93119c84872942855e64
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

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

  Log Message:
  -----------
  [#2095] Fix another typo.


  Commit: 32f40c9eaeb7cd4f668931c1089bfc5889e74e8a
      https://github.com/ckan/ckan/commit/32f40c9eaeb7cd4f668931c1089bfc5889e74e8a
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  resourceproxy controller gets max_file_size from config or defaults to 1MB


  Commit: bf6859f0a60b5b5998aa524e59fb58181b8f6031
      https://github.com/ckan/ckan/commit/bf6859f0a60b5b5998aa524e59fb58181b8f6031
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  added resource_proxy max_file_size to config template


  Commit: 3a9ee14902d13fe7b32e8689d6ada411cc710a7f
      https://github.com/ckan/ckan/commit/3a9ee14902d13fe7b32e8689d6ada411cc710a7f
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Updated docs, explain new config setting ckan.resource_proxy.max_file_size


  Commit: 3897c3fb40c42e5aee2aeda8543dd669988bde2c
      https://github.com/ckan/ckan/commit/3897c3fb40c42e5aee2aeda8543dd669988bde2c
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Updated docs, explained fallback behaviour.


  Commit: 5e7bf19845af742083d44a66c0caac811c573426
      https://github.com/ckan/ckan/commit/5e7bf19845af742083d44a66c0caac811c573426
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  reindented lines to satisfy pep8


  Commit: ca8d5f84cdb47f21264b705a605078717ef83edc
      https://github.com/ckan/ckan/commit/ca8d5f84cdb47f21264b705a605078717ef83edc
  Author: Florian Mayer <Florian.Mayer at dpaw.wa.gov.au>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  added ckanext/datastore/set_permissions.sql template to manifest


  Commit: 133f65e911b2c71b7d3c12f7afef38e96c262c5f
      https://github.com/ckan/ckan/commit/133f65e911b2c71b7d3c12f7afef38e96c262c5f
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M ckan/public/base/vendor/bootstrap/less/navbar.less

  Log Message:
  -----------
  [#2101] Fix bootstrap compiling with less 2.x+


  Commit: baa2b81c7cc622e9feca9c74527a443720889d75
      https://github.com/ckan/ckan/commit/baa2b81c7cc622e9feca9c74527a443720889d75
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckanext/imageview/plugin.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#1852] Allow some views to be always available

Some views like the image and website one were always available as an
option when creating a new view against a resource. With the new
handling of default views this was no longer possible, so to support
this use case a new `always_available` key has been added to the plugin
info.


  Commit: 1597a4d5ca989b9265bad09eb18cf5ef724a7096
      https://github.com/ckan/ckan/commit/1597a4d5ca989b9265bad09eb18cf5ef724a7096
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    A ckan/migration/versions/075_rename_view_plugins.py
    M ckanext/imageview/plugin.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#1852] Rename image and webapage views

Add the _view suffix to be consistent with the plugin name.


  Commit: 0e5bab83a91a69f4aebe49c1f5f6fab4568575e7
      https://github.com/ckan/ckan/commit/0e5bab83a91a69f4aebe49c1f5f6fab4568575e7
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#1852] Set default titles for core view plugins


  Commit: 21e8204fbd3d1042ad3a622b75c70658658315de
      https://github.com/ckan/ckan/commit/21e8204fbd3d1042ad3a622b75c70658658315de
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/plugins/interfaces.py
    M ckanext/webpageview/tests/test_view.py

  Log Message:
  -----------
  [#1852] Update plugin names after 1597a4d


  Commit: b62445079d0a212cde083dd7f57f5ef3c403fcec
      https://github.com/ckan/ckan/commit/b62445079d0a212cde083dd7f57f5ef3c403fcec
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Adds auth for vocabulary_list and vocabulary_show.

Fixes #2104, with other relevant detail at #2128


  Commit: 142aa1f21d8204eb16ac2483e5fbbee78767c022
      https://github.com/ckan/ckan/commit/142aa1f21d8204eb16ac2483e5fbbee78767c022
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M ckan/public/base/vendor/bootstrap/less/navbar.less

  Log Message:
  -----------
  [#2101] Revert previous commit.

This reverts commit 133f65e911b2c71b7d3c12f7afef38e96c262c5f. [#2101]
Fix bootstrap compiling with less 2.x+


  Commit: a58be4b867fb2e681faf721e3165f96abcca3387
      https://github.com/ckan/ckan/commit/a58be4b867fb2e681faf721e3165f96abcca3387
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M doc/contributing/frontend/index.rst

  Log Message:
  -----------
  [#2101] Specify less version 1.7.5 in docs.

The version of bootstrap CKAN currently uses doesn't compile with
versions of less above 1.7.5, so specify this less version in the
frontend contribution docs.


  Commit: 6194b5cb32ab2eb0943ce8a03762208de7e63bf9
      https://github.com/ckan/ckan/commit/6194b5cb32ab2eb0943ce8a03762208de7e63bf9
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-09 (Tue, 09 Dec 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/activity.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/pastertemplates/template/ckanext/__init__.py
    M ckan/plugins/core.py
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/related.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/textview/theme/public/css/text.css

  Log Message:
  -----------
  Merge branch 'master' into 1852-default-resource-views

Conflicts:
	ckan/new_tests/logic/action/test_get.py


  Commit: d49fad4afa3728855ddec994f46632cfe8570088
      https://github.com/ckan/ckan/commit/d49fad4afa3728855ddec994f46632cfe8570088
  Author: EnxEng <vin.schiano.eng at gmail.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M ckan/templates/user/new_user_form.html

  Log Message:
  -----------
  2138-palceholders-not-transatable 

Really quick fix


  Commit: 98e600b67722e658c79983b4f64a54aa2e4cfa3e
      https://github.com/ckan/ckan/commit/98e600b67722e658c79983b4f64a54aa2e4cfa3e
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/new_tests/controllers/test_package.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M doc/contributing/upgrading-dependencies.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 1852-default-resource-views


  Commit: decb4e69a7888276a53b1890705fff2f38edd4b7
      https://github.com/ckan/ckan/commit/decb4e69a7888276a53b1890705fff2f38edd4b7
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  Show Upload Log even when the job has errored

Show the datapusher Upload Log on the resource_data page even when the
datapusher job has errored.


  Commit: 9a05dbcf9cce6d92f16abe067f0572d946cf3e03
      https://github.com/ckan/ckan/commit/9a05dbcf9cce6d92f16abe067f0572d946cf3e03
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  Use the string error message from datapusher error dicts

Rather than showing the whole dict as a string.


  Commit: 9ff14ece784a52b6b37e408c91cbc5364acda4df
      https://github.com/ckan/ckan/commit/9ff14ece784a52b6b37e408c91cbc5364acda4df
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  Display all keys from datapusher job errors

The "error" dicts in CKAN Service Provider job dicts always contain a
"message" key with a string error message, but may also contain any
other keys (depending on the type of error) - show those other keys on
the resource data page as well.


  Commit: 4e6e7b8d12aca81e1e98ef959726918109030704
      https://github.com/ckan/ckan/commit/4e6e7b8d12aca81e1e98ef959726918109030704
  Author: george <george.sattler at xvt.com.au>
  Date:   2014-12-14 (Sun, 14 Dec 2014)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1980] With this change, when a user tries to register with a username containing non-alphanumeric characters, they will no longer see 'Url' mentioned in the error.


  Commit: 5bb7433fb3eaaa0de8e7761ebcc39c3957fe3309
      https://github.com/ckan/ckan/commit/5bb7433fb3eaaa0de8e7761ebcc39c3957fe3309
  Author: george <george.sattler at xvt.com.au>
  Date:   2014-12-14 (Sun, 14 Dec 2014)

  Changed paths:
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/schema/test_schema.py

  Log Message:
  -----------
  minor modification to tests because they attemped to match strings containing the 'Url' part that was removed from validation


  Commit: 6b5b397973191fad409cdca9b469e9012defb726
      https://github.com/ckan/ckan/commit/6b5b397973191fad409cdca9b469e9012defb726
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckan/lib/datapreview.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#1852] Remove web view from defaults, fix docs


  Commit: dd4d33d874e63711b6b8a33e1b45d3ab4eb53783
      https://github.com/ckan/ckan/commit/dd4d33d874e63711b6b8a33e1b45d3ab4eb53783
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py

  Log Message:
  -----------
  Improve DataStore's error message on invalid data

When adding data to the datastore it may come across an invalid data value
(e.g. a non-numeric string, when the column has a numeric type).

Sqlalchemy will raise its DataError. Catch this and raise a custom
InvalidDataError. The datastore_create() action then catches this and raises
toolkit.ValidationError which ends up returning an error dict to the API
caller.

I'm not sure if this commit covers all cases - e.g. create vs updating a
datastore resource.


  Commit: 75957ff72fb60538ff0b4e0dd222135729d58abe
      https://github.com/ckan/ckan/commit/75957ff72fb60538ff0b4e0dd222135729d58abe
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Change a DataStore error message

Make it a little more human-friendly


  Commit: 61faa2761a3e45af6a63dd82b087d6c59889dc3e
      https://github.com/ckan/ckan/commit/61faa2761a3e45af6a63dd82b087d6c59889dc3e
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  PEP8


  Commit: af8b6376b2179fd0f07e62c201fa9c830fc69a14
      https://github.com/ckan/ckan/commit/af8b6376b2179fd0f07e62c201fa9c830fc69a14
  Author: Ilja <ilja.pyykkonen at gofore.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

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

  Log Message:
  -----------
  Fix organization pagination sort value


  Commit: aed7fff35a155e714889bfca5b98265fd2f65208
      https://github.com/ckan/ckan/commit/aed7fff35a155e714889bfca5b98265fd2f65208
  Author: amercader <amercadero at gmail.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/user.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_user.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py
    R doc/_themes/sphinx-theme-okfn
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst

  Log Message:
  -----------
  Merge branch 'master' into 1852-default-resource-views


  Commit: 4880ff9f3dbed8c1369d86c43b1d1c856b967c61
      https://github.com/ckan/ckan/commit/4880ff9f3dbed8c1369d86c43b1d1c856b967c61
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Improved comment.


  Commit: ad4bb6ad35462ef07d68d19f4c65fecad87532c0
      https://github.com/ckan/ckan/commit/ad4bb6ad35462ef07d68d19f4c65fecad87532c0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/maintain.py
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#2162] Remove repetitive debug logging.


  Commit: b80d87ca0b4989032893b6358bc9ef649ef85013
      https://github.com/ckan/ckan/commit/b80d87ca0b4989032893b6358bc9ef649ef85013
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#2165] Only one log message now on check_access.


  Commit: b97e74a394eaa136855bc20df4b469b854a8cde6
      https://github.com/ckan/ckan/commit/b97e74a394eaa136855bc20df4b469b854a8cde6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#2162] Remove logging of cache-control.


  Commit: 2211c2f4a1fa756c5235bde373aeb791c83de496
      https://github.com/ckan/ckan/commit/2211c2f4a1fa756c5235bde373aeb791c83de496
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

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

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/ilja-dev/ckan into ilja-dev-master


  Commit: b375135a5a0be83d3df1e6e86e66552a6b7c7903
      https://github.com/ckan/ckan/commit/b375135a5a0be83d3df1e6e86e66552a6b7c7903
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/new_tests/controllers/test_group.py

  Log Message:
  -----------
  [#2141] Add test.


  Commit: 820a5b9052c3884c03463ff5cb8106c6210b2ea8
      https://github.com/ckan/ckan/commit/820a5b9052c3884c03463ff5cb8106c6210b2ea8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/new_tests/controllers/test_group.py
    M ckan/templates/organization/index.html

  Log Message:
  -----------
  Merge branch 'ilja-dev-master'


  Commit: 52ab5be536d7faa2884d023208d0d6651330ba3f
      https://github.com/ckan/ckan/commit/52ab5be536d7faa2884d023208d0d6651330ba3f
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Merge pull request #2160 from ckan/auth-audit-comment

Improved Auth Audit comment


  Commit: 49aae6073297fbd6b2068430413c00e435345600
      https://github.com/ckan/ckan/commit/49aae6073297fbd6b2068430413c00e435345600
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/logic/__init__.py
    A ckan/new_tests/controllers/test_api.py
    M ckan/new_tests/logic/action/test_delete.py

  Log Message:
  -----------
  [#2165] Cope with unicode in the NotAuthorized message. Document existing unicode behaviour with tests.


  Commit: 99f9c039d6f38c4b5e01d88c8a4e162de26bc8dd
      https://github.com/ckan/ckan/commit/99f9c039d6f38c4b5e01d88c8a4e162de26bc8dd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/new_tests/logic/action/test_delete.py

  Log Message:
  -----------
  [#2165] PEP8.


  Commit: 94129ae80878549eb7f172646ffb52dc28d03809
      https://github.com/ckan/ckan/commit/94129ae80878549eb7f172646ffb52dc28d03809
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#2167] Remove ActionError.extra_msg.


  Commit: 735967fda6da41f50803e9fb9bdf5d8f66e8b20e
      https://github.com/ckan/ckan/commit/735967fda6da41f50803e9fb9bdf5d8f66e8b20e
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-12-29 (Mon, 29 Dec 2014)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Fixes broken test on master when celery is installed.

It appears that test_40_task_resource_status was never run if you do not
have celery installed, and so didn't show up on travis.  The fix was to
install celery, and to wrap the 'resource_status_show' with the correct
url as a string.  This threw up another problem in that the results from
the resource status check did not match what the tests assumed they did.

Either this has changed since it last caused a problem for someone, or
it has been hidden for a very long time by the SkipTest :(


  Commit: 5b383a33e58a8b24fa84efc84785903bddd52cfa
      https://github.com/ckan/ckan/commit/5b383a33e58a8b24fa84efc84785903bddd52cfa
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-30 (Tue, 30 Dec 2014)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#2170] Fix tests to not worry about order.


  Commit: 087d1677e03c7d7e7c63e5a7d12c7ae60878b30e
      https://github.com/ckan/ckan/commit/087d1677e03c7d7e7c63e5a7d12c7ae60878b30e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-30 (Tue, 30 Dec 2014)

  Changed paths:
    M ckanext/multilingual/plugin.py

  Log Message:
  -----------
  [#2171] Replace deprecated "sets" with modern "set".


  Commit: 9a1b8106ec6b98389e36f2260c8495d0cd4e7c2c
      https://github.com/ckan/ckan/commit/9a1b8106ec6b98389e36f2260c8495d0cd4e7c2c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-30 (Tue, 30 Dec 2014)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge pull request #2169 from ckan/fix-skipped-travis-test-for-help

Fixes broken test on master when celery is installed.


  Commit: 858780924d9cb1c7272c46b764655c023e9f8902
      https://github.com/ckan/ckan/commit/858780924d9cb1c7272c46b764655c023e9f8902
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-30 (Tue, 30 Dec 2014)

  Changed paths:
    M doc/contributing/test.rst

  Log Message:
  -----------
  Update IE versions to test against.


  Commit: 8efa0ce793159ab35239a56ac7d263820c4cd761
      https://github.com/ckan/ckan/commit/8efa0ce793159ab35239a56ac7d263820c4cd761
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-30 (Tue, 30 Dec 2014)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#2175] Validate package_show when using a custom schema.


  Commit: 6024ac3cceb0184a3f49e68304d4fcb782b8b48c
      https://github.com/ckan/ckan/commit/6024ac3cceb0184a3f49e68304d4fcb782b8b48c
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2014-12-31 (Wed, 31 Dec 2014)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Merge pull request #2168 from ckan/2167-remove-extra_msg

[#2167] Remove ActionError.extra_msg.


  Commit: d1bdbfe27b7d41ffd7990cfb2c3307bb246abbc5
      https://github.com/ckan/ckan/commit/d1bdbfe27b7d41ffd7990cfb2c3307bb246abbc5
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2014-12-31 (Wed, 31 Dec 2014)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge pull request #2173 from ckan/2170-translation-tests-orderless

[#2170] Fix tests to not worry about order.


  Commit: 3b7a8447eb0c1280b1f38d11211570de6b484385
      https://github.com/ckan/ckan/commit/3b7a8447eb0c1280b1f38d11211570de6b484385
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2014-12-31 (Wed, 31 Dec 2014)

  Changed paths:
    M ckanext/multilingual/plugin.py

  Log Message:
  -----------
  Merge pull request #2172 from ckan/2171-deprecated-sets

[#2171] Replace deprecated "sets" with modern "set".


  Commit: 40a4befc7cb68ad621558e6bb2c70621afffc0cd
      https://github.com/ckan/ckan/commit/40a4befc7cb68ad621558e6bb2c70621afffc0cd
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2014-12-31 (Wed, 31 Dec 2014)

  Changed paths:
    M ckan/lib/base.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/maintain.py
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Merge pull request #2163 from ckan/2162-tidy-log

[#2162] Remove repetitive debug logging.


  Commit: d8b5956153b2049e2568fe605a0ef00c4a83ac1b
      https://github.com/ckan/ckan/commit/d8b5956153b2049e2568fe605a0ef00c4a83ac1b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-31 (Wed, 31 Dec 2014)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#2167] Fix DeprecationWarning: BaseException.message


  Commit: 8520ca96c9f5ec6edc5d661d13baec447046a4a4
      https://github.com/ckan/ckan/commit/8520ca96c9f5ec6edc5d661d13baec447046a4a4
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2014-12-31 (Wed, 31 Dec 2014)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  Merge pull request #2178 from ckan/2167-remove-extra_msg

[#2167] Fix DeprecationWarning: BaseException.message


  Commit: 0e72f177699dd0339f180a368f10b71d8b7dc0db
      https://github.com/ckan/ckan/commit/0e72f177699dd0339f180a368f10b71d8b7dc0db
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2014-12-31 (Wed, 31 Dec 2014)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    A ckan/new_tests/controllers/test_api.py
    M ckan/new_tests/logic/action/test_delete.py

  Log Message:
  -----------
  Merge pull request #2166 from ckan/2165-check-access-log

[#2165] Only one log message now on check_access.


  Commit: cc79960a58fbe75471180056a8145de716360926
      https://github.com/ckan/ckan/commit/cc79960a58fbe75471180056a8145de716360926
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-12-31 (Wed, 31 Dec 2014)

  Changed paths:
    M ckan/templates/package/snippets/resources_list.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py

  Log Message:
  -----------
  [#2180] Tests for IDatasetForm. Includes fix for bug in package template when there are 0 resources (although at least 1 is required by default).


  Commit: 3d9b303206aedb1a6dca770c21f7051dc8db3856
      https://github.com/ckan/ckan/commit/3d9b303206aedb1a6dca770c21f7051dc8db3856
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.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/fanstatic_resources.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    A ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    A 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/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_api.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/test_auth_tkt.py
    M ckan/new_tests/lib/test_base.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_patch.py
    M ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/test_authz.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    R ckan/rating.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/read_base.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_user.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/plugin.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/theme/public/css/text.css
    R doc/_themes/sphinx-theme-okfn
    M doc/api/index.rst
    M doc/contributing/upgrading-dependencies.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M requirements.in
    M requirements.txt
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into filterable-resource-views-master-2


  Commit: b4fed7f2e975ea1aac8c9cd8be4cc1ab3dfe6b63
      https://github.com/ckan/ckan/commit/b4fed7f2e975ea1aac8c9cd8be4cc1ab3dfe6b63
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M doc/contributing/frontend/index.rst

  Log Message:
  -----------
  Merge branch '2101-less-bootstrap'


  Commit: 590e18fd0d538613e3a2d38c4b2eae936c30ad5e
      https://github.com/ckan/ckan/commit/590e18fd0d538613e3a2d38c4b2eae936c30ad5e
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/schema/test_schema.py

  Log Message:
  -----------
  Merge branch '1980-clearer-error-message-for-username'


  Commit: 304fe50c84a4979f2b709ba7ae2f9f01e86bb12e
      https://github.com/ckan/ckan/commit/304fe50c84a4979f2b709ba7ae2f9f01e86bb12e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-06 (Tue, 06 Jan 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_update.py
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M doc/maintaining/configuration.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '1792-filterable-resource-views'


  Commit: 7fb017a551a9616be8ace3db7f48ca7019254825
      https://github.com/ckan/ckan/commit/7fb017a551a9616be8ace3db7f48ca7019254825
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-01-06 (Tue, 06 Jan 2015)

  Changed paths:
    M doc/contributing/test.rst

  Log Message:
  -----------
  Merge pull request #2174 from ckan/ie-versions

Update IE versions to test against.


  Commit: 093a168a761b3b47ad90b5229958faa4c26714d8
      https://github.com/ckan/ckan/commit/093a168a761b3b47ad90b5229958faa4c26714d8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/templates/group/snippets/info.html
    M ckan/templates/package/read.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  [#2188] Do not allow public to view deleted groups. Show in template when pkg/group/org is deleted.


  Commit: 12ccd3f7c872b48205ebff5c1c0e883d49e57725
      https://github.com/ckan/ckan/commit/12ccd3f7c872b48205ebff5c1c0e883d49e57725
  Author: Matthew Moore <matt at edward>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Added commands for removing nginx and apache default sites


  Commit: 2a5164d8b8e1571773ef3d22a1bca2315861b4f9
      https://github.com/ckan/ckan/commit/2a5164d8b8e1571773ef3d22a1bca2315861b4f9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  [#2188] Fix test


  Commit: 4a64545f1f0c4f12ed0d1a3d72468a7aef776626
      https://github.com/ckan/ckan/commit/4a64545f1f0c4f12ed0d1a3d72468a7aef776626
  Author: jqnatividad <joel.natividad at ontodia.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [#2194] Fixes NameError for related page number handling

Fixes #2194


  Commit: ff60dbc856e97f62930a62643f9caaeb1b41213a
      https://github.com/ckan/ckan/commit/ff60dbc856e97f62930a62643f9caaeb1b41213a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/new_tests/controllers/test_api.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_update.py
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/organization/index.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/schema/test_schema.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/multilingual/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M doc/contributing/frontend/index.rst
    M doc/contributing/test.rst
    M doc/maintaining/configuration.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1852-default-resource-views

Conflicts:
	ckan/new_tests/logic/action/test_delete.py
	ckan/new_tests/logic/action/test_update.py
	ckanext/reclineview/plugin.py


  Commit: 2da53f76d2f61b9c2a6e2ebddad707967f643e8e
      https://github.com/ckan/ckan/commit/2da53f76d2f61b9c2a6e2ebddad707967f643e8e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#1852] Fix sphinx errors, add temp notice


  Commit: 09b0b5b07c2385e0d57006a3e8e56c37abf33f75
      https://github.com/ckan/ckan/commit/09b0b5b07c2385e0d57006a3e8e56c37abf33f75
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  Merge pull request #2195 from jqnatividad/2194-related-invalid-page-numbers

[#2194] Fixes NameError for related page number handling


  Commit: e91b70ac187c6a1eb74b53779785e9d41245fc40
      https://github.com/ckan/ckan/commit/e91b70ac187c6a1eb74b53779785e9d41245fc40
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

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

  Log Message:
  -----------
  [#1852] Fix merge error that was causing failures


  Commit: 54a0bb912c72b87d56288981397c03c62f1b38e1
      https://github.com/ckan/ckan/commit/54a0bb912c72b87d56288981397c03c62f1b38e1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

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

  Log Message:
  -----------
  [#1852] Fix PEP8


  Commit: 2052628c4a450078d58fb26bd6dc239f3cc68c3e
      https://github.com/ckan/ckan/commit/2052628c4a450078d58fb26bd6dc239f3cc68c3e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/075_rename_view_plugins.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/logic/test_action.py
    M ckanext/datapusher/logic/action.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/reclineview/plugin.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '1852-default-resource-views'


  Commit: 8ef77ae4e4f0335c8151700e7bdd55e51804dfe1
      https://github.com/ckan/ckan/commit/8ef77ae4e4f0335c8151700e7bdd55e51804dfe1
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#2207] package_show: exclude tracking summary by default


  Commit: 4619800f9790d8bd4e3872653753c932f5e7c5a2
      https://github.com/ckan/ckan/commit/4619800f9790d8bd4e3872653753c932f5e7c5a2
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#2207] fix most tests, add include_tracking to resource_show


  Commit: 27bbda1ddc317f2a96e76098e33986d94cb701f4
      https://github.com/ckan/ckan/commit/27bbda1ddc317f2a96e76098e33986d94cb701f4
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py

  Log Message:
  -----------
  [#2207] solr always needs tracking info


  Commit: 43379b14b4687ca788b463e16702b9dd07104c4b
      https://github.com/ckan/ckan/commit/43379b14b4687ca788b463e16702b9dd07104c4b
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  [#2208] fix test for #1764 regression


  Commit: 573d6f146f323a863bd7a091ad95654eb7f94265
      https://github.com/ckan/ckan/commit/573d6f146f323a863bd7a091ad95654eb7f94265
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  [#2208] separately test both regressions, fix indexing


  Commit: 4e537fbf1955b589c9ef4904ce149faf2c076824
      https://github.com/ckan/ckan/commit/4e537fbf1955b589c9ef4904ce149faf2c076824
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ckan/lib/munge.py
    A ckan/new_tests/lib/test_munge.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '2041-munge-filename'


  Commit: 0c167cb760c550b48f62ac0e9f78a7b7a2c0bb97
      https://github.com/ckan/ckan/commit/0c167cb760c550b48f62ac0e9f78a7b7a2c0bb97
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2095-allow-partial-update-docs'


  Commit: 34b6a16dbba627bbba1f4e036d478d7250e00541
      https://github.com/ckan/ckan/commit/34b6a16dbba627bbba1f4e036d478d7250e00541
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/resourceproxy/controller.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'ideas-31-resourceproxy-max-file-size-configurable'


  Commit: c49fffc3936d6558b94f96ffd8e3ee39161ea158
      https://github.com/ckan/ckan/commit/c49fffc3936d6558b94f96ffd8e3ee39161ea158
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/templates/package/new_view.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/view_form.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  MERGE from brew:2140-resource-views


  Commit: c91fba82a53c4271f4ec583f4f7793772e1fa7f1
      https://github.com/ckan/ckan/commit/c91fba82a53c4271f4ec583f4f7793772e1fa7f1
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/templates/package/new_view.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/view_form.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  Merge branch 'brew-2140-resource-views'


  Commit: 290850554bfff7e22e8cd0410074eb41b68b3563
      https://github.com/ckan/ckan/commit/290850554bfff7e22e8cd0410074eb41b68b3563
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  Support error message from older datapusher versions


  Commit: 910717be664c7e20c189d89ce659a7ccb7926614
      https://github.com/ckan/ckan/commit/910717be664c7e20c189d89ce659a7ccb7926614
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/templates/package/snippets/additional_info.html

  Log Message:
  -----------
  [#2107] Don't create a source link if not a valid url


  Commit: 59975ba0a23cd26bc72c096bdbe381feb34ea3b5
      https://github.com/ckan/ckan/commit/59975ba0a23cd26bc72c096bdbe381feb34ea3b5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Add another common example to error message

Inserting a value with a different type from the field one is a common
error, so hopefully this will give more clues (see #1964, #1963)


  Commit: a08e39423c4128d968976ecbd3682ab03d44217c
      https://github.com/ckan/ckan/commit/a08e39423c4128d968976ecbd3682ab03d44217c
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#2212] Fix normal user's resource view.

Pass resource_id to resource_view_create access check.


  Commit: ae920930e447ea4d287852beaaeabca7da756444
      https://github.com/ckan/ckan/commit/ae920930e447ea4d287852beaaeabca7da756444
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_package.py

  Log Message:
  -----------
  [#2212] Test all user types can view resource page


  Commit: 8cb3133033f11ea3845b299a89e7846bc675d895
      https://github.com/ckan/ckan/commit/8cb3133033f11ea3845b299a89e7846bc675d895
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/templates/group/snippets/info.html
    M ckan/templates/package/read.html
    M ckan/templates/snippets/organization.html
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Merge pull request #2190 from ckan/2188-deleted-groups-visible

[#2188] Do not allow public to view deleted groups.


  Commit: 9bf0300c76d6439d84c5f77af5d40c929179ce01
      https://github.com/ckan/ckan/commit/9bf0300c76d6439d84c5f77af5d40c929179ce01
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_package.py
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch '2212-resourceid-check' of https://github.com/brew/ckan into brew-2212-resourceid-check


  Commit: b8eaea0d8e13774b37c9ce1661438bc59a9e54ec
      https://github.com/ckan/ckan/commit/b8eaea0d8e13774b37c9ce1661438bc59a9e54ec
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_package.py
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'brew-2212-resourceid-check'


  Commit: 842d9dd6552aeed7e86c2066368a35e5cd5f3c58
      https://github.com/ckan/ckan/commit/842d9dd6552aeed7e86c2066368a35e5cd5f3c58
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '2104-vocab-auth'


  Commit: cfc4066e2cc31fc40456b309950db6e56f8c51a9
      https://github.com/ckan/ckan/commit/cfc4066e2cc31fc40456b309950db6e56f8c51a9
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/templates/user/new_user_form.html

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/EnxEng/ckan into EnxEng-master


  Commit: f7e13a3f6b81d1a4789c4630bf0fe73f275132ea
      https://github.com/ckan/ckan/commit/f7e13a3f6b81d1a4789c4630bf0fe73f275132ea
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/templates/user/new_user_form.html

  Log Message:
  -----------
  Merge branch 'EnxEng-master'


  Commit: fdb8eab08f9c0022a6cc65074cb26e4df31472c5
      https://github.com/ckan/ckan/commit/fdb8eab08f9c0022a6cc65074cb26e4df31472c5
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/templates/package/snippets/additional_info.html

  Log Message:
  -----------
  Merge pull request #2107 from ckan/2107-linkify-source-field

Source field linkifies even if not a URI scheme


  Commit: e9e56ddf44d22f63c1eb4667f1a4f4efc0541215
      https://github.com/ckan/ckan/commit/e9e56ddf44d22f63c1eb4667f1a4f4efc0541215
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2175-package-show-validate-custom-schema'


  Commit: 7dac7f5ea9cfd28c1094cb6352b5f2061ec02908
      https://github.com/ckan/ckan/commit/7dac7f5ea9cfd28c1094cb6352b5f2061ec02908
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/templates/package/snippets/resources_list.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/2180-idataset-form-functional-tests'


  Commit: a340a0424672a3289ab3513d17e20f53ae3e5476
      https://github.com/ckan/ckan/commit/a340a0424672a3289ab3513d17e20f53ae3e5476
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  [#2197] Remove redundant less import


  Commit: 3d0634a08ba44bf66b057c048484798b33f9900c
      https://github.com/ckan/ckan/commit/3d0634a08ba44bf66b057c048484798b33f9900c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/075_rename_view_plugins.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_api.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    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/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/frontend/index.rst
    M doc/contributing/test.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into improve-datapusher-error-messages

Conflicts:
	ckanext/datastore/tests/test_db.py


  Commit: 68dba74b7f06d4c9f250b7a7bf3188e90be881a0
      https://github.com/ckan/ckan/commit/68dba74b7f06d4c9f250b7a7bf3188e90be881a0
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/templates/package/resource_data.html
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py

  Log Message:
  -----------
  Merge branch 'improve-datapusher-error-messages'


  Commit: ba235180d41a5edaab97287efd5a5a177ca7b983
      https://github.com/ckan/ckan/commit/ba235180d41a5edaab97287efd5a5a177ca7b983
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  Merge branch '2197-less-import-error' of https://github.com/brew/ckan into brew-2197-less-import-error


  Commit: 663bf9ac1f72f3899c511706443c9c5a7b994b5e
      https://github.com/ckan/ckan/commit/663bf9ac1f72f3899c511706443c9c5a7b994b5e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  Merge branch 'brew-2197-less-import-error'


  Commit: b7905a6a776aa4d161dd323c7564cb1fe49d8855
      https://github.com/ckan/ckan/commit/b7905a6a776aa4d161dd323c7564cb1fe49d8855
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  Merge branch '2208-remove-redundant-validated-data-dict' of https://github.com/wardi/ckan into wardi-2208-remove-redundant-validated-data-dict


  Commit: 5afd4afc1ab6a055e2336e13a4741908646975fb
      https://github.com/ckan/ckan/commit/5afd4afc1ab6a055e2336e13a4741908646975fb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  Merge branch 'wardi-2208-remove-redundant-validated-data-dict'


  Commit: 1260dd9d998ed037bc3f353e0ca8af619f04e061
      https://github.com/ckan/ckan/commit/1260dd9d998ed037bc3f353e0ca8af619f04e061
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'deployment-doc-fix' of https://github.com/mattrm/ckan into mattrm-deployment-doc-fix


  Commit: d9142fdd28b271050bf1dd8ce92356f5a7dbf5c5
      https://github.com/ckan/ckan/commit/d9142fdd28b271050bf1dd8ce92356f5a7dbf5c5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'mattrm-deployment-doc-fix'


  Commit: 19134abfa9298d5a238bfa79fa2a1efc6f5a9c1d
      https://github.com/ckan/ckan/commit/19134abfa9298d5a238bfa79fa2a1efc6f5a9c1d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Merge branch '2112-add-set-permissions-template-to-manifest.in' of https://github.com/florianm/ckan into florianm-2112-add-set-permissions-template-to-manifest.in


  Commit: b24f1fee55190f23be83bc9762fe6894af5a3260
      https://github.com/ckan/ckan/commit/b24f1fee55190f23be83bc9762fe6894af5a3260
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Merge branch 'florianm-2112-add-set-permissions-template-to-manifest.in'


  Commit: b1fed38c28a3b09aaba0edc6840fad4445efc6d2
      https://github.com/ckan/ckan/commit/b1fed38c28a3b09aaba0edc6840fad4445efc6d2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number for 2.4a (and remove whitespace)


  Commit: 3c5e3fa41d043e6be5ac863324f5663531b6d01e
      https://github.com/ckan/ckan/commit/3c5e3fa41d043e6be5ac863324f5663531b6d01e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M ckan/templates/package/snippets/resource_views_list_item.html

  Log Message:
  -----------
  [#2222] Fix resource views list format, lost in a bad merge


  Commit: a7f6182e88bdeb8629622ad8e4f662a3839c3305
      https://github.com/ckan/ckan/commit/a7f6182e88bdeb8629622ad8e4f662a3839c3305
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ckan/templates/package/snippets/resource_views_list_item.html

  Log Message:
  -----------
  Merge pull request #2222 from ckan/2222-fix-resource-views-format

Resource views formatting lost on master and 2.3


  Commit: 62dc5be5ff0446bf81ce59a2d125b722cec368c2
      https://github.com/ckan/ckan/commit/62dc5be5ff0446bf81ce59a2d125b722cec368c2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-18 (Sun, 18 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] First implementation of the create views command

Uses the search to retrieve the dataset dicts and passes them to the
function that adds default views to datasets.

User is prompt with the total count of datasets and the view plugins
which will be checked so she can abort if needed.


  Commit: d6e3f617a1aeedc554a994ddf9ff10dc48cafae5
      https://github.com/ckan/ckan/commit/d6e3f617a1aeedc554a994ddf9ff10dc48cafae5
  Author: Jari Voutilainen <jari.voutilainen at iki.fi>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.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/fanstatic_resources.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    A 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
    A 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
    A ckan/migration/versions/075_rename_view_plugins.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_api.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_patch.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    A ckan/new_tests/test_authz.py
    M ckan/new_tests/test_factories.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/resource-view-embed.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    R ckan/rating.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_authenticator.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_field_types.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    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/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/theme/public/css/text.css
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    R doc/_themes/sphinx-theme-okfn
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into fix-slow-organization-pages


  Commit: 7512f3e25d312eead3adefacadc90b5072b0d581
      https://github.com/ckan/ckan/commit/7512f3e25d312eead3adefacadc90b5072b0d581
  Author: Jari Voutilainen <jari.voutilainen at iki.fi>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  remove dataset also from other org pages that do not need them


  Commit: 6e57d3e407fccccfcbb18c5b42f573eccecf2eb0
      https://github.com/ckan/ckan/commit/6e57d3e407fccccfcbb18c5b42f573eccecf2eb0
  Author: andreivicentiuhincu <andreivicentiuhincu at gmail.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M ckan/templates/package/snippets/additional_info.html

  Log Message:
  -----------
  Fixed dataset state translation

The dataset state was not translated on the dataset details
page....Fixed it.


  Commit: 7bc9b2b2752cf432a3d5472effbf22fe1e19cf40
      https://github.com/ckan/ckan/commit/7bc9b2b2752cf432a3d5472effbf22fe1e19cf40
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Update translations from Transifex ahead of 2.2.1 release

Conflicts:
	ckan/i18n/fr/LC_MESSAGES/ckan.mo
	ckan/i18n/sk/LC_MESSAGES/ckan.mo


  Commit: c0b8d92ae568e06b16c421f82070eeb08c5a6cff
      https://github.com/ckan/ckan/commit/c0b8d92ae568e06b16c421f82070eeb08c5a6cff
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Last translations update before 2.2.1

Translations for km, mn_MN and vi are not included as they contain
format specifiers errors.


  Commit: 8c674261e58fd0688ee5d4418319f9937d31036c
      https://github.com/ckan/ckan/commit/8c674261e58fd0688ee5d4418319f9937d31036c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Update translation po files from Transifex

Khmer and Nepalese translation excluded for now as they have format
issues


  Commit: a9fdc03ad745ec6a8095ab841ef80b6403232e8b
      https://github.com/ckan/ckan/commit/a9fdc03ad745ec6a8095ab841ef80b6403232e8b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M ckan/i18n/ckan.pot

  Log Message:
  -----------
  Extract new messages to pot file


  Commit: 92a12743606255a7358141c0352b88613d04a8e4
      https://github.com/ckan/ckan/commit/92a12743606255a7358141c0352b88613d04a8e4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    M ckan/i18n/eu/LC_MESSAGES/ckan.mo
    M ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lo/LC_MESSAGES/ckan.mo
    M ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/my/LC_MESSAGES/ckan.mo
    M ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    M ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Update latest translation po files and compile


  Commit: 9439d5e8ea4b3da85ab5c340672d61bedfbeb443
      https://github.com/ckan/ckan/commit/9439d5e8ea4b3da85ab5c340672d61bedfbeb443
  Author: tanmayAccela <tthakur at accela.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M doc/maintaining/filestore.rst

  Log Message:
  -----------
  Update filestore.rst


  Commit: e7f60a3f62e13ded629654b31521e9de28f26a16
      https://github.com/ckan/ckan/commit/e7f60a3f62e13ded629654b31521e9de28f26a16
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M doc/maintaining/filestore.rst

  Log Message:
  -----------
  Merge pull request #2241 from tanmayAccela/patch-1

Update filestore.rst


  Commit: 5eb8d03b2ae10ad330eb1d57d086a2d172c6e2d4
      https://github.com/ckan/ckan/commit/5eb8d03b2ae10ad330eb1d57d086a2d172c6e2d4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  [#2242] Add recline_view to the default view types

As part of #2140 DataProxy was reenabled, so to keep the old behaviour
of showing a Recline data explorer when uploading or linking to a
csv/excel we added it to the default view types. The data explorer view
plugin no longer requires the DataStore, as it can use DataProxy.

Also tweaked the client side error message to reflect if the error came
from the DataStore or the DataProxy.


  Commit: d741ecdf9e7f7168a9a422e0e4cf9f84c9ac6d3a
      https://github.com/ckan/ckan/commit/d741ecdf9e7f7168a9a422e0e4cf9f84c9ac6d3a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M ckanext/imageview/plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/textview/plugin.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  [#2242] Remove auto creation logic from text and pdf view plugins

There is no need to implement `IPackageController` on the plugin as
default views are handled differently since #1852.

Made title translatable on image and web plugins


  Commit: a6e897e4c6c13f7132da713c2ec3e925affc67fb
      https://github.com/ckan/ckan/commit/a6e897e4c6c13f7132da713c2ec3e925affc67fb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckanext/pdfview/plugin.py
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  [#2242] Rename text and pdf view plugins for consistency


  Commit: 3cb78cffbfa4e0f4ebf8d6630d9c66c152302ee2
      https://github.com/ckan/ckan/commit/3cb78cffbfa4e0f4ebf8d6630d9c66c152302ee2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2242] Remove no longer used `get_new_resources` function

Better not to mess with low level session caches etc. It is no longer
relevant after #1852


  Commit: 1663c5f19b7065142bf0a967b75c39d8fb71ac32
      https://github.com/ckan/ckan/commit/1663c5f19b7065142bf0a967b75c39d8fb71ac32
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  [#2242] Remove redundant title from view page

As it is already shown on the tab (http://i.imgur.com/IopLCyq.png)


  Commit: 9b828aabe9373913acb86ebba8dd392715dc952f
      https://github.com/ckan/ckan/commit/9b828aabe9373913acb86ebba8dd392715dc952f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M ckan/templates/package/snippets/additional_info.html

  Log Message:
  -----------
  Merge branch '2236---Dataset-state-translation' of https://github.com/andreivicentiuhincu/ckan into andreivicentiuhincu-2236---Dataset-state-translation


  Commit: 21c0db517bf9224e6d3ba35a563245a46086963c
      https://github.com/ckan/ckan/commit/21c0db517bf9224e6d3ba35a563245a46086963c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M ckan/templates/package/snippets/additional_info.html

  Log Message:
  -----------
  Merge branch 'andreivicentiuhincu-2236---Dataset-state-translation'


  Commit: 07459d32eb2b05c459f29b0c4e9e952ea7007ab4
      https://github.com/ckan/ckan/commit/07459d32eb2b05c459f29b0c4e9e952ea7007ab4
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

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

  Log Message:
  -----------
  Fixes a direct import in action/delete

Direct imports in action modules are bad because it generates
documentation for them.


  Commit: 28ecbdfd42b0f0ed244d7730c52e3e660ea8f73c
      https://github.com/ckan/ckan/commit/28ecbdfd42b0f0ed244d7730c52e3e660ea8f73c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/new_tests/lib/test_datapreview.py

  Log Message:
  -----------
  [#2204] Refactor view creation fuctions

To allow creating specific view types on resources rather than all the
default ones. Basically there are a pair of `add_view_` and
`add_default_view` functions for datasets and resources. Added some more
tests.


  Commit: 654d4cf23c87b4b862e6e412693dc6dbd1da3cc7
      https://github.com/ckan/ckan/commit/654d4cf23c87b4b862e6e412693dc6dbd1da3cc7
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/lib/datapreview.py

  Log Message:
  -----------
  [#2204] Add clarification to docstrings


  Commit: 8c00319438e4a10b72c1f5e1b1e648a89f968487
      https://github.com/ckan/ckan/commit/8c00319438e4a10b72c1f5e1b1e648a89f968487
  Author: pstarace <paolo at sciamlab.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Update db.py

That change enables the user to provide custom sqlalchemy properties through the config file using the 'ckan.datastore.sqlalchemy.' prefix.
Example:
ckan.datastore.sqlalchemy.pool_size=10
ckan.datastore.sqlalchemy.max_overflow=20

The 'url' property is passed as param in the 'extras' map to avoid changing the structure of the current config file.

For further details please look at https://github.com/ckan/ckan/issues/2232


  Commit: cd843d6ea7e668907f6c51b9448c1fae368ab53b
      https://github.com/ckan/ckan/commit/cd843d6ea7e668907f6c51b9448c1fae368ab53b
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  Enables extension to send ODS files for pushing to datastore


  Commit: 997400c0152a27fabb94b66f00eb74e440fe8b2a
      https://github.com/ckan/ckan/commit/997400c0152a27fabb94b66f00eb74e440fe8b2a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Refactor create views command to allow explicit types

You can now pass specific view types on the command line to limit the
view types that will be created, eg:

    paster views create image_view recline_view my_custom_view

If the relevant plugins are not loaded on your ini file the command will
stop.

Improved usage docs, PEP8.


  Commit: 810f76459944504c88ba85adad3e44dcc82323d8
      https://github.com/ckan/ckan/commit/810f76459944504c88ba85adad3e44dcc82323d8
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/new_tests/lib/search/test_index.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/public/base/less/ckan.less
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'master' into 2204-resource-views-cli


  Commit: 73e4e43b8438cf3b18fc581603ffda17bc532b74
      https://github.com/ckan/ckan/commit/73e4e43b8438cf3b18fc581603ffda17bc532b74
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckanext/datapusher/cli.py

  Log Message:
  -----------
  Fixes up the CLI command to be more useful

- Renames submit (which resubmits all current datastore resources) to
  resubmit.
- Adds submit, which takes a package name and pushes all the resources
  for that package - this should hopefully close #937 although is uses
  datapusher rather than datastore mentioned in the ticket.


  Commit: 20b906cdb2441dba48db86db1ce5c9b74743c496
      https://github.com/ckan/ckan/commit/20b906cdb2441dba48db86db1ce5c9b74743c496
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/new_tests/lib/test_datapreview.py

  Log Message:
  -----------
  [#2204] PEP8


  Commit: c1dd95162d6e5050b5feb3e216be53f4a7d3e5e2
      https://github.com/ckan/ckan/commit/c1dd95162d6e5050b5feb3e216be53f4a7d3e5e2
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_package.py
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  [#2218] Organization dropdown available to user.

The Organization dropdown is now visible to normal users when
creating/editing a dataset when they have organizations available to
them. Previously owner_org editing was only available to sysadmins,
draft datasets or through the API. Fixes #2218.


  Commit: 5412be2d6c1fc9898b0fd57c6fb9d49884ff3ed5
      https://github.com/ckan/ckan/commit/5412be2d6c1fc9898b0fd57c6fb9d49884ff3ed5
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#2218] Non-sysadmins can remove datasets from org


  Commit: f0fbaf5039b7f601130d9645e8921686f1ad349f
      https://github.com/ckan/ckan/commit/f0fbaf5039b7f601130d9645e8921686f1ad349f
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_package.py

  Log Message:
  -----------
  [#2218] Test normal user can remove org


  Commit: ca2f1cef2bce1b2b8a00c05992b8c08550aabd18
      https://github.com/ckan/ckan/commit/ca2f1cef2bce1b2b8a00c05992b8c08550aabd18
  Author: pstarace <paolo at sciamlab.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Update db.py


  Commit: c07dc19322d0510013668f74541e2d3e25269ef7
      https://github.com/ckan/ckan/commit/c07dc19322d0510013668f74541e2d3e25269ef7
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_info.py

  Log Message:
  -----------
  Adds a new datastore action to return info on tables.

When called with a resource id, provides the names and types of the
fields stored in the datastore, and a count of the total number of
rows.  This might be useful in providing info to people who want to call
the search apis.


  Commit: ea4c9a17869fae13a91e1cc3f0d47a4c10d0f226
      https://github.com/ckan/ckan/commit/ea4c9a17869fae13a91e1cc3f0d47a4c10d0f226
  Author: Motornyuk Sergey <tonnydexter at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/stats/templates/ckanext/stats/index.html

  Log Message:
  -----------
  [#1647] Stats extension. 'Largest Groups' links lead either to organizations or to groups page

Currently all links under the 'Largest Groups' refer to groups page.

After this change links refer to group page for groups and to organization page for organizations


  Commit: a62b3fe009ef98a07a5ad5fd8408d520d8d25687
      https://github.com/ckan/ckan/commit/a62b3fe009ef98a07a5ad5fd8408d520d8d25687
  Author: Motornyuk Sergey <tonnydexter at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/stats/stats.py

  Log Message:
  -----------
  [#1649] Stats extension. Tag counter works properly

Currently on 'Top Tags' tab displayed total amount of tags which includes deleted ones, private and deleted packages

After this change, tags with state=deleted, deleted packages, private packages are filtered out


  Commit: a900c119119742665a270b9d46e0515789d8901d
      https://github.com/ckan/ckan/commit/a900c119119742665a270b9d46e0515789d8901d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  [#2204] Modify default formats for text preview

Do not render geojson and csv, tsv files on text view by default

Most users / publishers would expect to see a map or table respectivlely.

It can be reenabled by adding `csv tsv` to `ckan.preview.text_formats` and
`geojson` to `ckan.preview.json_formats` config options.

Also fix typo in rdf+xml.


  Commit: 3626712a2c9140ba17ad84fcf84e404365a01e3a
      https://github.com/ckan/ckan/commit/3626712a2c9140ba17ad84fcf84e404365a01e3a
  Author: Motornyuk Sergey <tonnydexter at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/stats/tests/test_stats_lib.py

  Log Message:
  -----------
  [#1649] Stats extension. Changed tests

Currently tests failed because tags from private datasets not counted but in test expected that they will be counted(wrong behaviour)

After this change test won't expect tags from private datasets


  Commit: 609ad36abf7b0a5dd27c42cb1901742cee7b3464
      https://github.com/ckan/ckan/commit/609ad36abf7b0a5dd27c42cb1901742cee7b3464
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  Merge pull request #2243 from ckan/fix-direct-import-doc-issue

Fixes a direct import in action/delete


  Commit: 31750bf89d2426ae071790f59014d6ecd1026b0d
      https://github.com/ckan/ckan/commit/31750bf89d2426ae071790f59014d6ecd1026b0d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  * user_show now returns draft and private datasets if asked by the same
  user as is being viewed, or a sysadmin.
* Standardize number_created_packages to mean excluding private datasets
  (changes behaviour in user_list)
* Improved docs and new_tests for user_list and user_show


  Commit: 632ccbe999036a002da4e349f4bd026cb0aeb9db
      https://github.com/ckan/ckan/commit/632ccbe999036a002da4e349f4bd026cb0aeb9db
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  [#2204] Add filters for more common view types

If the view types that need to be checked are some of the core ones we
can filter the dataset search to only return the relevant ones, which
will reduce the number of datasets to be checked.

Refactored the text view plugin to allow importing the formats used.


  Commit: 584665c9b9e7a649c5c384efdeaedda021ddd258
      https://github.com/ckan/ckan/commit/584665c9b9e7a649c5c384efdeaedda021ddd258
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/pdfview/tests/test_view.py
    M ckanext/textview/tests/test_view.py

  Log Message:
  -----------
  [#2242] Fix pdf and text view tests


  Commit: cc4aa68a5a48fa03761c2e61b4fc4c42878ff6dd
      https://github.com/ckan/ckan/commit/cc4aa68a5a48fa03761c2e61b4fc4c42878ff6dd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M ckan/new_tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2216] number_created_packages includes draft and private when viewed by the user or sysadmin.


  Commit: 5a2331b8a1e7c83fe752219ec2cdb969601212bb
      https://github.com/ckan/ckan/commit/5a2331b8a1e7c83fe752219ec2cdb969601212bb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/new_tests/lib/test_datapreview.py

  Log Message:
  -----------
  [#2242] Load recline_view in tests as it is now a default view


  Commit: c7f62b63d3a84a5d6d83ef7dcfc45b5d4524d5e5
      https://github.com/ckan/ckan/commit/c7f62b63d3a84a5d6d83ef7dcfc45b5d4524d5e5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  Merge branch '2218-organization-change' of https://github.com/brew/ckan into brew-2218-organization-change


  Commit: 088638a6ff2f3549da91c1b670272823a0086613
      https://github.com/ckan/ckan/commit/088638a6ff2f3549da91c1b670272823a0086613
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_package.py

  Log Message:
  -----------
  [#2218] Mild improvement in test brittleness, using library for the form rather than grepping exact strings.


  Commit: 622cb25d93ea5e96300e038e9321e2e5862f697c
      https://github.com/ckan/ckan/commit/622cb25d93ea5e96300e038e9321e2e5862f697c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_info.py

  Log Message:
  -----------
  Merge pull request #2247 from ckan/datastore_info_action

Adds a new datastore action to return info on tables.


  Commit: f4eb39cb41a6154d3ebf92618472ba530ded8920
      https://github.com/ckan/ckan/commit/f4eb39cb41a6154d3ebf92618472ba530ded8920
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  [#2216] Small fixes.


  Commit: 7d4de4a5846dbc51e7f33ddc09b5c01b8b11704f
      https://github.com/ckan/ckan/commit/7d4de4a5846dbc51e7f33ddc09b5c01b8b11704f
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/datapusher/cli.py

  Log Message:
  -----------
  Merge pull request #2246 from ckan/937-datapusher-paster-command

Lets datapusher CLI command push a single package


  Commit: 8f298cd9e658d788b031a4059271210aff6a3d94
      https://github.com/ckan/ckan/commit/8f298cd9e658d788b031a4059271210aff6a3d94
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  Merge pull request #2245 from ckan/add-ods-to-datapusher

Enables datapusher extension to send ODS files to datapusher service


  Commit: 9eb88589166db62cb4f229b7a56ad5da6d5dcad9
      https://github.com/ckan/ckan/commit/9eb88589166db62cb4f229b7a56ad5da6d5dcad9
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Add option to turn default filters off

Default filters can be explicitly turned off, and they also won't be
applied if the user passes extra search parameters (still no
implemented)


  Commit: 2773faaed2ef9676ea478c32c09a609cf063c245
      https://github.com/ckan/ckan/commit/2773faaed2ef9676ea478c32c09a609cf063c245
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Allow users to modify the search parameters to get datasets

Users can pass the `-s` option to provide a JSON object with parameters
like the ones used in `package_search`. Supported parameters are `q`,
`fq` and `fq_list`.


  Commit: 774d765a27d0f725cbf4785d6d9edcff3900d023
      https://github.com/ckan/ckan/commit/774d765a27d0f725cbf4785d6d9edcff3900d023
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Add option to create views on particular datasets


  Commit: 8020238c080ca81ebd236592c213bf47d8e1ec4b
      https://github.com/ckan/ckan/commit/8020238c080ca81ebd236592c213bf47d8e1ec4b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Stop if no more records


  Commit: f31538d176da5d09f79546179c1e52262c749fc1
      https://github.com/ckan/ckan/commit/f31538d176da5d09f79546179c1e52262c749fc1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  Minor but important fix on custom fields tutorial

The ability to combine free extras and custom fields was added on 2.3,
not 2.2.1


  Commit: cf63aa0654f4ae583d9cf1437bf08b5507936ad5
      https://github.com/ckan/ckan/commit/cf63aa0654f4ae583d9cf1437bf08b5507936ad5
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  Merge pull request #2259 from ckan/minor-docs-fix

Minor but important fix on custom fields tutorial


  Commit: dab0ffac10c2a17a19c3136431d3d1e68347a2cc
      https://github.com/ckan/ckan/commit/dab0ffac10c2a17a19c3136431d3d1e68347a2cc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/user.py

  Log Message:
  -----------
  [#2216] Allow a user to see his datasets that are in a custom state, as long as it is not deleted.


  Commit: 23011aa73cfc787b0d51d8ad206427e5fd35303b
      https://github.com/ckan/ckan/commit/23011aa73cfc787b0d51d8ad206427e5fd35303b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch 'fix-slow-organization-pages' of https://github.com/yhteentoimivuuspalvelut/ckan into yhteentoimivuuspalvelut-fix-slow-organization-pages


  Commit: 117ca0df089d474a912beab9723cc9c199c8c63c
      https://github.com/ckan/ckan/commit/117ca0df089d474a912beab9723cc9c199c8c63c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch 'yhteentoimivuuspalvelut-fix-slow-organization-pages'


  Commit: d25985267d343c52cc9cb73263acd9dca06d5f7f
      https://github.com/ckan/ckan/commit/d25985267d343c52cc9cb73263acd9dca06d5f7f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch '2216-user-show-fix'


  Commit: bfab554772b7530fe18ceca8681c1db55386e547
      https://github.com/ckan/ckan/commit/bfab554772b7530fe18ceca8681c1db55386e547
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M ckan/lib/datapreview.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/new_tests/lib/test_datapreview.py
    M ckan/plugins/toolkit.py
    M ckan/templates/package/snippets/resource_view.html
    M ckanext/imageview/plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py

  Log Message:
  -----------
  Merge branch '2242-resource-views-fixes'


  Commit: 59c11f1754a6b25771622d61fb6c923558a4a70f
      https://github.com/ckan/ckan/commit/59c11f1754a6b25771622d61fb6c923558a4a70f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

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

  Log Message:
  -----------
  [#2266] Update deployment.ini_tmpl to reflect changes in resource views


  Commit: d3513b57961b9a2dd22c2326c8c24744570bd0e4
      https://github.com/ckan/ckan/commit/d3513b57961b9a2dd22c2326c8c24744570bd0e4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    A doc/images/manage_views.png
    A doc/images/views_overview.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] First round of resource views docs


  Commit: 6a94e20201e09942d5435cbb640763cee8013052
      https://github.com/ckan/ckan/commit/6a94e20201e09942d5435cbb640763cee8013052
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#2273] Do not provide a default email address


  Commit: 78e8aeffc74a8e71a4e1c8993701f9482a1f705e
      https://github.com/ckan/ckan/commit/78e8aeffc74a8e71a4e1c8993701f9482a1f705e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Sort resource proxy section


  Commit: 6f9eab9412a2669dc29734bdbc8e8c614e92da83
      https://github.com/ckan/ckan/commit/6f9eab9412a2669dc29734bdbc8e8c614e92da83
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M ckan/public/base/less/module.less

  Log Message:
  -----------
  [#2269] Fix embed button when no view description


  Commit: 3ba9c3d529e02647e00a98f039795cb3ec6b5822
      https://github.com/ckan/ckan/commit/3ba9c3d529e02647e00a98f039795cb3ec6b5822
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/validators.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/user.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/plugins/toolkit.py
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/logic/test_action.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/imageview/plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  Merge branch 'master' into 2204-resource-views-cli

Conflicts:
	ckanext/textview/plugin.py


  Commit: e96f492de9621bbc8ff95188cffdaf07dde54426
      https://github.com/ckan/ckan/commit/e96f492de9621bbc8ff95188cffdaf07dde54426
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less

  Log Message:
  -----------
  [#2267] Fix search layout in org bulk edit page


  Commit: b214b60120fff2d6ea64c8eb3da8b560a0d54f1c
      https://github.com/ckan/ckan/commit/b214b60120fff2d6ea64c8eb3da8b560a0d54f1c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Add docs on resource views migration


  Commit: b5f161ba4f2cba1be5204a144b65d6a00556ae53
      https://github.com/ckan/ckan/commit/b5f161ba4f2cba1be5204a144b65d6a00556ae53
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ckan/public/base/less/module.less

  Log Message:
  -----------
  Merge branch 'brew-2269-embed-view-button'


  Commit: 60eacb4ead079fb41788dd22230199fd7a2be5d4
      https://github.com/ckan/ckan/commit/60eacb4ead079fb41788dd22230199fd7a2be5d4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less

  Log Message:
  -----------
  Merge branch '2267-org-search-layout' of https://github.com/brew/ckan into brew-2267-org-search-layout


  Commit: dd251c72ac66b3365977f8c79bb8f8741a43b67f
      https://github.com/ckan/ckan/commit/dd251c72ac66b3365977f8c79bb8f8741a43b67f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less

  Log Message:
  -----------
  Merge branch 'brew-2267-org-search-layout'


  Commit: ea816a9145d037e45d7d6457b9dcc8050133e4a7
      https://github.com/ckan/ckan/commit/ea816a9145d037e45d7d6457b9dcc8050133e4a7
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  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:
  -----------
  Recompile CSS


  Commit: 53a117b5629b8e9de556cf7d8c03b2cf4d30b14c
      https://github.com/ckan/ckan/commit/53a117b5629b8e9de556cf7d8c03b2cf4d30b14c
  Author: Ian Ward <ian at excess.org>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Merge pull request #2273 from nigelbabu/2273-default-config-email

Do not provide email configuration in default config file


  Commit: b228308059e77074262acb44eb56f2f6eeac5d09
      https://github.com/ckan/ckan/commit/b228308059e77074262acb44eb56f2f6eeac5d09
  Author: Tom Mortimer-Jones <tom at morty.co.uk>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M doc/maintaining/background-tasks.rst

  Log Message:
  -----------
  [#2272] Fix docs that say Celery will be be installed

Fixes #2272


  Commit: 72f91d7bbaabbfdea7d549660856ce1af08adbb0
      https://github.com/ckan/ckan/commit/72f91d7bbaabbfdea7d549660856ce1af08adbb0
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M ckan/plugins/interfaces.py
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Document properly the IResourceView interface


  Commit: 8b653bc9eee252df230223e72f730210aa0ee7d8
      https://github.com/ckan/ckan/commit/8b653bc9eee252df230223e72f730210aa0ee7d8
  Author: pstarace <paolo at sciamlab.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Adding custom datastore sqlalchemy properties


  Commit: 8d16ac70cc289a72ab6c8b15181f8966ea5eb509
      https://github.com/ckan/ckan/commit/8d16ac70cc289a72ab6c8b15181f8966ea5eb509
  Author: pstarace <paolo at sciamlab.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Update db.py


  Commit: 52ba2fe90f52d846c6bfa70909e26787f96862e9
      https://github.com/ckan/ckan/commit/52ba2fe90f52d846c6bfa70909e26787f96862e9
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #2266 from ckan/2266-update-deployment-template

Update deployment.ini_tmpl to reflect changes in resource views


  Commit: dfecbd12d5d12cb82d612ccb44c41dff991080ee
      https://github.com/ckan/ckan/commit/dfecbd12d5d12cb82d612ccb44c41dff991080ee
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M ckan/plugins/interfaces.py
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Small fixes after review


  Commit: 98d7dcffa2c070051ba1cf1c29b14b5febeaabb2
      https://github.com/ckan/ckan/commit/98d7dcffa2c070051ba1cf1c29b14b5febeaabb2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    A doc/images/image_view.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/webpage_view.png
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  [#2205] Added screenshots for view types


  Commit: 2ce601ec903b9e81a5e7e9a144f2b9914dcd37f9
      https://github.com/ckan/ckan/commit/2ce601ec903b9e81a5e7e9a144f2b9914dcd37f9
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckan/plugins/interfaces.py
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  Merge pull request #2205 from ckan/2205-resource-views-docs

Documentation for resource views


  Commit: b99ebd2847d2695853d6afc251077476f49f8644
      https://github.com/ckan/ckan/commit/b99ebd2847d2695853d6afc251077476f49f8644
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckanext/stats/templates/ckanext/stats/index.html

  Log Message:
  -----------
  Merge branch '1647-stats-extension-links-to-groups' of https://github.com/serkostyx/ckan into serkostyx-1647-stats-extension-links-to-groups


  Commit: 12cf690644c3ff447dae9dbcc2a6d7caedf73887
      https://github.com/ckan/ckan/commit/12cf690644c3ff447dae9dbcc2a6d7caedf73887
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckanext/stats/templates/ckanext/stats/index.html

  Log Message:
  -----------
  Merge branch 'serkostyx-1647-stats-extension-links-to-groups'


  Commit: c072fc1ea18f75830e75bac48cdec8c369598984
      https://github.com/ckan/ckan/commit/c072fc1ea18f75830e75bac48cdec8c369598984
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py

  Log Message:
  -----------
  Merge branch '1649-stats-extension-tag-counts-are-incorrect' of https://github.com/serkostyx/ckan into serkostyx-1649-stats-extension-tag-counts-are-incorrect


  Commit: 7daa4ab0f43e2d1901e0c2dcf180c9d6ef6fb8ac
      https://github.com/ckan/ckan/commit/7daa4ab0f43e2d1901e0c2dcf180c9d6ef6fb8ac
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckanext/stats/stats.py
    M ckanext/stats/tests/test_stats_lib.py

  Log Message:
  -----------
  Merge branch 'serkostyx-1649-stats-extension-tag-counts-are-incorrect'


  Commit: 925553ffafa1585b754fc6b6e8ebf2b8fb09fbc5
      https://github.com/ckan/ckan/commit/925553ffafa1585b754fc6b6e8ebf2b8fb09fbc5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge branch 'patch-1' of https://github.com/pstarace/ckan into pstarace-patch-1


  Commit: 22be0462d60a0ec0138dd42ed3f9d4598b95416c
      https://github.com/ckan/ckan/commit/22be0462d60a0ec0138dd42ed3f9d4598b95416c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge branch 'pstarace-patch-1'


  Commit: aa4b3833e59a3b88a3726cb17616e4c9da598cd5
      https://github.com/ckan/ckan/commit/aa4b3833e59a3b88a3726cb17616e4c9da598cd5
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'patch-2' of https://github.com/pstarace/ckan into pstarace-patch-2


  Commit: f2a4f701736808d474464557274c4b3e145287d7
      https://github.com/ckan/ckan/commit/f2a4f701736808d474464557274c4b3e145287d7
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#2279] Minor doc tweaks


  Commit: 2b934223c255f7d194b4dedee971903d5ae8e807
      https://github.com/ckan/ckan/commit/2b934223c255f7d194b4dedee971903d5ae8e807
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'pstarace-patch-2'


  Commit: a0f5a6984a015d3c769ad189d333dd945d0ec8b8
      https://github.com/ckan/ckan/commit/a0f5a6984a015d3c769ad189d333dd945d0ec8b8
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M doc/maintaining/background-tasks.rst

  Log Message:
  -----------
  Merge branch '2272-fix-celery-docs' of https://github.com/morty/ckan into morty-2272-fix-celery-docs


  Commit: 2215bd9733d3a84035ec8f2c8988e035ce6f15c1
      https://github.com/ckan/ckan/commit/2215bd9733d3a84035ec8f2c8988e035ce6f15c1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M doc/maintaining/background-tasks.rst

  Log Message:
  -----------
  Merge branch 'morty-2272-fix-celery-docs'


  Commit: 8b823d6b4a123608595b25b3c9028f0ddcdb11a9
      https://github.com/ckan/ckan/commit/8b823d6b4a123608595b25b3c9028f0ddcdb11a9
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch '2207-package-show-exclude-tracking' of https://github.com/wardi/ckan into wardi-2207-package-show-exclude-tracking

Conflicts:
	ckan/lib/search/index.py


  Commit: 42e0325d595ddc9a85563e05b63c3ae54d9fdb9c
      https://github.com/ckan/ckan/commit/42e0325d595ddc9a85563e05b63c3ae54d9fdb9c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'wardi-2207-package-show-exclude-tracking'


  Commit: d03e5211c075f7893f30fd81d02a6f33d470ca27
      https://github.com/ckan/ckan/commit/d03e5211c075f7893f30fd81d02a6f33d470ca27
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Refactor confusing block


  Commit: 688333801112faade500dd448c9ccadad4015811
      https://github.com/ckan/ckan/commit/688333801112faade500dd448c9ccadad4015811
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Delete old code


  Commit: acd5f5bc78bfc4b6813ffff96f532ffee3ac9a26
      https://github.com/ckan/ckan/commit/acd5f5bc78bfc4b6813ffff96f532ffee3ac9a26
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/delete.py
    M ckan/model/resource_view.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/auth/test_delete.py

  Log Message:
  -----------
  [#2204] Add actions for clearing all or certain types of views


  Commit: 16aa14fdcc01be052af4f1679e26866d434f90cb
      https://github.com/ckan/ckan/commit/16aa14fdcc01be052af4f1679e26866d434f90cb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2204] Add clear command to paster views


  Commit: 3d73cb44f7a0c886ec91bfc2590fbe88d02bd33f
      https://github.com/ckan/ckan/commit/3d73cb44f7a0c886ec91bfc2590fbe88d02bd33f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.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/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/db.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst

  Log Message:
  -----------
  Merge branch 'master' into 2204-resource-views-cli


  Commit: 7cb05d08c482fd19cd81738e21448836a8817cd4
      https://github.com/ckan/ckan/commit/7cb05d08c482fd19cd81738e21448836a8817cd4
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  [#2204] Move default creation of views to actions

New actions `resource_create_default_resource_views` and
`package_create_default_resource_views` do what it says on the tin.
Docs + tests.


  Commit: 766a0b98006c8eb03becad4e69fd5b79119f1c6e
      https://github.com/ckan/ckan/commit/766a0b98006c8eb03becad4e69fd5b79119f1c6e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/new_tests/logic/auth/test_create.py

  Log Message:
  -----------
  [#2204] Fix auth function name


  Commit: 05471d5de6c716a8edc12622ea6ce513db39f8bf
      https://github.com/ckan/ckan/commit/05471d5de6c716a8edc12622ea6ce513db39f8bf
  Author: Sean Hammond <git at seanh.cc>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.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/fanstatic_resources.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/validators.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    A 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
    A 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
    A ckan/migration/versions/074_remove_resource_groups.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_api.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/dictization/__init__.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_patch.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    A ckan/new_tests/test_authz.py
    M ckan/new_tests/test_factories.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_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
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    R ckan/public/base/less/resource-view-embed.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/scripts/application.js
    R ckan/rating.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_authenticator.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_field_types.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.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/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/textview/theme/public/css/text.css
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    R doc/_themes/sphinx-theme-okfn
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/contributing/upgrading-dependencies.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/form-integration.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into groundrace


  Commit: ea145aab53f964d1250adbb305b158d50d66e139
      https://github.com/ckan/ckan/commit/ea145aab53f964d1250adbb305b158d50d66e139
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckanext/multilingual/plugin.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #2284 from ckan/groundrace

Groundrace


  Commit: 6f190857ccaec5a5d0b68a828ee7a9e9c00125ec
      https://github.com/ckan/ckan/commit/6f190857ccaec5a5d0b68a828ee7a9e9c00125ec
  Author: Sean Hammond <git at seanh.cc>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.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/fanstatic_resources.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/validators.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    A 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
    A 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
    A ckan/migration/versions/074_remove_resource_groups.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_api.py
    A ckan/new_tests/controllers/test_feed.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/dictization/__init__.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_patch.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    A ckan/new_tests/test_authz.py
    M ckan/new_tests/test_factories.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_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
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    R ckan/public/base/less/resource-view-embed.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/scripts/application.js
    R ckan/rating.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_authenticator.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_field_types.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.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/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/textview/theme/public/css/text.css
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M dev-requirements.txt
    R doc/_themes/sphinx-theme-okfn
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/contributing/upgrading-dependencies.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/form-integration.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/solr-multicore.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1244-cli-user-fullname-unicode

Conflicts:
	ckan/lib/cli.py


  Commit: 50548bc129186e413770c214f00a80547489c658
      https://github.com/ckan/ckan/commit/50548bc129186e413770c214f00a80547489c658
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/lib/cli.py
    A ckan/new_tests/lib/test_cli.py

  Log Message:
  -----------
  Merge pull request #2286 from ckan/1244-cli-user-fullname-unicode

1244 cli user fullname unicode


  Commit: 0db8057b0d4e7fa03ca62b458a84eda9ddaad40a
      https://github.com/ckan/ckan/commit/0db8057b0d4e7fa03ca62b458a84eda9ddaad40a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/new_tests/logic/auth/test_create.py

  Log Message:
  -----------
  [#2204] Fix auth function name (take 2)


  Commit: 9ab53fd540869570275547c9aa2741d013a8ae97
      https://github.com/ckan/ckan/commit/9ab53fd540869570275547c9aa2741d013a8ae97
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    A ckan/new_tests/lib/test_cli.py
    M ckanext/multilingual/plugin.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2204-resource-views-cli

Conflicts:
	ckan/lib/cli.py


  Commit: 148ce196b27e92c3debcc03e5ac3a9b84e68c41b
      https://github.com/ckan/ckan/commit/148ce196b27e92c3debcc03e5ac3a9b84e68c41b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.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/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/resource_view.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_api.py
    M ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_cli.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.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
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/new_user_form.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_tracking.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.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
    M doc/contributing/frontend/index.rst
    M doc/contributing/test.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/deployment.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2158-resource-extras

Conflicts:
	ckan/new_tests/logic/action/test_update.py


Compare: https://github.com/ckan/ckan/compare/dbc2908afc88...148ce196b27e


More information about the ckan-changes mailing list