[ckan-changes] [ckan/ckan] 952997: PEP8 before changes

[GitHub]

  Branch: refs/heads/2270-remove-pdf-viewer
  Home:   https://github.com/ckan/ckan
  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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 7cd31c8b824b338ab7c6ed9d4fef1348ac0768d1
      https://github.com/ckan/ckan/commit/7cd31c8b824b338ab7c6ed9d4fef1348ac0768d1
  Author: Krzysiek Madejski <krzysztof at madejscy.pl>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  attrs and is_required options

It would be best in fact to extract common macro options


  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: f86c7bb1392eff007f88ec330501f80d0fcf2b2d
      https://github.com/ckan/ckan/commit/f86c7bb1392eff007f88ec330501f80d0fcf2b2d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

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

  Log Message:
  -----------
  Merge branch 'patch-1' of https://github.com/KrzysztofMadejski/ckan into KrzysztofMadejski-patch-1


  Commit: ab6a6529e5d8da45723caf0cc1f5aa1f4e9c2b12
      https://github.com/ckan/ckan/commit/ab6a6529e5d8da45723caf0cc1f5aa1f4e9c2b12
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

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

  Log Message:
  -----------
  Merge branch 'KrzysztofMadejski-patch-1'


  Commit: a6d0229c71b26d30e8810eb8f957bf9f58d5e045
      https://github.com/ckan/ckan/commit/a6d0229c71b26d30e8810eb8f957bf9f58d5e045
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/search/index.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/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    M ckan/model/resource_view.py
    A ckan/new_tests/lib/test_cli.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_delete.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.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/datapusher/logic/action.py
    M ckanext/datastore/db.py
    M ckanext/multilingual/plugin.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 doc/contributing/frontend/templating.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 setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2270-remove-pdf-viewer

Conflicts:
	doc/maintaining/data-viewer.rst


Compare: https://github.com/ckan/ckan/compare/fd4d60c64a28...a6d0229c71b2