[ckan-changes] [ckan/ckan] 22572d: first attempt at fixing add resource failure with ...

• Previous message: [ckan-changes] [ckan/ckan] 99acbf: [#3471] Fix for small issues and Create dataset pa...
• Next message: [ckan-changes] [ckan/ckan] 9e4599: [#3570] Fix syntax error in resource-view-filters ...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/canada-v2.5
  Home:   https://github.com/ckan/ckan
  Commit: 22572da457d35178642f9b495bbe9be381c9f729
      https://github.com/ckan/ckan/commit/22572da457d35178642f9b495bbe9be381c9f729
  Author: Ian Ward <ian at excess.org>
  Date:   2013-03-12 (Tue, 12 Mar 2013)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  first attempt at fixing add resource failure with custom form


  Commit: ab92bc1e1d8f3941f7be953ef8a715dfdc7e095d
      https://github.com/ckan/ckan/commit/ab92bc1e1d8f3941f7be953ef8a715dfdc7e095d
  Author: Ian Ward <ian at excess.org>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  new ckan config option w/defualt profile=false


  Commit: 455674e3d8b6522753fa44fd587ff6e9d187ca38
      https://github.com/ckan/ckan/commit/455674e3d8b6522753fa44fd587ff6e9d187ca38
  Author: Ian Ward <ian at excess.org>
  Date:   2013-03-22 (Fri, 22 Mar 2013)

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

  Log Message:
  -----------
  package_create tag vocab performance fix suggested by kindly


  Commit: 1483eb7ae7ae3efa821132607f106685a123f2a3
      https://github.com/ckan/ckan/commit/1483eb7ae7ae3efa821132607f106685a123f2a3
  Author: kindly <kindly at gmail.com>
  Date:   2013-03-28 (Thu, 28 Mar 2013)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py

  Log Message:
  -----------
  #700 add muliprocessing reindex


  Commit: 047378d38931d11b94a61749388e9606fe6e6ec0
      https://github.com/ckan/ckan/commit/047378d38931d11b94a61749388e9606fe6e6ec0
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/misc.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/home/about.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/snippets/license.html
    A ckan/templates/tag/index.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/schema/test_schema.py
    M ckanext/datastore/bin/set_permissions.sql
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    M ckanext/test_tag_vocab_plugin.py
    R doc/about.rst
    R doc/administrative-dashboard.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/forms.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release-v2.0' into canada-v2.0


  Commit: 533b829fc2e06def10e17f30f694fb6e49c698af
      https://github.com/ckan/ckan/commit/533b829fc2e06def10e17f30f694fb6e49c698af
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

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

  Log Message:
  -----------
  [#716] Allow to pass the schema as part of the context

In some cases extensions need to tweak the schema used on package
creation or update. For instance harvesters may want to create a package
with a certain id, or relax the default tags schema. There used to be an
option via `form_to_db_schema_options` to provide a custom schema via
the context, but this was removed on the last IDatasetForm refactor.

This adds back the option to pass the schema as part of the context.


  Commit: 40f1b61e778022d49de2efdd7e72ea92fbd91154
      https://github.com/ckan/ckan/commit/40f1b61e778022d49de2efdd7e72ea92fbd91154
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/package_saver.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/tag.py
    M ckan/model/tracking.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/main.min.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/maroon.min.css
    M ckan/public/base/css/red.css
    M ckan/public/base/css/red.min.css
    M ckan/public/base/i18n/bg.js
    M ckan/public/base/i18n/bg.min.js
    M ckan/public/base/i18n/ca.js
    M ckan/public/base/i18n/ca.min.js
    M ckan/public/base/i18n/cs_CZ.js
    M ckan/public/base/i18n/cs_CZ.min.js
    M ckan/public/base/i18n/de.js
    M ckan/public/base/i18n/de.min.js
    M ckan/public/base/i18n/el.js
    M ckan/public/base/i18n/el.min.js
    M ckan/public/base/i18n/es.js
    M ckan/public/base/i18n/es.min.js
    M ckan/public/base/i18n/fi.js
    M ckan/public/base/i18n/fi.min.js
    M ckan/public/base/i18n/fr.js
    M ckan/public/base/i18n/fr.min.js
    M ckan/public/base/i18n/hu.js
    M ckan/public/base/i18n/hu.min.js
    M ckan/public/base/i18n/it.js
    M ckan/public/base/i18n/it.min.js
    M ckan/public/base/i18n/lt.js
    M ckan/public/base/i18n/lt.min.js
    M ckan/public/base/i18n/nl.js
    M ckan/public/base/i18n/nl.min.js
    M ckan/public/base/i18n/no.js
    M ckan/public/base/i18n/no.min.js
    M ckan/public/base/i18n/pl.js
    M ckan/public/base/i18n/pl.min.js
    M ckan/public/base/i18n/pt_BR.js
    M ckan/public/base/i18n/pt_BR.min.js
    M ckan/public/base/i18n/ru.js
    M ckan/public/base/i18n/ru.min.js
    M ckan/public/base/i18n/sk.js
    M ckan/public/base/i18n/sk.min.js
    M ckan/public/base/i18n/sl.js
    M ckan/public/base/i18n/sl.min.js
    M ckan/public/base/i18n/sq.js
    M ckan/public/base/i18n/sq.min.js
    M ckan/public/base/i18n/sr.js
    M ckan/public/base/i18n/sr.min.js
    M ckan/public/base/i18n/sr_Latn.js
    M ckan/public/base/i18n/sr_Latn.min.js
    M ckan/public/base/i18n/sv.js
    M ckan/public/base/i18n/sv.min.js
    M ckan/public/base/i18n/zh_TW.js
    M ckan/public/base/i18n/zh_TW.min.js
    M ckan/public/base/javascript/client.min.js
    M ckan/public/base/javascript/main.min.js
    M ckan/public/base/javascript/modules/autocomplete.min.js
    M ckan/public/base/javascript/modules/dashboard.min.js
    M ckan/public/base/javascript/modules/data-viewer.min.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/templates/activity_streams/activity_stream_items.html
    A ckan/templates/group/history.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/header.html
    M ckan/templates/organization/index.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M doc/_templates/footer.html
    M doc/conf.py
    M doc/configuration.rst
    A doc/contributing.rst
    M doc/database-dumps.rst
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/legacy-api.rst
    M doc/paster.rst
    M doc/post-installation.rst
    A doc/tracking.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release-v2.0' into canada-v2.0

Conflicts:
	ckan/lib/cli.py


  Commit: e43107c6176ed8982d48e396672bb74f96b0e582
      https://github.com/ckan/ckan/commit/e43107c6176ed8982d48e396672bb74f96b0e582
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  allow package_create without name by setting name=id


  Commit: 4fa3d6cf036635aa676defc4ceb05bf81394ef1e
      https://github.com/ckan/ckan/commit/4fa3d6cf036635aa676defc4ceb05bf81394ef1e
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-27 (Sat, 27 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  add a helpful response to SearchIndexError exceptions raised within the action api


  Commit: 7cdd7813a84206bf2ec06b7fd5c3a41c7a9cd7b9
      https://github.com/ckan/ckan/commit/7cdd7813a84206bf2ec06b7fd5c3a41c7a9cd7b9
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  prettifying ValidationErrors makes them less useful


  Commit: f9b75dd5b5522ae2199d195283e048f65c32a4fe
      https://github.com/ckan/ckan/commit/f9b75dd5b5522ae2199d195283e048f65c32a4fe
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#835] return str(exception) on SearchIndexError in acton API


  Commit: 7124b38d1390e9025bd7c088db9a9546d46fa534
      https://github.com/ckan/ckan/commit/7124b38d1390e9025bd7c088db9a9546d46fa534
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

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

  Log Message:
  -----------
  [#674] More descriptive Solr exceptions when indexing


  Commit: 0bbc31efbaec61b9b7cd26519f21ac614ae8d0c4
      https://github.com/ckan/ckan/commit/0bbc31efbaec61b9b7cd26519f21ac614ae8d0c4
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

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

  Log Message:
  -----------
  [#674] Capture socket error as well when contacting Solr


  Commit: d928c65cd72a1988d9fae8a79c2414015a5cdc29
      https://github.com/ckan/ckan/commit/d928c65cd72a1988d9fae8a79c2414015a5cdc29
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M ckan/logic/converters.py
    M ckan/tests/schema/test_schema.py

  Log Message:
  -----------
  [#382] Remove keys from extras when using convert_from_extras

If fields are moved to the top level, they should be removed from
extras. See #376 for discussion. Added test.

Basically adapt the converter for transforming this:

```
 ('extras', 1, '__extras'): {u'package_id': u'9fbddea7-31bf-4bf2-9595-ae7b5d9c1102',
                       u'revision_id': u'a13e1cf5-6ecb-4ea4-a4c2-f5c0d865e401'},
 ('extras', 1, 'deleted'): <ckan.lib.navl.dictization_functions.Missing object at 0x3c4a050>,
 ('extras', 1, u'id'): u'871cbb3c-8c93-4afa-bf2a-8f2123a7b365',
 ('extras', 1, u'key'): u'frequency',
 ('extras', 1, u'revision_timestamp'): '2013-02-22T17:33:11.577374',
 ('extras', 1, u'state'): u'active',
 ('extras', 1, u'value'): u'DAILY',
```
to this:

```
 ('frequency',): u'DAILY'
```


  Commit: 7f75fd5e14657e705dc75e36f95ed7b0c0f877b5
      https://github.com/ckan/ckan/commit/7f75fd5e14657e705dc75e36f95ed7b0c0f877b5
  Author: Ian Ward <ian at excess.org>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M ckan/logic/converters.py

  Log Message:
  -----------
  [#382] fix for extras not found


  Commit: 7e58e358e186270ba598cc0b7cf6d3b7b903d657
      https://github.com/ckan/ckan/commit/7e58e358e186270ba598cc0b7cf6d3b7b903d657
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-06 (Mon, 06 May 2013)

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

  Log Message:
  -----------
  use IDatasetForm schema for resource_update


  Commit: 223cb7cf350cd0685ef694597b561c1ece62ec0e
      https://github.com/ckan/ckan/commit/223cb7cf350cd0685ef694597b561c1ece62ec0e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#580] Fix resource edit errors losing info


  Commit: 4f3fc0694cc72f25aca3d3bdfb063b1075abc40a
      https://github.com/ckan/ckan/commit/4f3fc0694cc72f25aca3d3bdfb063b1075abc40a
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    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/check_po_files.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A 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_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/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/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/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/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/my_MM/LC_MESSAGES/ckan.mo
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/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/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A 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/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/render.py
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_search.py
    M doc/apps-ideas.rst
    M doc/architecture.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    R doc/commenting.rst
    M doc/common-error-messages.rst
    M doc/configuration.rst
    R doc/contrib.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    M doc/extensions.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    A doc/importing-datasets.rst
    M doc/index.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    M doc/tracking.rst
    R doc/writing-extensions.rst
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release-v2.0' into canada-v2.0


  Commit: 67be88fa97fe9301e36d9273172aec88a35b15d0
      https://github.com/ckan/ckan/commit/67be88fa97fe9301e36d9273172aec88a35b15d0
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

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

  Log Message:
  -----------
  updated french localization file


  Commit: 4072f5373f5b8973769cb7ed761b02344617d108
      https://github.com/ckan/ckan/commit/4072f5373f5b8973769cb7ed761b02344617d108
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  compiled french localization file


  Commit: 9a892dffb74457ac7e3e749f9e5605b308bb1fa3
      https://github.com/ckan/ckan/commit/9a892dffb74457ac7e3e749f9e5605b308bb1fa3
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #1 from deniszgonjanin/canada-v2.0

Updated french localization


  Commit: b425c9741b799ddbb899be787e2549424248c23f
      https://github.com/ckan/ckan/commit/b425c9741b799ddbb899be787e2549424248c23f
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  translations, page 1


  Commit: 077a2a1989a83bf2517b615f16bb491bf3077338
      https://github.com/ckan/ckan/commit/077a2a1989a83bf2517b615f16bb491bf3077338
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  translations, header & footer


  Commit: 4881eb5e4f45c362d14dcf62fd332c4c81250734
      https://github.com/ckan/ckan/commit/4881eb5e4f45c362d14dcf62fd332c4c81250734
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  translations, page 3


  Commit: a26d15e6ef440650ae7edcb623aa3dfd58ed9f02
      https://github.com/ckan/ckan/commit/a26d15e6ef440650ae7edcb623aa3dfd58ed9f02
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  translations, page 4


  Commit: 6ea85db2780515ecf9fd6f83e324c56d6c12f28f
      https://github.com/ckan/ckan/commit/6ea85db2780515ecf9fd6f83e324c56d6c12f28f
  Author: Ross Thompson <ross.thompson at statcan.gc.ca>
  Date:   2013-05-10 (Fri, 10 May 2013)

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

  Log Message:
  -----------
  Merge pull request #2 from deniszgonjanin/canada-v2.0

Did somebody ask for translations?


  Commit: d3b0f9cb182884925ee2e7225c7d9b77ac11d2b7
      https://github.com/ckan/ckan/commit/d3b0f9cb182884925ee2e7225c7d9b77ac11d2b7
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  translations, up to and including page 8 of the provided translation file


  Commit: 6526bbeccaf1da69b7476e68e5bc98e3707fff8f
      https://github.com/ckan/ckan/commit/6526bbeccaf1da69b7476e68e5bc98e3707fff8f
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #3 from deniszgonjanin/canada-v2.0

translations, up to and including page 8 of the provided translation fil...


  Commit: b784d86403eb1368f5baef01b4550b58484170ff
      https://github.com/ckan/ckan/commit/b784d86403eb1368f5baef01b4550b58484170ff
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  test-core.ini: remove licenses_group_url override (our tests need this config)


  Commit: c1c9d513dcc7fd670f6fa4c431b89f3332782ef9
      https://github.com/ckan/ckan/commit/c1c9d513dcc7fd670f6fa4c431b89f3332782ef9
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-10 (Fri, 10 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  account info box translation


  Commit: 34cde659be96ec4961ecdf850c448143e182fc44
      https://github.com/ckan/ckan/commit/34cde659be96ec4961ecdf850c448143e182fc44
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  more translations


  Commit: 65e5d14721532faa2b225e1f90dd680ac1db396a
      https://github.com/ckan/ckan/commit/65e5d14721532faa2b225e1f90dd680ac1db396a
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

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

  Log Message:
  -----------
  more mock-up translations


  Commit: 39046050b41f490fc07b140f958b64015ae70767
      https://github.com/ckan/ckan/commit/39046050b41f490fc07b140f958b64015ae70767
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  more translations


  Commit: 851bdea46dc59077437994f484d6848df7423377
      https://github.com/ckan/ckan/commit/851bdea46dc59077437994f484d6848df7423377
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  more translations


  Commit: 8d08d0447d4a3b0b81c62f727d34783a08757c28
      https://github.com/ckan/ckan/commit/8d08d0447d4a3b0b81c62f727d34783a08757c28
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #4 from deniszgonjanin/canada-v2.0

translations


  Commit: 0afb0fe25c4672f97e3f53b6c1eb391fef32facc
      https://github.com/ckan/ckan/commit/0afb0fe25c4672f97e3f53b6c1eb391fef32facc
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  redirect to logged_in from login when user alread logged in


  Commit: a2492e3a819295b82594e5b754678f463199e872
      https://github.com/ckan/ckan/commit/a2492e3a819295b82594e5b754678f463199e872
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #5 from wardi/canada-v2.0

redirect to logged_in from login when user alread logged in


  Commit: 4b75585b0964fb00c87d3e319758c4ac7cc099aa
      https://github.com/ckan/ckan/commit/4b75585b0964fb00c87d3e319758c4ac7cc099aa
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  more french translations


  Commit: 93b1d35d02fede221d9b6c4394e5a68177306a82
      https://github.com/ckan/ckan/commit/93b1d35d02fede221d9b6c4394e5a68177306a82
  Author: Ross Thompson <ross.thompson at statcan.gc.ca>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #6 from deniszgonjanin/canada-v2.0

more french translations


  Commit: 3f4bee8131532c05451351744511cdfbccd71a6a
      https://github.com/ckan/ckan/commit/3f4bee8131532c05451351744511cdfbccd71a6a
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  more translations. MORE I SAY!


  Commit: 7382c94048335760392721b7d7780708425fbbfb
      https://github.com/ckan/ckan/commit/7382c94048335760392721b7d7780708425fbbfb
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-13 (Mon, 13 May 2013)

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

  Log Message:
  -----------
  merge with official ckan FR translations


  Commit: 37ed5bb3ef3610ea3879a4f7cadc1e8321cd3e80
      https://github.com/ckan/ckan/commit/37ed5bb3ef3610ea3879a4f7cadc1e8321cd3e80
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-13 (Mon, 13 May 2013)

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

  Log Message:
  -----------
  Merge pull request #7 from wardi/canada-v2.0

merge with official CKAN FR translations (99%)


  Commit: 8fb980dbd61dee96f68e1c0bd38cac5b23d6af43
      https://github.com/ckan/ckan/commit/8fb980dbd61dee96f68e1c0bd38cac5b23d6af43
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-13 (Mon, 13 May 2013)

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

  Log Message:
  -----------
  more merging of FR translations


  Commit: aed90eb508b4b1c33789fa6ffd82521db372b5bf
      https://github.com/ckan/ckan/commit/aed90eb508b4b1c33789fa6ffd82521db372b5bf
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-13 (Mon, 13 May 2013)

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

  Log Message:
  -----------
  Merge pull request #8 from wardi/canada-v2.0

finish merging FR translations


  Commit: 4c24da0d4e551dd8cd95f6a8ee546ade68c438c7
      https://github.com/ckan/ckan/commit/4c24da0d4e551dd8cd95f6a8ee546ade68c438c7
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

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

  Log Message:
  -----------
  Merge branch 'canada-v2.0' of https://github.com/open-data/ckan into canada-v2.0

Conflicts:
	ckan/i18n/fr/LC_MESSAGES/ckan.po


  Commit: b7513d7ef2789ef2ead21a2138d900e99e798f5e
      https://github.com/ckan/ckan/commit/b7513d7ef2789ef2ead21a2138d900e99e798f5e
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  compiled translation


  Commit: d743ef96cc764b5ca96c55363e6bdbffb98b4ffd
      https://github.com/ckan/ckan/commit/d743ef96cc764b5ca96c55363e6bdbffb98b4ffd
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #9 from deniszgonjanin/canada-v2.0

more translations. MORE I SAY!


  Commit: fd1ce2861f68815a2ce1c5f28c569c3ec2bdf7a4
      https://github.com/ckan/ckan/commit/fd1ce2861f68815a2ce1c5f28c569c3ec2bdf7a4
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  french


  Commit: 9fe07ee311119ab4a711bf38456daeac05bb67e0
      https://github.com/ckan/ckan/commit/9fe07ee311119ab4a711bf38456daeac05bb67e0
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #10 from deniszgonjanin/canada-v2.0

french


  Commit: e6dde56d95c1911d3746f752b2f538c44789e943
      https://github.com/ckan/ckan/commit/e6dde56d95c1911d3746f752b2f538c44789e943
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Further French translation updates


  Commit: fb867a124d3062f487d48f6c30bcc70ba3035c55
      https://github.com/ckan/ckan/commit/fb867a124d3062f487d48f6c30bcc70ba3035c55
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge remote-tracking branch 'opendata/canada-v2.0' into canada-v2.0

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


  Commit: 0fe709c07b1efa8d649a03365fa631574ea2122c
      https://github.com/ckan/ckan/commit/0fe709c07b1efa8d649a03365fa631574ea2122c
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/config/who.ini

  Log Message:
  -----------
  who.ini: remove post_login_url/post_logout_url settings


  Commit: 28bb0314fa0657542f3562ccecaadeb9cf9765aa
      https://github.com/ckan/ckan/commit/28bb0314fa0657542f3562ccecaadeb9cf9765aa
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  fix:user.login incorrectly cleared language setting


  Commit: b03f20cc0fb36d3a4d66fdee510363bbf261288f
      https://github.com/ckan/ckan/commit/b03f20cc0fb36d3a4d66fdee510363bbf261288f
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  more translations


  Commit: 73300d722bd562c322b1f29779917b958d81ed01
      https://github.com/ckan/ckan/commit/73300d722bd562c322b1f29779917b958d81ed01
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/config/who.ini
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #11 from wardi/canada-v2.0

Fix user.login bug that resulted in locale being cleared


  Commit: 71a61a01584f13c23bd6d67666a17de9787296cf
      https://github.com/ckan/ckan/commit/71a61a01584f13c23bd6d67666a17de9787296cf
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/config/who.ini
    M ckan/controllers/user.py
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

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


  Commit: a7e31bd155cb3ceda0bce75a3946656f6bf6a16d
      https://github.com/ckan/ckan/commit/a7e31bd155cb3ceda0bce75a3946656f6bf6a16d
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #12 from deniszgonjanin/canada-v2.0

Canada v2.0


  Commit: c95f546360b39ecba0d17cfbfcd7b88cb934e1e7
      https://github.com/ckan/ckan/commit/c95f546360b39ecba0d17cfbfcd7b88cb934e1e7
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  add s


  Commit: fb41e3d6d33bc6280b405f38674e1c547d8c3759
      https://github.com/ckan/ckan/commit/fb41e3d6d33bc6280b405f38674e1c547d8c3759
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-14 (Tue, 14 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #13 from deniszgonjanin/canada-v2.0

add s


  Commit: 6f480ff70fd3d5eecc8f2c7b9fd52b2a63c391ec
      https://github.com/ckan/ckan/commit/6f480ff70fd3d5eecc8f2c7b9fd52b2a63c391ec
  Author: Ross Thompson <ross.thompson at statcan.gc.ca>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  JIRA GCOD-264 - Translations for resource listings


  Commit: b9b09fb0083082a1f53de89dc3bfa23d2f5b2555
      https://github.com/ckan/ckan/commit/b9b09fb0083082a1f53de89dc3bfa23d2f5b2555
  Author: Ross Thompson <ross.thompson at statcan.gc.ca>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Added translation for program page - needs TBS approval


  Commit: 6460f780ae2f83cbfa6a9f31a6d5f571f44b4bca
      https://github.com/ckan/ckan/commit/6460f780ae2f83cbfa6a9f31a6d5f571f44b4bca
  Author: Ross Thompson <ross.thompson at statcan.gc.ca>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Geographic information translation


  Commit: 4fa343428de515a683e45ccb9abd83ef65edc6fa
      https://github.com/ckan/ckan/commit/4fa343428de515a683e45ccb9abd83ef65edc6fa
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-21 (Tue, 21 May 2013)

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

  Log Message:
  -----------
  add translation for "Open Government"


  Commit: 17f65669eab406b023fa02b5a68b6936b5bca9d4
      https://github.com/ckan/ckan/commit/17f65669eab406b023fa02b5a68b6936b5bca9d4
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-21 (Tue, 21 May 2013)

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

  Log Message:
  -----------
  add markdown help translation


  Commit: 15ff9de463fb1bba6ed6a7a0d012c2661212c519
      https://github.com/ckan/ckan/commit/15ff9de463fb1bba6ed6a7a0d012c2661212c519
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-21 (Tue, 21 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  compile mo


  Commit: 5f52716555b5c88d4b8bebf1c5aba25b8aae3863
      https://github.com/ckan/ckan/commit/5f52716555b5c88d4b8bebf1c5aba25b8aae3863
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-21 (Tue, 21 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  fix markdown translation help: there are issues with " and {% trans %}


  Commit: 7e200d006e02094fd160107a8807752fa6f50d6e
      https://github.com/ckan/ckan/commit/7e200d006e02094fd160107a8807752fa6f50d6e
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-21 (Tue, 21 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #14 from wardi/canada-v2.0

add "open government" and markdown help translations


  Commit: a3332a241008368927239ce03d374cd03d2d4d44
      https://github.com/ckan/ckan/commit/a3332a241008368927239ce03d374cd03d2d4d44
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  add translation of "Forgotten your password?"


  Commit: a224a061b722a384ee33d168389d5a74cacddd5e
      https://github.com/ckan/ckan/commit/a224a061b722a384ee33d168389d5a74cacddd5e
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  add translation for add another resource text


  Commit: 55711889f625b83e0860df8e50028b259e13cb8f
      https://github.com/ckan/ckan/commit/55711889f625b83e0860df8e50028b259e13cb8f
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #15 from wardi/canada-v2.0

two more translations


  Commit: 332a7de67ba5bdcfc2849183ff4de13bb17d46b2
      https://github.com/ckan/ckan/commit/332a7de67ba5bdcfc2849183ff4de13bb17d46b2
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-27 (Mon, 27 May 2013)

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

  Log Message:
  -----------
  additional french translations


  Commit: 41af1da6d6c17034ec2cfd1551b84f4eda34622e
      https://github.com/ckan/ckan/commit/41af1da6d6c17034ec2cfd1551b84f4eda34622e
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  build .mo


  Commit: 0081c602d206914c528723a54fc4eaff0fcfb1e6
      https://github.com/ckan/ckan/commit/0081c602d206914c528723a54fc4eaff0fcfb1e6
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #16 from wardi/canada-v2.0

Updated translations


  Commit: 6611327c65eb3d27e42704fa29fd6033c5fc3a1a
      https://github.com/ckan/ckan/commit/6611327c65eb3d27e42704fa29fd6033c5fc3a1a
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  change breadcrumb label


  Commit: 3e32ac8fef8d9b132bff05c4ce29a8fe2e0b9b6d
      https://github.com/ckan/ckan/commit/3e32ac8fef8d9b132bff05c4ce29a8fe2e0b9b6d
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  compile localization file


  Commit: e0c5a6114d143256ce07fc4761efb2081345bba3
      https://github.com/ckan/ckan/commit/e0c5a6114d143256ce07fc4761efb2081345bba3
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  package_list performance fix


  Commit: e692b756bb6b7f221687cee411e0d56195c2854a
      https://github.com/ckan/ckan/commit/e692b756bb6b7f221687cee411e0d56195c2854a
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  package_list: return sorted by name


  Commit: 5110d07462579199aae22c88eb81081338c4de63
      https://github.com/ckan/ckan/commit/5110d07462579199aae22c88eb81081338c4de63
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  Merge pull request #17 from wardi/canada-v2.0

package_list performance fix and sorting


  Commit: a9f8c0841abcb453f1ffd8430ef226eb7f808012
      https://github.com/ckan/ckan/commit/a9f8c0841abcb453f1ffd8430ef226eb7f808012
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  facet localization and label changes


  Commit: fc9cc29b5cdd52b5c20cc535e20ec57296f804bc
      https://github.com/ckan/ckan/commit/fc9cc29b5cdd52b5c20cc535e20ec57296f804bc
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  Merge branch 'canada-v2.0' of https://github.com/open-data/ckan into canada-v2.0


  Commit: 17466c38f0a0d8da2ab2f410744e168c201238e3
      https://github.com/ckan/ckan/commit/17466c38f0a0d8da2ab2f410744e168c201238e3
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  fix for package_list returning nested list


  Commit: e4f8ab1f0ffb253b1073a795d86bc3858675530e
      https://github.com/ckan/ckan/commit/e4f8ab1f0ffb253b1073a795d86bc3858675530e
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-28 (Tue, 28 May 2013)

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

  Log Message:
  -----------
  Merge pull request #18 from wardi/canada-v2.0

fix for package_list returning nested list


  Commit: be789a08e19d6076b66f2902ec316772d2b940d4
      https://github.com/ckan/ckan/commit/be789a08e19d6076b66f2902ec316772d2b940d4
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  don't return packages from tag_dictize


  Commit: 7ad5d31dc98c4e4ff5d86cbe96c2352076f6e4ee
      https://github.com/ckan/ckan/commit/7ad5d31dc98c4e4ff5d86cbe96c2352076f6e4ee
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  Merge pull request #19 from wardi/canada-v2.0

Performance: Don't "dictize" 1000 packages with every tag returned from the API


  Commit: a9a2f1d1b046717386ecf79daa7e8a353ba3de78
      https://github.com/ckan/ckan/commit/a9a2f1d1b046717386ecf79daa7e8a353ba3de78
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  add Data Type translation


  Commit: 068ee18d7f7830a7c07bbe04fdd3367bd6e8a950
      https://github.com/ckan/ckan/commit/068ee18d7f7830a7c07bbe04fdd3367bd6e8a950
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M CHANGELOG.txt
    M bin/travis-build
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/group.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    A ckan/public/base/css/main.debug.min.css
    M ckan/public/base/css/main.min.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/maroon.min.css
    M ckan/public/base/css/red.css
    M ckan/public/base/css/red.min.css
    M ckan/public/base/i18n/bg.js
    M ckan/public/base/i18n/bg.min.js
    M ckan/public/base/i18n/ca.js
    M ckan/public/base/i18n/ca.min.js
    M ckan/public/base/i18n/cs_CZ.js
    M ckan/public/base/i18n/cs_CZ.min.js
    M ckan/public/base/i18n/de.js
    M ckan/public/base/i18n/de.min.js
    A ckan/public/base/i18n/dv.js
    A ckan/public/base/i18n/dv.min.js
    M ckan/public/base/i18n/el.js
    M ckan/public/base/i18n/el.min.js
    A ckan/public/base/i18n/en_GB.js
    A ckan/public/base/i18n/en_GB.min.js
    M ckan/public/base/i18n/es.js
    M ckan/public/base/i18n/es.min.js
    A ckan/public/base/i18n/es_AR.js
    A ckan/public/base/i18n/es_AR.min.js
    A ckan/public/base/i18n/fa_IR.js
    A ckan/public/base/i18n/fa_IR.min.js
    M ckan/public/base/i18n/fi.js
    M ckan/public/base/i18n/fi.min.js
    M ckan/public/base/i18n/fr.js
    M ckan/public/base/i18n/fr.min.js
    M ckan/public/base/i18n/hu.js
    M ckan/public/base/i18n/hu.min.js
    A ckan/public/base/i18n/id.js
    A ckan/public/base/i18n/id.min.js
    A ckan/public/base/i18n/is.js
    A ckan/public/base/i18n/is.min.js
    M ckan/public/base/i18n/it.js
    M ckan/public/base/i18n/it.min.js
    A ckan/public/base/i18n/ja.js
    A ckan/public/base/i18n/ja.min.js
    A ckan/public/base/i18n/ko_KR.js
    A ckan/public/base/i18n/ko_KR.min.js
    M ckan/public/base/i18n/lt.js
    M ckan/public/base/i18n/lt.min.js
    M ckan/public/base/i18n/lv.js
    M ckan/public/base/i18n/lv.min.js
    A ckan/public/base/i18n/my_MM.js
    A ckan/public/base/i18n/my_MM.min.js
    M ckan/public/base/i18n/nl.js
    M ckan/public/base/i18n/nl.min.js
    M ckan/public/base/i18n/no.js
    M ckan/public/base/i18n/no.min.js
    M ckan/public/base/i18n/pl.js
    M ckan/public/base/i18n/pl.min.js
    M ckan/public/base/i18n/pt_BR.js
    M ckan/public/base/i18n/pt_BR.min.js
    M ckan/public/base/i18n/ro.js
    M ckan/public/base/i18n/ro.min.js
    M ckan/public/base/i18n/ru.js
    M ckan/public/base/i18n/ru.min.js
    M ckan/public/base/i18n/sk.js
    M ckan/public/base/i18n/sk.min.js
    M ckan/public/base/i18n/sl.js
    M ckan/public/base/i18n/sl.min.js
    M ckan/public/base/i18n/sq.js
    M ckan/public/base/i18n/sq.min.js
    M ckan/public/base/i18n/sr.js
    M ckan/public/base/i18n/sr.min.js
    M ckan/public/base/i18n/sr_Latn.js
    M ckan/public/base/i18n/sr_Latn.min.js
    M ckan/public/base/i18n/sv.js
    M ckan/public/base/i18n/sv.min.js
    A ckan/public/base/i18n/tr.js
    A ckan/public/base/i18n/tr.min.js
    A ckan/public/base/i18n/uk_UA.js
    A ckan/public/base/i18n/uk_UA.min.js
    A ckan/public/base/i18n/zh_CN.js
    A ckan/public/base/i18n/zh_CN.min.js
    M ckan/public/base/i18n/zh_TW.js
    M ckan/public/base/i18n/zh_TW.min.js
    A ckan/public/base/javascript/modules/activity-stream.min.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/basic-form.min.js
    A ckan/public/base/javascript/modules/popover-context.min.js
    A ckan/public/base/javascript/modules/table-toggle-more.min.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/test/spec/client.spec.min.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/revision/read.html
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    M doc/extensions.rst
    M doc/filestore.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/test.rst
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release-v2.0.1' into canada-v2.0

Conflicts:
	ckan/logic/action/update.py


  Commit: 36d4f462abde83ece145b0c07aaf82c29d1e6499
      https://github.com/ckan/ckan/commit/36d4f462abde83ece145b0c07aaf82c29d1e6499
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  after login redirect to dataset search not user page


  Commit: 625e8d6af422581ce3645dced590647acd7ea9e0
      https://github.com/ckan/ckan/commit/625e8d6af422581ce3645dced590647acd7ea9e0
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M CHANGELOG.txt
    M bin/travis-build
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    A ckan/public/base/css/main.debug.min.css
    M ckan/public/base/css/main.min.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/maroon.min.css
    M ckan/public/base/css/red.css
    M ckan/public/base/css/red.min.css
    M ckan/public/base/i18n/bg.js
    M ckan/public/base/i18n/bg.min.js
    M ckan/public/base/i18n/ca.js
    M ckan/public/base/i18n/ca.min.js
    M ckan/public/base/i18n/cs_CZ.js
    M ckan/public/base/i18n/cs_CZ.min.js
    M ckan/public/base/i18n/de.js
    M ckan/public/base/i18n/de.min.js
    A ckan/public/base/i18n/dv.js
    A ckan/public/base/i18n/dv.min.js
    M ckan/public/base/i18n/el.js
    M ckan/public/base/i18n/el.min.js
    A ckan/public/base/i18n/en_GB.js
    A ckan/public/base/i18n/en_GB.min.js
    M ckan/public/base/i18n/es.js
    M ckan/public/base/i18n/es.min.js
    A ckan/public/base/i18n/es_AR.js
    A ckan/public/base/i18n/es_AR.min.js
    A ckan/public/base/i18n/fa_IR.js
    A ckan/public/base/i18n/fa_IR.min.js
    M ckan/public/base/i18n/fi.js
    M ckan/public/base/i18n/fi.min.js
    M ckan/public/base/i18n/fr.js
    M ckan/public/base/i18n/fr.min.js
    M ckan/public/base/i18n/hu.js
    M ckan/public/base/i18n/hu.min.js
    A ckan/public/base/i18n/id.js
    A ckan/public/base/i18n/id.min.js
    A ckan/public/base/i18n/is.js
    A ckan/public/base/i18n/is.min.js
    M ckan/public/base/i18n/it.js
    M ckan/public/base/i18n/it.min.js
    A ckan/public/base/i18n/ja.js
    A ckan/public/base/i18n/ja.min.js
    A ckan/public/base/i18n/ko_KR.js
    A ckan/public/base/i18n/ko_KR.min.js
    M ckan/public/base/i18n/lt.js
    M ckan/public/base/i18n/lt.min.js
    M ckan/public/base/i18n/lv.js
    M ckan/public/base/i18n/lv.min.js
    A ckan/public/base/i18n/my_MM.js
    A ckan/public/base/i18n/my_MM.min.js
    M ckan/public/base/i18n/nl.js
    M ckan/public/base/i18n/nl.min.js
    M ckan/public/base/i18n/no.js
    M ckan/public/base/i18n/no.min.js
    M ckan/public/base/i18n/pl.js
    M ckan/public/base/i18n/pl.min.js
    M ckan/public/base/i18n/pt_BR.js
    M ckan/public/base/i18n/pt_BR.min.js
    M ckan/public/base/i18n/ro.js
    M ckan/public/base/i18n/ro.min.js
    M ckan/public/base/i18n/ru.js
    M ckan/public/base/i18n/ru.min.js
    M ckan/public/base/i18n/sk.js
    M ckan/public/base/i18n/sk.min.js
    M ckan/public/base/i18n/sl.js
    M ckan/public/base/i18n/sl.min.js
    M ckan/public/base/i18n/sq.js
    M ckan/public/base/i18n/sq.min.js
    M ckan/public/base/i18n/sr.js
    M ckan/public/base/i18n/sr.min.js
    M ckan/public/base/i18n/sr_Latn.js
    M ckan/public/base/i18n/sr_Latn.min.js
    M ckan/public/base/i18n/sv.js
    M ckan/public/base/i18n/sv.min.js
    A ckan/public/base/i18n/tr.js
    A ckan/public/base/i18n/tr.min.js
    A ckan/public/base/i18n/uk_UA.js
    A ckan/public/base/i18n/uk_UA.min.js
    A ckan/public/base/i18n/zh_CN.js
    A ckan/public/base/i18n/zh_CN.min.js
    M ckan/public/base/i18n/zh_TW.js
    M ckan/public/base/i18n/zh_TW.min.js
    A ckan/public/base/javascript/modules/activity-stream.min.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/basic-form.min.js
    A ckan/public/base/javascript/modules/popover-context.min.js
    A ckan/public/base/javascript/modules/table-toggle-more.min.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/test/spec/client.spec.min.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/revision/read.html
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    M doc/extensions.rst
    M doc/filestore.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/test.rst
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge pull request #20 from wardi/canada-v2.0

Merge ckan 2.0.1, redirect after login to dataset search


  Commit: 6e283572267fc2b96fedeed74134e14a0a2dc463
      https://github.com/ckan/ckan/commit/6e283572267fc2b96fedeed74134e14a0a2dc463
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

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

  Log Message:
  -----------
  resource_update: use package_update like resource_create does


  Commit: 9cb4b2ea8d4d025b3f990521b14d039c14e58237
      https://github.com/ckan/ckan/commit/9cb4b2ea8d4d025b3f990521b14d039c14e58237
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  resource_create/update: don't return resource in order to save a call to package_show


  Commit: 817ad2f044ebaeb94e35bbfa5576a89e9dd4f0be
      https://github.com/ckan/ckan/commit/817ad2f044ebaeb94e35bbfa5576a89e9dd4f0be
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  Merge pull request #21 from wardi/canada-v2.0

resource_update and resource_create changes


  Commit: 25defe10f3080ddb0762fb0674305b7d8ba4676c
      https://github.com/ckan/ckan/commit/25defe10f3080ddb0762fb0674305b7d8ba4676c
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    A ckan/migration/versions/068_add_extras_index.py

  Log Message:
  -----------
  [#982] add index to package_extra_revision on package_id, current


  Commit: 6ceef755cc4c2dd323fc5211c46b8826e192158f
      https://github.com/ckan/ckan/commit/6ceef755cc4c2dd323fc5211c46b8826e192158f
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  add four new translations, update dev corner api link


  Commit: e02d0ae5e9243e227b8052d81b1250f5529edb70
      https://github.com/ckan/ckan/commit/e02d0ae5e9243e227b8052d81b1250f5529edb70
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/migration/versions/068_add_extras_index.py

  Log Message:
  -----------
  Merge pull request #22 from wardi/canada-v2.0

new translations, create extras index migration script


  Commit: 4e29bee29231b2fd5cc06fcc891d85b841f8f7b1
      https://github.com/ckan/ckan/commit/4e29bee29231b2fd5cc06fcc891d85b841f8f7b1
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

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

  Log Message:
  -----------
  user_show: limit to 5 datasets and 0 revisions


  Commit: ae2e7c48a0cb4b226547d04cfdc551aaafa1f321
      https://github.com/ckan/ckan/commit/ae2e7c48a0cb4b226547d04cfdc551aaafa1f321
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

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

  Log Message:
  -----------
  Merge pull request #23 from wardi/canada-v2.0

fix for slow user dashboard


  Commit: 6b7d41583da3375f69faa61749486a9b3f50bab7
      https://github.com/ckan/ckan/commit/6b7d41583da3375f69faa61749486a9b3f50bab7
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  restore original ckan.po and ckan.mo files


  Commit: 58f5b7630019a27ffaae28ed74d1e37ee68301a6
      https://github.com/ckan/ckan/commit/58f5b7630019a27ffaae28ed74d1e37ee68301a6
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  ignore our changes to French .mo file


  Commit: c4c147234fd812d70f278192bf7c7b9f8bb4bbf1
      https://github.com/ckan/ckan/commit/c4c147234fd812d70f278192bf7c7b9f8bb4bbf1
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    R ckan/i18n/fr/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  remove French ckan.mo


  Commit: cfabc50b4f64e5421fa6c3c95dc9fd66d036072c
      https://github.com/ckan/ckan/commit/cfabc50b4f64e5421fa6c3c95dc9fd66d036072c
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M .gitignore
    R ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #24 from wardi/canada-v2.0

restore CKAN's original French ckan.po, remove its .mo and add that .mo to .gitignore


  Commit: 9e676358636f7edf075ee937615cbf1a7556efb3
      https://github.com/ckan/ckan/commit/9e676358636f7edf075ee937615cbf1a7556efb3
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  allow resource-create save action of returning to dataset search page


  Commit: 40759c3e3a872f8763cdbcad922be6c93362ee9b
      https://github.com/ckan/ckan/commit/40759c3e3a872f8763cdbcad922be6c93362ee9b
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Revert "[#925] Fix login flash message language"

This reverts commit c01493599ac07f4115517b108693df1f4c3df8d7.


  Commit: 75fbb2cae8c4f3e77aa08226e1e9f5ebb972c5ac
      https://github.com/ckan/ckan/commit/75fbb2cae8c4f3e77aa08226e1e9f5ebb972c5ac
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/config/who.ini

  Log Message:
  -----------
  Revert "who.ini: remove post_login_url/post_logout_url settings"

This reverts commit 0fe709c07b1efa8d649a03365fa631574ea2122c.


  Commit: b567da2c52a7be93a50e52c3aba3c2740cd8699a
      https://github.com/ckan/ckan/commit/b567da2c52a7be93a50e52c3aba3c2740cd8699a
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Revert "after login redirect to dataset search not user page"

This reverts commit 36d4f462abde83ece145b0c07aaf82c29d1e6499.


  Commit: cb41335be6fbe230b849049ca9d342babb243918
      https://github.com/ckan/ckan/commit/cb41335be6fbe230b849049ca9d342babb243918
  Author: Toby <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#925] save our language in the session so we don't lose it


  Commit: 2c08f719d65a378a43069c089c1b216f9a20846b
      https://github.com/ckan/ckan/commit/2c08f719d65a378a43069c089c1b216f9a20846b
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  add flash message "A resource has been added"


  Commit: fd7d55f5436b8ed2cc4505106d6f15e6f7a9ed9e
      https://github.com/ckan/ckan/commit/fd7d55f5436b8ed2cc4505106d6f15e6f7a9ed9e
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/config/who.ini
    M ckan/controllers/package.py
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #25 from wardi/canada-v2.0

more resource_create customization, less user login customization


  Commit: 43f6b8f7bd81b58bb7f6cba942eee86978be70ff
      https://github.com/ckan/ckan/commit/43f6b8f7bd81b58bb7f6cba942eee86978be70ff
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/environment.py
    M ckan/lib/helpers.py
    M ckan/logic/auth/get.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/main.debug.min.css
    M ckan/public/base/css/main.min.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/maroon.min.css
    M ckan/public/base/css/red.css
    M ckan/public/base/css/red.min.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/autocomplete.min.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/javascript/modules/confirm-action.min.js
    M ckan/public/base/less/layout.less
    M doc/conf.py
    M doc/install-from-package.rst
    A doc/upgrading-a-package-install.rst

  Log Message:
  -----------
  Merge pull request #26 from okfn/release-v2.0.1

merge Release v2.0.1


  Commit: 01abaa5ccb9aa513576be8438803e5f6e521fd2b
      https://github.com/ckan/ckan/commit/01abaa5ccb9aa513576be8438803e5f6e521fd2b
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/new_authz.py

  Log Message:
  -----------
  extract anon_create_user change from 356-auth-create-user-option branch


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

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/new_authz.py

  Log Message:
  -----------
  Merge pull request #27 from wardi/canada-v2.0

extract new anon_create_user config option from 356-auth-create-user-option branch


  Commit: 6974266e8b17691431c409f1135dcf2f42e5c8ad
      https://github.com/ckan/ckan/commit/6974266e8b17691431c409f1135dcf2f42e5c8ad
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  workaround for intermittent package search failure


  Commit: 4fa3e7700394c257ce02ec807d8ab1e3d987df6f
      https://github.com/ckan/ckan/commit/4fa3e7700394c257ce02ec807d8ab1e3d987df6f
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  expose SOLR range facets in search results


  Commit: 5ef0435d3cdbc21b76562a8573b130bda7a6d2a3
      https://github.com/ckan/ckan/commit/5ef0435d3cdbc21b76562a8573b130bda7a6d2a3
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #28 from wardi/canada-v2.0

workaround for intermittent package search failure


  Commit: 19233a5e50cae7e8cbe02e0ad52712861598395c
      https://github.com/ckan/ckan/commit/19233a5e50cae7e8cbe02e0ad52712861598395c
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  properly parse range facet url parameters into the filter query


  Commit: 1eacb2d19481d46ee8923f403826c0fd25120738
      https://github.com/ckan/ckan/commit/1eacb2d19481d46ee8923f403826c0fd25120738
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch 'canada-v2.0' of github.com:open-data/ckan into canada-v2.0

Conflicts:
	ckan/controllers/package.py


  Commit: c51cfea754b446ed28d5544231e0103d037f2076
      https://github.com/ckan/ckan/commit/c51cfea754b446ed28d5544231e0103d037f2076
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  improper conflict resolution


  Commit: 178d290bf947c30af760bff6f5565cd580d4d310
      https://github.com/ckan/ckan/commit/178d290bf947c30af760bff6f5565cd580d4d310
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge pull request #29 from deniszgonjanin/canada-v2.0

expose solr range facets in a basic way


  Commit: 479aee4eb1f930135365057dd9884f7e04d30436
      https://github.com/ckan/ckan/commit/479aee4eb1f930135365057dd9884f7e04d30436
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
   #700 add muliprocessing reindex


  Commit: ceb16526f62bf6c79004b99562ee73c999ba1180
      https://github.com/ckan/ckan/commit/ceb16526f62bf6c79004b99562ee73c999ba1180
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  #700 fix so all processes join


  Commit: 70ea50fc9e6c82da36a827a2b0887cd91a1ef00d
      https://github.com/ckan/ckan/commit/70ea50fc9e6c82da36a827a2b0887cd91a1ef00d
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  rebuild_fast in package id order


  Commit: f7ca08b3e79d937204f74c65f0df12280f1b5e83
      https://github.com/ckan/ckan/commit/f7ca08b3e79d937204f74c65f0df12280f1b5e83
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #30 from wardi/canada-v2.0

rebuild_fast re-merge and ordering


  Commit: d18ffbe18b943db443029e09160100e8f099032a
      https://github.com/ckan/ckan/commit/d18ffbe18b943db443029e09160100e8f099032a
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

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

  Log Message:
  -----------
  [#1078] use SOLR data_dict instead of package_dictize when possible


  Commit: ed1766921259346d70f5e8453f00fdc13d8ffb8d
      https://github.com/ckan/ckan/commit/ed1766921259346d70f5e8453f00fdc13d8ffb8d
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

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

  Log Message:
  -----------
  [#1078] fall back to package_dictize on SearchError


  Commit: a85788e8c0d6caace45a7839b533007ce0746d7c
      https://github.com/ckan/ckan/commit/a85788e8c0d6caace45a7839b533007ce0746d7c
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

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

  Log Message:
  -----------
  [#1078] treat socket errors as solr lookup failure


  Commit: 630ee7650c717ad11e1be8e4973fb16c588d32bc
      https://github.com/ckan/ckan/commit/630ee7650c717ad11e1be8e4973fb16c588d32bc
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

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

  Log Message:
  -----------
  [#1078] don't use cache if schema passed


  Commit: 1f257276ebbbc6a16cf5fc04b98027fd672d3c27
      https://github.com/ckan/ckan/commit/1f257276ebbbc6a16cf5fc04b98027fd672d3c27
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

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

  Log Message:
  -----------
  [#1078] don't use cache if different revision


  Commit: e5811058913da6e3527b5bf1dc6d377b976d52b1
      https://github.com/ckan/ckan/commit/e5811058913da6e3527b5bf1dc6d377b976d52b1
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M ckan/lib/search/__init__.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#1078] don't use cache when indexing


  Commit: e5ea3cfb8ae1cd170ed16edab9dcf226f4ce66bc
      https://github.com/ckan/ckan/commit/e5ea3cfb8ae1cd170ed16edab9dcf226f4ce66bc
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

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

  Log Message:
  -----------
  [#1078] fix for before_view with cached dataset


  Commit: fa2bb0bc0499ae631d690a446277d036a61503d1
      https://github.com/ckan/ckan/commit/fa2bb0bc0499ae631d690a446277d036a61503d1
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#1078] move before_view plugin from dictize to action, feels more consistent


  Commit: 537d3a2454a61f6c506a992f109005aed41dbb33
      https://github.com/ckan/ckan/commit/537d3a2454a61f6c506a992f109005aed41dbb33
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

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

  Log Message:
  -----------
  search-index rebuild -r: use cache


  Commit: 017fe02fbe4366dd44e96cade4a95b66e59b99c7
      https://github.com/ckan/ckan/commit/017fe02fbe4366dd44e96cade4a95b66e59b99c7
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  search-index rebuild_fast: use -r


  Commit: 7541ab8b3c46d31bc7b4dab1ad050510050b4f78
      https://github.com/ckan/ckan/commit/7541ab8b3c46d31bc7b4dab1ad050510050b4f78
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/search/__init__.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge pull request #31 from wardi/faster-reindex

Make search-index rebuild -r and rebuild_fast faster


  Commit: ac7b457e3d00f3899fb7317227603bf8009973bf
      https://github.com/ckan/ckan/commit/ac7b457e3d00f3899fb7317227603bf8009973bf
  Author: Ian Ward <ian at excess.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ckan/__init__.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/celery_app.py
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/footer.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base.html
    M ckan/templates/package/search.html
    M ckan/tests/functional/test_user.py
    M ckanext/datastore/db.py
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release-v2.0.2' into canada-v2.0


  Commit: c5288dcdbd4daf4b8d38f76a6dc9942d74e00184
      https://github.com/ckan/ckan/commit/c5288dcdbd4daf4b8d38f76a6dc9942d74e00184
  Author: Ian Ward <ian at excess.org>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ckan/__init__.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/celery_app.py
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/footer.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base.html
    M ckan/templates/package/search.html
    M ckan/tests/functional/test_user.py
    M ckanext/datastore/db.py
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Merge pull request #32 from wardi/canada-v2.0

merge with 2.0.2 changes


  Commit: 2526747c2e5161daeef938a609d6a9ad985805e5
      https://github.com/ckan/ckan/commit/2526747c2e5161daeef938a609d6a9ad985805e5
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  helper for generating canonical urls for SEO purposes


  Commit: 784040e586087fc28da044bc91077cc7b29c4b39
      https://github.com/ckan/ckan/commit/784040e586087fc28da044bc91077cc7b29c4b39
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckan/__init__.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/search/__init__.py
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/footer.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base.html
    M ckan/templates/package/search.html
    M ckan/tests/functional/test_user.py
    M ckanext/datastore/db.py
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Merge branch 'canada-v2.0' of github.com:open-data/ckan into canada-v2.0


  Commit: c87942574d2101caa58dee3788d4ebb3c3e5a262
      https://github.com/ckan/ckan/commit/c87942574d2101caa58dee3788d4ebb3c3e5a262
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #33 from deniszgonjanin/canada-v2.0

Canonical urls for search pages


  Commit: aa595c95d80e5d2077b526b14e24b0b41210d593
      https://github.com/ckan/ckan/commit/aa595c95d80e5d2077b526b14e24b0b41210d593
  Author: Ian Ward <ian at excess.org>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/update.py
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  Merge tag 'ckan-2.0.2' into canada-v2.0

[release]: Release tag


  Commit: 5cfbd0350cd87d3a51eec94abeda834a32cd6332
      https://github.com/ckan/ckan/commit/5cfbd0350cd87d3a51eec94abeda834a32cd6332
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  take name of the controller when computing search url


  Commit: f26ba62a2545c1e1403b5a1d66ac09a676ee15d0
      https://github.com/ckan/ckan/commit/f26ba62a2545c1e1403b5a1d66ac09a676ee15d0
  Author: @deniszgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/update.py
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  Merge branch 'canada-v2.0' of github.com:open-data/ckan into canada-v2.0


  Commit: 2a8d3006aef84b212ab92bfa7c17533430162d32
      https://github.com/ckan/ckan/commit/2a8d3006aef84b212ab92bfa7c17533430162d32
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2013-08-27 (Tue, 27 Aug 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #34 from deniszgonjanin/canada-v2.0

take into account the name of the controller when computing search url


  Commit: 43e131d31910a128da700a04099dc84b57a07194
      https://github.com/ckan/ckan/commit/43e131d31910a128da700a04099dc84b57a07194
  Author: Ian Ward <ian at excess.org>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  remove dashboard_new_activities count


  Commit: 615aa61cae818944182be28f0971a9886c16d777
      https://github.com/ckan/ckan/commit/615aa61cae818944182be28f0971a9886c16d777
  Author: Ian Ward <ian at excess.org>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Merge pull request #35 from wardi/canada-v2.0

avoid slow dashboard_new_activities_count call on every request


  Commit: 6afd371b45ef5187592261066da29c55a9701182
      https://github.com/ckan/ckan/commit/6afd371b45ef5187592261066da29c55a9701182
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/lib/accept.py

  Log Message:
  -----------
  fix for 500 error on HTTP-ACCEPT: text/plain


  Commit: a5d55fa145f7ef988f36c5ea705747bea9e44176
      https://github.com/ckan/ckan/commit/a5d55fa145f7ef988f36c5ea705747bea9e44176
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/lib/accept.py

  Log Message:
  -----------
  Merge pull request #36 from wardi/canada-v2.0

fix for 500 error on HTTP-ACCEPT: text/plain


  Commit: a39a9aca79615c99791992c475a800b6634580e8
      https://github.com/ckan/ckan/commit/a39a9aca79615c99791992c475a800b6634580e8
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  fix for 500 error on non-int int query parameters


  Commit: 4cd96585877946bd4b0c40bf0ae1d1920ebd3754
      https://github.com/ckan/ckan/commit/4cd96585877946bd4b0c40bf0ae1d1920ebd3754
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #37 from wardi/canada-v2.0

fix for 500 error on non-int int query parameters


  Commit: 16ffb33bc8b085b8bdf792ba454539ede101a888
      https://github.com/ckan/ckan/commit/16ffb33bc8b085b8bdf792ba454539ede101a888
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  fix for local use of datastore api


  Commit: 33eb3ef32caeca996431642555c8dae1d251c806
      https://github.com/ckan/ckan/commit/33eb3ef32caeca996431642555c8dae1d251c806
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge pull request #38 from wardi/canada-v2.0

fix for local use of datastore api


  Commit: d026878787eafbac5a85ce388c7e2c5ee8c266c8
      https://github.com/ckan/ckan/commit/d026878787eafbac5a85ce388c7e2c5ee8c266c8
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M ckan/controllers/organization.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1281] DefaultOrganizationForm instead of hard-coded values in controller


  Commit: e2a475a1af071d33242189893c4593cd75d7a18e
      https://github.com/ckan/ckan/commit/e2a475a1af071d33242189893c4593cd75d7a18e
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#1281] call setup_template_variables in group/org view() and about()


  Commit: 6816cd4315253b26e271b7075919f8d3b0af8419
      https://github.com/ckan/ckan/commit/6816cd4315253b26e271b7075919f8d3b0af8419
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  fix local use of datastore api without try, except


  Commit: 3b645817c76c0b08824ec9cf6953dd0b053ce6bb
      https://github.com/ckan/ckan/commit/3b645817c76c0b08824ec9cf6953dd0b053ce6bb
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M ckan/tests/lib/test_accept.py

  Log Message:
  -----------
  no longer sending text/plain versions of datasets


  Commit: 071825c5d36a91902c067933d7a8e1071ef74baa
      https://github.com/ckan/ckan/commit/071825c5d36a91902c067933d7a8e1071ef74baa
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/plugins.py
    M ckan/tests/lib/test_accept.py
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge pull request #39 from wardi/canada-v2.0

changes to support org customizations and other fixes


  Commit: 0b08f9a9eda2ffa7bdae25e820c09f2554e2a2b1
      https://github.com/ckan/ckan/commit/0b08f9a9eda2ffa7bdae25e820c09f2554e2a2b1
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Log Message:
  -----------
  Merge tag 'ckan-2.0.2' into canada-v2.1

merge -s ours differences between upstream ckan release


  Commit: 23d7bd36e3b2c233ed5774a7fd4a8f9508589578
      https://github.com/ckan/ckan/commit/23d7bd36e3b2c233ed5774a7fd4a8f9508589578
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M .gitignore
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    R ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/lib/accept.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/new_authz.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/db.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'canada-v2.0' into canada-v2.1

Conflicts:
	ckan/controllers/group.py
	ckan/controllers/organization.py
	ckan/controllers/user.py
	ckan/i18n/fr/LC_MESSAGES/ckan.mo
	ckan/lib/cli.py
	ckan/lib/helpers.py
	ckan/lib/search/__init__.py
	ckan/logic/action/get.py
	ckan/logic/validators.py
	ckan/tests/schema/test_schema.py
	ckanext/datastore/db.py


  Commit: ba5a2d6757de7e7115f72f16303cb3ad33e5c5aa
      https://github.com/ckan/ckan/commit/ba5a2d6757de7e7115f72f16303cb3ad33e5c5aa
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  add default_show_group_schema for customizing group show


  Commit: 3b7f1a9e41fb74dc10f4cc8245f7de539fe1a5b5
      https://github.com/ckan/ckan/commit/3b7f1a9e41fb74dc10f4cc8245f7de539fe1a5b5
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  fix default_show_group_schema for convert_from_extras use


  Commit: cb1ef85a57e92505f0eb5da07daffe7c8834295c
      https://github.com/ckan/ckan/commit/cb1ef85a57e92505f0eb5da07daffe7c8834295c
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/__init__.py
    M ckan/config/middleware.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/new_authz.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/client.min.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/main.min.js
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  Merge tag 'ckan-2.1.1' into canada-v2.1


  Commit: 81f62a87819359404adf7f17eb5147080801f2d6
      https://github.com/ckan/ckan/commit/81f62a87819359404adf7f17eb5147080801f2d6
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  pass group_type to setup_template_variables plugin call


  Commit: 36f45b8bebc90ede0bc8759b46d65811c8cf9cc4
      https://github.com/ckan/ckan/commit/36f45b8bebc90ede0bc8759b46d65811c8cf9cc4
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckanext/multilingual/solr/schema.xml

  Log Message:
  -----------
  [#1078] store show_package_schema-validated data_dict in SOLR


  Commit: d77920fba1b025c17a635a04897c12e93a8f2023
      https://github.com/ckan/ckan/commit/d77920fba1b025c17a635a04897c12e93a8f2023
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

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

  Log Message:
  -----------
  [#1078] package index: treat missing type as default type


  Commit: fc69eab2d01f10cc22d9e773a632568f53108abd
      https://github.com/ckan/ckan/commit/fc69eab2d01f10cc22d9e773a632568f53108abd
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

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

  Log Message:
  -----------
  [#1078] validated data dict store missing as null


  Commit: a85dd49d45ade54999f372ebda958d53e6361530
      https://github.com/ckan/ckan/commit/a85dd49d45ade54999f372ebda958d53e6361530
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

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

  Log Message:
  -----------
  [#1078] data_dict may still be used when schema passed


  Commit: 709bc61f4eaee86ece6cd5e54969ce09d8bbd224
      https://github.com/ckan/ckan/commit/709bc61f4eaee86ece6cd5e54969ce09d8bbd224
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckanext/multilingual/solr/schema.xml

  Log Message:
  -----------
  Merge pull request #40 from wardi/canada-v2.1

back-port package_show performance pt 2


  Commit: 350d3d6d0f71f6215906ef60e8808bb504d02232
      https://github.com/ckan/ckan/commit/350d3d6d0f71f6215906ef60e8808bb504d02232
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/__init__.py
    M ckan/config/middleware.py
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/new_authz.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/client.min.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/main.min.js
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  Merge remote-tracking branch 'opendata/canada-v2.1' into canada-scheming-support


  Commit: c319f57bd4eff319ef4b6a94daa0ab054d414a7d
      https://github.com/ckan/ckan/commit/c319f57bd4eff319ef4b6a94daa0ab054d414a7d
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  fix access of organizations through /group url


  Commit: 5d65f2114643313a2c5b22f998224b3d3788d557
      https://github.com/ckan/ckan/commit/5d65f2114643313a2c5b22f998224b3d3788d557
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge pull request #41 from wardi/canada-v2.1

fix access of organizations through /group url


  Commit: 9dbb6d90f78d162c64a9cd0b57ddd1ad58220852
      https://github.com/ckan/ckan/commit/9dbb6d90f78d162c64a9cd0b57ddd1ad58220852
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  fix resource_dict_save for field values matching .format


  Commit: 0a01dc0b58357f32b428417fb79768d98aa2fe3f
      https://github.com/ckan/ckan/commit/0a01dc0b58357f32b428417fb79768d98aa2fe3f
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  Merge pull request #42 from wardi/canada-v2.1

fix resource_dict_save for field values matching .format


  Commit: 91e9a08700517f3dae28cd772cb4346cb84b7b59
      https://github.com/ckan/ckan/commit/91e9a08700517f3dae28cd772cb4346cb84b7b59
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

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

  Log Message:
  -----------
  [#1400] allow overriding dataset, group, org validation


  Commit: 3313c54b0fc3bfc2e719fc05b72b9a313f7fa52b
      https://github.com/ckan/ckan/commit/3313c54b0fc3bfc2e719fc05b72b9a313f7fa52b
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1400] fix import


  Commit: f5189ec5d16e89a843a20adf855999a1282aef99
      https://github.com/ckan/ckan/commit/f5189ec5d16e89a843a20adf855999a1282aef99
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

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

  Log Message:
  -----------
  [#1400] remove leading _ from validate()


  Commit: 9b250ad99b6c19cb33013f49781b20b863260bdf
      https://github.com/ckan/ckan/commit/9b250ad99b6c19cb33013f49781b20b863260bdf
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

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

  Log Message:
  -----------
  [#1400] pass actual action name to pluigin.validate method


  Commit: a10b14446882f47035073f7bd294a66f011a5a1a
      https://github.com/ckan/ckan/commit/a10b14446882f47035073f7bd294a66f011a5a1a
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

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

  Log Message:
  -----------
  [#1400] add navl_validate to plugins.toolkit

Conflicts:
	ckan/plugins/toolkit.py


  Commit: 3b1c8932beb0950a364ea8ea34f176199b1bcc7b
      https://github.com/ckan/ckan/commit/3b1c8932beb0950a364ea8ea34f176199b1bcc7b
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1400] remove leading _ from the other validate()


  Commit: 00fd9b3f6dfecd76ef3d12ccf7b8532387ad6a6a
      https://github.com/ckan/ckan/commit/00fd9b3f6dfecd76ef3d12ccf7b8532387ad6a6a
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

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

  Log Message:
  -----------
  [#1400] plugin backwards compatibility


  Commit: a46b98fca01e8db09c60cc5695b43445c5bcba9c
      https://github.com/ckan/ckan/commit/a46b98fca01e8db09c60cc5695b43445c5bcba9c
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#1400] add validate() to IDatasetForm and IGroupForm


  Commit: f06c5238f5c3991ee0b86452a440a9205460f160
      https://github.com/ckan/ckan/commit/f06c5238f5c3991ee0b86452a440a9205460f160
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#1400] use context, data_dict param order


  Commit: 91b3a398e891c48f45db604753f6bb2967a7dae6
      https://github.com/ckan/ckan/commit/91b3a398e891c48f45db604753f6bb2967a7dae6
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1400] validate() now part of interface, returns None if not defined


  Commit: d4f90737bbe994ebfce5adb39f128bf85bc2b9cd
      https://github.com/ckan/ckan/commit/d4f90737bbe994ebfce5adb39f128bf85bc2b9cd
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1400] belt and suspenders


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

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Revert "fix local use of datastore api without try, except"

This reverts commit 6816cd4315253b26e271b7075919f8d3b0af8419.

Conflicts:
	ckanext/datastore/db.py


  Commit: 80837982ef5b8e4af8621e5115a6987c646522eb
      https://github.com/ckan/ckan/commit/80837982ef5b8e4af8621e5115a6987c646522eb
  Author: Ian Ward <ian at excess.org>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge pull request #43 from wardi/canada-scheming-support

Support for ATI organization updates and local datastore use


  Commit: f4070d25519cc932f9e5cf155daed9242b47a344
      https://github.com/ckan/ckan/commit/f4070d25519cc932f9e5cf155daed9242b47a344
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#1208] Use search to get datasets on group_show

Use the search rather than query the db.

Instead of returning the whole package dict, pick the fields to match
the ones currently returned by the API.


  Commit: 1a99105db2562689131a80dbb87438c0262380b0
      https://github.com/ckan/ckan/commit/1a99105db2562689131a80dbb87438c0262380b0
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  [#1208] Do not query datasets on group_show from the controller

When dictizing the group as requested from the controller, don't query
Solr for datasets as they will be ignored and get requested on the
controller later on anyway


  Commit: 612f6994cc2371ed9bee2815faa05a77c13b5bd4
      https://github.com/ckan/ckan/commit/612f6994cc2371ed9bee2815faa05a77c13b5bd4
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#1208] Return whole dicts on package listing for group_show

The reason is that this is consistent with other package listings
(tag_show, package_search) and at the same time is backwards compatible
as it keeps all the existing fields.

Users would be able to choose not to return the packages list.


  Commit: 037e11ee1df788d90d1fee50ec76f93f2a4da00c
      https://github.com/ckan/ckan/commit/037e11ee1df788d90d1fee50ec76f93f2a4da00c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#1208] Allow users to not request the dataset listing on group_show


  Commit: 128f899afae192060d4474000a3012155376fc25
      https://github.com/ckan/ckan/commit/128f899afae192060d4474000a3012155376fc25
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#1208] Ignore __junk field in group schema

It surfaced on the tests due to the new list fields (resources, tags...)
in the group's datasets


  Commit: 43eb05057c9f0a18a8fd1af475f1e245438c1c5e
      https://github.com/ckan/ckan/commit/43eb05057c9f0a18a8fd1af475f1e245438c1c5e
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  [#1208] Fix wrong logic for search params


  Commit: 38a007114546b87741b7fe06e4c429d2c10bbdf9
      https://github.com/ckan/ckan/commit/38a007114546b87741b7fe06e4c429d2c10bbdf9
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

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

  Log Message:
  -----------
  [#1208] More robust boolean param handling


  Commit: 41f690344c217ff2d5ecd5dbebce46001e806b92
      https://github.com/ckan/ckan/commit/41f690344c217ff2d5ecd5dbebce46001e806b92
  Author: Ian Ward <ian at excess.org>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge pull request #44 from wardi/canada-v2.1

organization_show: backport datasets from solr, add include_datasets option


  Commit: 4b5d5ab56d172fc1d63e47f096278b204ea51af1
      https://github.com/ckan/ckan/commit/4b5d5ab56d172fc1d63e47f096278b204ea51af1
  Author: Ian Ward <ian at excess.org>
  Date:   2014-03-05 (Wed, 05 Mar 2014)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  duplicate extras save workardound


  Commit: 752ac371a3dce71b191ef1b08c3eed2f07cebf9d
      https://github.com/ckan/ckan/commit/752ac371a3dce71b191ef1b08c3eed2f07cebf9d
  Author: Ian Ward <ian at excess.org>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/__init__.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/validators.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/main.debug.min.css
    M ckan/public/base/css/main.min.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/maroon.min.css
    M ckan/public/base/css/red.css
    M ckan/public/base/css/red.min.css
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/custom-fields.min.js
    M ckan/public/base/less/layout.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    M ckan/templates/organization/read.html
    M ckan/tests/functional/test_related.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  Merge tag 'ckan-2.1.2' into canada-v2.1

[release]: Release tag

Conflicts:
	ckan/controllers/group.py


  Commit: cd41d01eeca1b119201aff1b96f7d37603cbda74
      https://github.com/ckan/ckan/commit/cd41d01eeca1b119201aff1b96f7d37603cbda74
  Author: Ian Ward <ian at excess.org>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M bin/travis-build
    M ckan/__init__.py
    M ckan/controllers/group.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/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.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/ne/LC_MESSAGES/ckan.mo
    A ckan/i18n/ne/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/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
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/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/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/templates/group/read.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_resource_search.py
    M ckanext/datastore/db.py
    A ckanext/datastore/helpers.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    A ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/multilingual/plugin.py
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/stats/__init__.py
    M dev-requirements.txt
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge tag 'ckan-2.1.3' into canada-v2.1

[release]: Release tag

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


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

  Log Message:
  -----------
  Merge tag 'ckan-2.1.3' into canada-v2.3

[release]: Release tag


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

  Changed paths:
    M .gitignore
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    R ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'canada-v2.1' into canada-v2.3

Conflicts:
	ckan/controllers/group.py
	ckan/i18n/fr/LC_MESSAGES/ckan.mo
	ckan/lib/accept.py
	ckan/lib/base.py
	ckan/lib/dictization/model_dictize.py
	ckan/lib/dictization/model_save.py
	ckan/lib/plugins.py
	ckan/lib/search/__init__.py
	ckan/lib/search/index.py
	ckan/logic/action/create.py
	ckan/logic/action/get.py
	ckan/logic/action/update.py
	ckan/logic/auth/create.py
	ckan/logic/schema.py
	ckan/new_authz.py
	ckan/plugins/interfaces.py
	ckan/plugins/toolkit.py
	ckan/tests/lib/test_dictization.py
	ckan/tests/logic/test_action.py
	ckanext/datastore/db.py


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

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/search/query.py

  Log Message:
  -----------
  remove some whitespace differences with master


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

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

  Log Message:
  -----------
  fix UnboundLocalError


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

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  remove wsgi profiling hook


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  remove extra local difference from master


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

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  remove whitespace difference from master


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  remote GroupController difference from master


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

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  remove package_dict_save difference from master (changed approach in our ext)


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

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

  Log Message:
  -----------
  remove unused search/index difference from master


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

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

  Log Message:
  -----------
  remove whitespace differences from master in search/query


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

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

  Log Message:
  -----------
  remove whitespace difference from master in search/index


  Commit: 19828a5f31bc13388d5be492f7d9228cf782b427
      https://github.com/ckan/ckan/commit/19828a5f31bc13388d5be492f7d9228cf782b427
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M .gitignore
    A ckan/i18n/fr/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  reduce master diff:we build .mo file outside ckan source dir now


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

  Changed paths:
    M .tx/config
    M MANIFEST.in
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/controllers/related.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/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/munge.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/075_rename_view_plugins.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_datapreview.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    M ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/less/ckan.less
    M ckan/templates/group/snippets/info.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/new_user_form.html
    M ckan/tests/functional/api/test_activity.py
    R ckan/tests/lib/test_datapreview.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    A ckanext/datapusher/tests/test_default_views.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 ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/resourceproxy/controller.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/installing/deployment.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'release-v2.3' into canada-v2.3


  Commit: 39696237f5b61b6604ce923ffcac9bc7b2d15e65
      https://github.com/ckan/ckan/commit/39696237f5b61b6604ce923ffcac9bc7b2d15e65
  Author: Ian Ward <ian at excess.org>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.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
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/resource_view.py
    M ckan/model/user.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/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    M ckan/new_tests/model/test_resource.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/logic/test_action.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datastore/db.py
    M ckanext/imageview/plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M 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 setup.py

  Log Message:
  -----------
  Merge branch 'release-v2.3' into canada-v2.3


  Commit: 02e2ed17a8ef06184e90f079d13d43a708731bf0
      https://github.com/ckan/ckan/commit/02e2ed17a8ef06184e90f079d13d43a708731bf0
  Author: Ian Ward <ian at excess.org>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  ignore revision_id passed to resources


  Commit: a1ef83813a7f6489f826111523c48b363da2a0a6
      https://github.com/ckan/ckan/commit/a1ef83813a7f6489f826111523c48b363da2a0a6
  Author: Ian Ward <ian at excess.org>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.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
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/resource_view.py
    M ckan/model/user.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/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_delete.py
    M ckan/new_tests/model/test_resource.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/logic/test_action.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datastore/db.py
    M ckanext/imageview/plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M 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 setup.py

  Log Message:
  -----------
  Merge pull request #47 from wardi/canada-v2.3

merge 2.3 release, ignore revision_id on resources


  Commit: 4886749780af8922ada26ea94932b5903d5b3663
      https://github.com/ckan/ckan/commit/4886749780af8922ada26ea94932b5903d5b3663
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#2647] user_show include_password_hash parameter

Conflicts:
	ckan/lib/dictization/model_dictize.py
	ckan/logic/action/get.py


  Commit: 5675bafe47961a53b930717a0e7ab773358de7f5
      https://github.com/ckan/ckan/commit/5675bafe47961a53b930717a0e7ab773358de7f5
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

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

  Log Message:
  -----------
  [#2647] user_create accept password_hash from sysadmin


  Commit: e0dfe66168bb90cd3d2849eed8b81d11209d50c4
      https://github.com/ckan/ckan/commit/e0dfe66168bb90cd3d2849eed8b81d11209d50c4
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

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

  Log Message:
  -----------
  switch back to new_authz


  Commit: c1e0b478c315d1c6bf955b89f72a968cb683903f
      https://github.com/ckan/ckan/commit/c1e0b478c315d1c6bf955b89f72a968cb683903f
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

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

  Log Message:
  -----------
  [#2647] user_update accept password_hash from sysadmin


  Commit: 6e959b0afe4692a11c344830d66008acac6ab4ab
      https://github.com/ckan/ckan/commit/6e959b0afe4692a11c344830d66008acac6ab4ab
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

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

  Log Message:
  -----------
  switch back to new_authz


  Commit: 6800db9d7d82df4b959a033965e102f9c5032fe5
      https://github.com/ckan/ckan/commit/6800db9d7d82df4b959a033965e102f9c5032fe5
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#2647] fix check for password_hash in user_password_not_empty

Conflicts:
	ckan/logic/validators.py


  Commit: a705b25419c893ab2e43a0f7ae6e68f1299d3bbe
      https://github.com/ckan/ckan/commit/a705b25419c893ab2e43a0f7ae6e68f1299d3bbe
  Author: Ian Ward <ian at excess.org>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  Merge pull request #53 from wardi/canada-v2.3

allow exporting and importing users, with their passwords: backport (2.3)


  Commit: 14f5aed7722332b1882edd96814494d996c8af53
      https://github.com/ckan/ckan/commit/14f5aed7722332b1882edd96814494d996c8af53
  Author: Ian Ward <ian at excess.org>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

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

  Log Message:
  -----------
  [#2696] errors block for resource_form to match package_form


  Commit: 1de65824f6566f16f49aa97a2c988935b7609fb8
      https://github.com/ckan/ckan/commit/1de65824f6566f16f49aa97a2c988935b7609fb8
  Author: Ian Ward <ian at excess.org>
  Date:   2015-12-28 (Mon, 28 Dec 2015)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  paster profile URL [user]


  Commit: bf3437e5fe15d17fab67fa78f4fb0161774ef22e
      https://github.com/ckan/ckan/commit/bf3437e5fe15d17fab67fa78f4fb0161774ef22e
  Author: Ross Thompson <ross.thompson at statcan.gc.ca>
  Date:   2016-01-09 (Sat, 09 Jan 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2746] Simplify test for empty or missing value in markdown_extract


  Commit: 2d00a0afd1d4928b82041da7b8fb8e8c6696d63d
      https://github.com/ckan/ckan/commit/2d00a0afd1d4928b82041da7b8fb8e8c6696d63d
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-03-07 (Mon, 07 Mar 2016)

  Changed paths:
    M .travis.yml
    A bin/postgres_init/1_create_ckan_db.sh
    A bin/postgres_init/2_create_ckan_datastore_db.sh
    M bin/travis-install-dependencies

  Log Message:
  -----------
  Added scripts for initializing the database

These scripts can be reused by docker containers


  Commit: f131db9c628150bc7774df9b5ff8251b9c8cdda9
      https://github.com/ckan/ckan/commit/f131db9c628150bc7774df9b5ff8251b9c8cdda9
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-03-15 (Tue, 15 Mar 2016)

  Changed paths:
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  Prevents HTML5 client-side validation from interfering with CKAN validation


  Commit: d490076746bc6a3e3dfacde488b74279eaf6642f
      https://github.com/ckan/ckan/commit/d490076746bc6a3e3dfacde488b74279eaf6642f
  Author: Ian Ward <ian at excess.org>
  Date:   2016-03-15 (Tue, 15 Mar 2016)

  Changed paths:
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  Merge pull request #61 from LaurentGoderre/backport-2917

Prevents HTML5 client-side validation from interfering with CKAN validation


  Commit: 98a7a70bd3a4e221e59d3bc322670dd4337194fd
      https://github.com/ckan/ckan/commit/98a7a70bd3a4e221e59d3bc322670dd4337194fd
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  Added the ability to specify translations for the default language

ckan/ckan#2909


  Commit: 21a8f469857a64fa868e030de2c3d554b0fc836d
      https://github.com/ckan/ckan/commit/21a8f469857a64fa868e030de2c3d554b0fc836d
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  Merge pull request #63 from LaurentGoderre/backport-2909

Added the ability to specify translations for the default language


  Commit: 4d980f297db17deb05c7eff19e8c2f5150c6d925
      https://github.com/ckan/ckan/commit/4d980f297db17deb05c7eff19e8c2f5150c6d925
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-03-23 (Wed, 23 Mar 2016)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Made the user list limit configurable

Backports ckan/ckan#2929


  Commit: 905f4ca78456c30ffa3b3ffe5e610e2a24643660
      https://github.com/ckan/ckan/commit/905f4ca78456c30ffa3b3ffe5e610e2a24643660
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge pull request #64 from LaurentGoderre/backport-2929

Made the user list limit configurable


  Commit: dbb36c56a15de2708dc0d06e9176c8b3ff7550b9
      https://github.com/ckan/ckan/commit/dbb36c56a15de2708dc0d06e9176c8b3ff7550b9
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Added the missing alt attribute for the gravatar

A missing alt text is a WCAG 2.0 failure


  Commit: bba1337163bf5c7aa9b8451de88e944ae13a61a4
      https://github.com/ckan/ckan/commit/bba1337163bf5c7aa9b8451de88e944ae13a61a4
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #66 from LaurentGoderre/backport-2947

Added the missing alt attribute for the gravatar


  Commit: 12fd084d136f6531f36a0348b1368be970c236ae
      https://github.com/ckan/ckan/commit/12fd084d136f6531f36a0348b1368be970c236ae
  Author: joetsoi <joetsoi at users.noreply.github.com>
  Date:   2016-04-13 (Wed, 13 Apr 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  [#2678] Add core translation get_translated helper

Change package templates to use helper

Conflicts:
	ckan/lib/helpers.py
	ckan/templates/package/confirm_delete.html
	ckan/templates/package/read.html


  Commit: 8d2e7ce4f95be2562c0ce7f1a95eaddad12a9c53
      https://github.com/ckan/ckan/commit/8d2e7ce4f95be2562c0ce7f1a95eaddad12a9c53
  Author: Ian Ward <ian at excess.org>
  Date:   2016-04-18 (Mon, 18 Apr 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/canada-v2.3' into canada-v2.3


  Commit: 3ba76e18bf19e210ab3345c192212d2d49b8cc5b
      https://github.com/ckan/ckan/commit/3ba76e18bf19e210ab3345c192212d2d49b8cc5b
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Fix broken root_path implementation


  Commit: 6148c25b17c556a65866b9f87bd9e22406ef697c
      https://github.com/ckan/ckan/commit/6148c25b17c556a65866b9f87bd9e22406ef697c
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Fixed the url_for_static helper with root path


  Commit: f33a3d720f37bb79871eeaa3d34ed88c7bb6f20a
      https://github.com/ckan/ckan/commit/f33a3d720f37bb79871eeaa3d34ed88c7bb6f20a
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Fixed the url_for_* helpers when both SCRIPT_NAME and ckan.root_path are defined


  Commit: b1c41b66835ab8cc0786b31b3ff387dff468c073
      https://github.com/ckan/ckan/commit/b1c41b66835ab8cc0786b31b3ff387dff468c073
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/base.py

  Log Message:
  -----------
  Moved the SCRIPT_NAME logic to a middleware

Conflicts:
	ckan/config/middleware.py


  Commit: ccc3c3578f8085ca3d58057bf89fb8169504911f
      https://github.com/ckan/ckan/commit/ccc3c3578f8085ca3d58057bf89fb8169504911f
  Author: Laurent Goderre <laurent.goderre at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Fix redirects with non-root paths

Conflicts:
	ckan/lib/helpers.py


  Commit: ee5101e0e3a9b17e31b7efa1a8264182beef7865
      https://github.com/ckan/ckan/commit/ee5101e0e3a9b17e31b7efa1a8264182beef7865
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #72 from wardi/root-path-3

backport root_path fixes


  Commit: 39039521688608a06c53b2eaafccd2114baec291
      https://github.com/ckan/ckan/commit/39039521688608a06c53b2eaafccd2114baec291
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Renamed helper to get_site_protocol_and_host and added docstring

Conflicts:
	ckan/lib/helpers.py


  Commit: 539b57c7a5a7885f8160068a312ebafeac92e652
      https://github.com/ckan/ckan/commit/539b57c7a5a7885f8160068a312ebafeac92e652
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #73 from wardi/canada-v2.3

backport: Renamed helper to get_site_protocol_and_host and added docstring


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

  Log Message:
  -----------
  Merge branch 'common-base' into canada-v2.5


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

  Changed paths:
    M .travis.yml
    A bin/postgres_init/1_create_ckan_db.sh
    A bin/postgres_init/2_create_ckan_datastore_db.sh
    M bin/travis-install-dependencies
    M ckan/config/middleware.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'canada-v2.3' into canada-v2.5

Conflicts:
	ckan/lib/dictization/model_dictize.py
	ckan/lib/helpers.py
	ckan/lib/i18n.py
	ckan/logic/action/create.py
	ckan/logic/action/get.py
	ckan/logic/action/update.py
	ckan/logic/schema.py
	ckan/logic/validators.py
	ckan/templates/package/confirm_delete.html
	ckan/templates/package/read.html


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

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  always set_lang so we can "translate" our English


  Commit: ed7848c7bd99618fb615d8981f4af4bdcace5749
      https://github.com/ckan/ckan/commit/ed7848c7bd99618fb615d8981f4af4bdcace5749
  Author: Ian Ward <ian at excess.org>
  Date:   2016-08-10 (Wed, 10 Aug 2016)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  [#3180] backport html5lib dep


  Commit: 47bea34e93d837fdce888ed661ba3ecfb7b71e8d
      https://github.com/ckan/ckan/commit/47bea34e93d837fdce888ed661ba3ecfb7b71e8d
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  PEP8 package.py


  Commit: bbbdb10e5e036f15b258ad927665fccd2d4b1b65
      https://github.com/ckan/ckan/commit/bbbdb10e5e036f15b258ad927665fccd2d4b1b65
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Treat fq as a list instead of building it up as a string.


  Commit: 8a5e7df5fc6ec191aacd97e68da90b54e1134361
      https://github.com/ckan/ckan/commit/8a5e7df5fc6ec191aacd97e68da90b54e1134361
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Treat all facets as exclude tags by default.


  Commit: 19f688edb103c1033c66ed322211da7e91e020b3
      https://github.com/ckan/ckan/commit/19f688edb103c1033c66ed322211da7e91e020b3
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Functional multiselect faceting.


  Commit: 09522cfb8458682c534d8833056dd3ea576f0b67
      https://github.com/ckan/ckan/commit/09522cfb8458682c534d8833056dd3ea576f0b67
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-09-21 (Wed, 21 Sep 2016)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Use fq_list passthrough for legacy solr compatiblity with multiple exclusion tags.


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

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

  Log Message:
  -----------
  hide org member-management buttons when user has no access


  Commit: c99a2a4026521ebaecbb7a9ad0a7a0de22a9ebb7
      https://github.com/ckan/ckan/commit/c99a2a4026521ebaecbb7a9ad0a7a0de22a9ebb7
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-09-29 (Thu, 29 Sep 2016)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Unicode, unicode everywhere (fix non-ascii facets crashing when searching)


  Commit: ad6bcca601944c0a0feb3cc2ea220692ae197f49
      https://github.com/ckan/ckan/commit/ad6bcca601944c0a0feb3cc2ea220692ae197f49
  Author: Christopher Majewski <chris.majewski at gmail.com>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M ckan/templates/user/snippets/login_form.html

  Log Message:
  -----------
  Client choice, "remember me" not pre-checked


  Commit: d9e98e2ae7091cf1500a98c0b1a9b67882f3b74c
      https://github.com/ckan/ckan/commit/d9e98e2ae7091cf1500a98c0b1a9b67882f3b74c
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M ckan/templates/user/snippets/login_form.html

  Log Message:
  -----------
  Merge pull request #76 from chrismajewski/canada-v2.5

Client choice, "remember me" not pre-checked


  Commit: fde083e40e661ac4d64a8aae1e2b847e42721190
      https://github.com/ckan/ckan/commit/fde083e40e661ac4d64a8aae1e2b847e42721190
  Author: Ian Ward <ian at excess.org>
  Date:   2016-11-23 (Wed, 23 Nov 2016)

  Changed paths:
    M ckan/templates/user/snippets/login_form.html

  Log Message:
  -----------
  Revert "Client choice, "remember me" not pre-checked"

This reverts commit ad6bcca601944c0a0feb3cc2ea220692ae197f49.


  Commit: 5bd5cd803f749f7a25475f3c0e8c5236628c4de4
      https://github.com/ckan/ckan/commit/5bd5cd803f749f7a25475f3c0e8c5236628c4de4
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-12-13 (Tue, 13 Dec 2016)

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

  Log Message:
  -----------
  Backport user_delete Membership removal from 2.7


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

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

  Log Message:
  -----------
  Wrap user deletion/membership deletion in a nested transaction to ensure consistency.


  Commit: 1ae921c750820e8631718378b7434a2a81bdf4bf
      https://github.com/ckan/ckan/commit/1ae921c750820e8631718378b7434a2a81bdf4bf
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-12-13 (Tue, 13 Dec 2016)

  Changed paths:
    M ckan/authz.py
    M ckan/logic/__init__.py
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  Add read-only mode support.


  Commit: e84daa46444a972c519cfc76dbea55968cf526e6
      https://github.com/ckan/ckan/commit/e84daa46444a972c519cfc76dbea55968cf526e6
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

  Changed paths:
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/less/bordered-pulled.less
    A ckan/public/base/vendor/font-awesome/less/less/core.less
    A ckan/public/base/vendor/font-awesome/less/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/less/fixed-width.less
    A ckan/public/base/vendor/font-awesome/less/less/font-awesome-ie7.less
    A ckan/public/base/vendor/font-awesome/less/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/less/list.less
    A ckan/public/base/vendor/font-awesome/less/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/less/path.less
    A ckan/public/base/vendor/font-awesome/less/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/less/stacked.less
    A ckan/public/base/vendor/font-awesome/less/less/variables.less

  Log Message:
  -----------
  upgrade font-awesome to v4.0.3


  Commit: 0f318ee8d0dd17666408d69280054659becaeb5b
      https://github.com/ckan/ckan/commit/0f318ee8d0dd17666408d69280054659becaeb5b
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-16 (Mon, 16 Jan 2017)

  Changed paths:
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/less/bordered-pulled.less
    A ckan/public/base/vendor/font-awesome/less/less/core.less
    A ckan/public/base/vendor/font-awesome/less/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/less/fixed-width.less
    A ckan/public/base/vendor/font-awesome/less/less/font-awesome-ie7.less
    A ckan/public/base/vendor/font-awesome/less/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/less/list.less
    A ckan/public/base/vendor/font-awesome/less/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/less/path.less
    A ckan/public/base/vendor/font-awesome/less/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/less/stacked.less
    A ckan/public/base/vendor/font-awesome/less/less/variables.less

  Log Message:
  -----------
  Merge pull request #81 from fanjinfei/working

upgrade font-awesome to v4.0.3


  Commit: 34f0de706468a8d6714b03d320bd2616413ef3c2
      https://github.com/ckan/ckan/commit/34f0de706468a8d6714b03d320bd2616413ef3c2
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    R ckan/public/base/vendor/font-awesome/less/less/bootstrap.less
    R ckan/public/base/vendor/font-awesome/less/less/bordered-pulled.less
    R ckan/public/base/vendor/font-awesome/less/less/core.less
    R ckan/public/base/vendor/font-awesome/less/less/extras.less
    R ckan/public/base/vendor/font-awesome/less/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/less/font-awesome-ie7.less
    R ckan/public/base/vendor/font-awesome/less/less/font-awesome.less
    R ckan/public/base/vendor/font-awesome/less/less/icons.less
    R ckan/public/base/vendor/font-awesome/less/less/larger.less
    R ckan/public/base/vendor/font-awesome/less/less/list.less
    R ckan/public/base/vendor/font-awesome/less/less/mixins.less
    R ckan/public/base/vendor/font-awesome/less/less/path.less
    R ckan/public/base/vendor/font-awesome/less/less/rotated-flipped.less
    R ckan/public/base/vendor/font-awesome/less/less/spinning.less
    R ckan/public/base/vendor/font-awesome/less/less/stacked.less
    R ckan/public/base/vendor/font-awesome/less/less/variables.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less

  Log Message:
  -----------
  fix directory for font-awesome


  Commit: 7b1f4e77f65f2be38b94da0555edb00c41ba85f6
      https://github.com/ckan/ckan/commit/7b1f4e77f65f2be38b94da0555edb00c41ba85f6
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    R ckan/public/base/vendor/font-awesome/less/less/bootstrap.less
    R ckan/public/base/vendor/font-awesome/less/less/bordered-pulled.less
    R ckan/public/base/vendor/font-awesome/less/less/core.less
    R ckan/public/base/vendor/font-awesome/less/less/extras.less
    R ckan/public/base/vendor/font-awesome/less/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/less/font-awesome-ie7.less
    R ckan/public/base/vendor/font-awesome/less/less/font-awesome.less
    R ckan/public/base/vendor/font-awesome/less/less/icons.less
    R ckan/public/base/vendor/font-awesome/less/less/larger.less
    R ckan/public/base/vendor/font-awesome/less/less/list.less
    R ckan/public/base/vendor/font-awesome/less/less/mixins.less
    R ckan/public/base/vendor/font-awesome/less/less/path.less
    R ckan/public/base/vendor/font-awesome/less/less/rotated-flipped.less
    R ckan/public/base/vendor/font-awesome/less/less/spinning.less
    R ckan/public/base/vendor/font-awesome/less/less/stacked.less
    R ckan/public/base/vendor/font-awesome/less/less/variables.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less

  Log Message:
  -----------
  Merge pull request #82 from fanjinfei/working

fix directory for font-awesome


  Commit: 6763910201353f5257e43012b6ef88b5541e1b50
      https://github.com/ckan/ckan/commit/6763910201353f5257e43012b6ef88b5541e1b50
  Author: fanjinfei <fanjinfei at hotmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/related.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/stats/templates/ckanext/stats/index.html
    M doc/_templates/footer.html

  Log Message:
  -----------
  update templates for font-awesome 4


  Commit: 02168afcab5e94ddc59c7942603c796dee832f58
      https://github.com/ckan/ckan/commit/02168afcab5e94ddc59c7942603c796dee832f58
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/members.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/search.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html

  Log Message:
  -----------
  additional icon update


  Commit: 78c515a02b6737c82de82612fd3a71a9b442fc38
      https://github.com/ckan/ckan/commit/78c515a02b6737c82de82612fd3a71a9b442fc38
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/config/routing.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  icon update for fontawesome 4.x


  Commit: d7033a476749b7324a1bb2a16e8f9f79bdf3ae54
      https://github.com/ckan/ckan/commit/d7033a476749b7324a1bb2a16e8f9f79bdf3ae54
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckanext/reclineview/plugin.py

  Log Message:
  -----------
  icon update for font-awesome 4.x -- part 2


  Commit: d148ce62396a6b2eac35e76a5684db98d7408cf6
      https://github.com/ckan/ckan/commit/d148ce62396a6b2eac35e76a5684db98d7408cf6
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/textview/plugin.py

  Log Message:
  -----------
  icon update for font-awesome 4.x -- part 3


  Commit: bd5a498eebfeafc3498e7b4885c386999ce4179d
      https://github.com/ckan/ckan/commit/bd5a498eebfeafc3498e7b4885c386999ce4179d
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js

  Log Message:
  -----------
  update css, js file for font-awesome 4.x


  Commit: 8dcaaadde50c519f020e2b21ba1a78e87a57ed45
      https://github.com/ckan/ckan/commit/8dcaaadde50c519f020e2b21ba1a78e87a57ed45
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less

  Log Message:
  -----------
  remove font-awesome 3.2.1 file


  Commit: fab34779654726476b697a8e7d2821bc7dce5283
      https://github.com/ckan/ckan/commit/fab34779654726476b697a8e7d2821bc7dce5283
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  remove ie7 support for font-awesome 4.x


  Commit: dacd83363069584e333b738ad1ae8eeb9456abe3
      https://github.com/ckan/ckan/commit/dacd83363069584e333b738ad1ae8eeb9456abe3
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2017-01-26 (Thu, 26 Jan 2017)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/tests/legacy/functional/test_package.py

  Log Message:
  -----------
  Returns 404 for WUI unauthorised access.

Instead of sending the user to the login page and logging them out, this
change will instead give the user a 404.  This is currently only applied
to deleted datasets.


  Commit: 1d0f7f8bc6c6f994ad81924528f86d1c30e46f67
      https://github.com/ckan/ckan/commit/1d0f7f8bc6c6f994ad81924528f86d1c30e46f67
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/tests/legacy/functional/test_package.py

  Log Message:
  -----------
  Merge branch 'canada-v2.5' of github.com:open-data/ckan into canada-v2.5


  Commit: 338f1b119cea35872a56d060399b0d090a805aed
      https://github.com/ckan/ckan/commit/338f1b119cea35872a56d060399b0d090a805aed
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

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

  Log Message:
  -----------
  Always call check_access, even if a user does not exist.


  Commit: c9231407009bfd3cc6251508311470f8191c1da9
      https://github.com/ckan/ckan/commit/c9231407009bfd3cc6251508311470f8191c1da9
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-01-27 (Fri, 27 Jan 2017)

  Changed paths:
    M ckan/controllers/package.py
    A ckan/templates/package/deleted.html

  Log Message:
  -----------
  Add support for a unique package_deleted template.


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.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/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/related.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/textview/plugin.py
    M doc/_templates/footer.html

  Log Message:
  -----------
  Merge pull request #83 from fanjinfei/working

update templates for font-awesome 4


  Commit: fa9fe3d9ac5e423129c4f13e912caae14c55d5ee
      https://github.com/ckan/ckan/commit/fa9fe3d9ac5e423129c4f13e912caae14c55d5ee
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Temporarily disable the package history feed.


  Commit: 452acfbb810179f8323d231145e9ed5bfe83b313
      https://github.com/ckan/ckan/commit/452acfbb810179f8323d231145e9ed5bfe83b313
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  Prevent a subquery and full table scan on User.number_of_edits, reducing average time from 16s to <=4ms.


  Commit: 52a1e368453002b81f7d6243d9681aa1ffb5b626
      https://github.com/ckan/ckan/commit/52a1e368453002b81f7d6243d9681aa1ffb5b626
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  Improve performance of User.number_created_packages.


  Commit: d11b5afad98431c33eca3b8e2a28db15ff1a0e06
      https://github.com/ckan/ckan/commit/d11b5afad98431c33eca3b8e2a28db15ff1a0e06
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Enable history feeds.


  Commit: 43969cceae73ffb29dbbec17eb9c5bf70d69506b
      https://github.com/ckan/ckan/commit/43969cceae73ffb29dbbec17eb9c5bf70d69506b
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  Remove a pointless order_by resource.package_id that's forced onto every resource table query by default.


  Commit: 58867084417cf8d216dedfe748ba5431f82cbf4e
      https://github.com/ckan/ckan/commit/58867084417cf8d216dedfe748ba5431f82cbf4e
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  Patch out number_of_edits and number_created_packages.


  Commit: f98c808e4383acb62d6be747e58d57cd22f8c95e
      https://github.com/ckan/ckan/commit/f98c808e4383acb62d6be747e58d57cd22f8c95e
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

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

  Log Message:
  -----------
  Stop re-connecting to Solr *9* times on a dataset load.


  Commit: bdd3f7dc43536a30392315f576450ea1d9a49166
      https://github.com/ckan/ckan/commit/bdd3f7dc43536a30392315f576450ea1d9a49166
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

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

  Log Message:
  -----------
  Stop intentionally throwing out our solr connection all over the place.


  Commit: 87cfc1f99ecd9515db19b4eb9e535e4c2a8407d0
      https://github.com/ckan/ckan/commit/87cfc1f99ecd9515db19b4eb9e535e4c2a8407d0
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-02-14 (Tue, 14 Feb 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/templates/organization/read.html

  Log Message:
  -----------
  support multi-select facet for organization search page


  Commit: cbd6b1278d61b3cbadcca60fcf616a21560a06ca
      https://github.com/ckan/ckan/commit/cbd6b1278d61b3cbadcca60fcf616a21560a06ca
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-15 (Wed, 15 Feb 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/templates/organization/read.html

  Log Message:
  -----------
  Merge pull request #86 from fanjinfei/canada-v2.5

support multi-select facet for organization search page


  Commit: aa071b063d1c97fba0fa1df18f695d98f4d26d1d
      https://github.com/ckan/ckan/commit/aa071b063d1c97fba0fa1df18f695d98f4d26d1d
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/base.py

  Log Message:
  -----------
  Nuke render_template including it's completely broken caching support (hasn't really worked since 2012). Removes support for all non-jinja templates.


  Commit: b65e295c32372567ea773fe359b20b920ba9d8bd
      https://github.com/ckan/ckan/commit/b65e295c32372567ea773fe359b20b920ba9d8bd
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-21 (Tue, 21 Feb 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/templates/organization/read.html

  Log Message:
  -----------
  Merge branch 'canada-v2.5' of github.com:open-data/ckan into canada-v2.5


  Commit: 34ef7c4f1c40854c62b99c54ffa999681961809e
      https://github.com/ckan/ckan/commit/34ef7c4f1c40854c62b99c54ffa999681961809e
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

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

  Log Message:
  -----------
  Revert "Stop re-connecting to Solr *9* times on a dataset load."

This reverts commit f98c808e4383acb62d6be747e58d57cd22f8c95e.


  Commit: b973694129d334835965be5d6d085a1de4bdc4ab
      https://github.com/ckan/ckan/commit/b973694129d334835965be5d6d085a1de4bdc4ab
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

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

  Log Message:
  -----------
  Revert "Stop intentionally throwing out our solr connection all over the place."

This reverts commit bdd3f7dc43536a30392315f576450ea1d9a49166.


  Commit: a1550ccc6627ef274beec87cb5453c829563149f
      https://github.com/ckan/ckan/commit/a1550ccc6627ef274beec87cb5453c829563149f
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M .gitattributes
    M CHANGELOG.rst
    M ckan/__init__.py
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    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_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    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/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    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/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    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/sl/LC_MESSAGES/ckan.mo
    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_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/tl/LC_MESSAGES/ckan.mo
    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/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.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/schema.py
    M ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/public/base/css/main.debug.min.css
    M ckan/public/base/i18n/fi.js
    M ckan/public/base/i18n/fi.min.js
    M ckan/public/base/i18n/is.js
    M ckan/public/base/i18n/is.min.js
    A ckan/public/base/i18n/ne.js
    A ckan/public/base/i18n/ne.min.js
    M ckan/public/base/i18n/no.js
    M ckan/public/base/i18n/no.min.js
    M ckan/public/base/i18n/pt_PT.js
    M ckan/public/base/i18n/pt_PT.min.js
    M ckan/public/base/i18n/sq.js
    M ckan/public/base/i18n/sq.min.js
    A ckan/public/base/i18n/tl.js
    A ckan/public/base/i18n/tl.min.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.min.js
    M ckan/templates/package/snippets/resource_view.html
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/recline_view.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release-v2.5.3' into canada-v2.5


  Commit: 4f301a66150aea3c9fecb82b6b0fe5545d162325
      https://github.com/ckan/ckan/commit/4f301a66150aea3c9fecb82b6b0fe5545d162325
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#3414] package_search: return field info


  Commit: 626c9d5fb74f11d94be831a3b72e386548603d1f
      https://github.com/ckan/ckan/commit/626c9d5fb74f11d94be831a3b72e386548603d1f
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#3414] datastore_create: set/update field info


  Commit: d862ebf00852425eeb132e1e72fffacf848e164b
      https://github.com/ckan/ckan/commit/d862ebf00852425eeb132e1e72fffacf848e164b
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckan/templates/package/resource_edit_base.html
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/package/resource_edit_base.html

  Log Message:
  -----------
  [#3414] remove if datapusher in g.plugins from core templates


  Commit: 61d2c52b84db79ad61155f1ffa8b2c43f1a94e71
      https://github.com/ckan/ckan/commit/61d2c52b84db79ad61155f1ffa8b2c43f1a94e71
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    R ckan/templates/package/resource_data.html
    A ckanext/datapusher/templates/package/resource_data.html

  Log Message:
  -----------
  [#3414] resource_data is a datapusher template


  Commit: 77417d049cddf6babfdfc647e5397b7de885f720
      https://github.com/ckan/ckan/commit/77417d049cddf6babfdfc647e5397b7de885f720
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/datapusher/resource_data.html
    R ckanext/datapusher/templates/package/resource_data.html

  Log Message:
  -----------
  [#3414] resource_data is a datapusher template


  Commit: 9fc4507054221c6cd69e67396428552d6a3501fa
      https://github.com/ckan/ckan/commit/9fc4507054221c6cd69e67396428552d6a3501fa
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  [#3428] replace db._get_engine with db.get_(read|write)_engine


  Commit: 7506637db36f660e4f57eaf3cc73da53f1f95f86
      https://github.com/ckan/ckan/commit/7506637db36f660e4f57eaf3cc73da53f1f95f86
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datapusher/tests/test_interfaces.py

  Log Message:
  -----------
  [#3428] one more db._get_engine replacement


  Commit: 1582938eafcabdb54a43cc5b7d49694a7c7c7baf
      https://github.com/ckan/ckan/commit/1582938eafcabdb54a43cc5b7d49694a7c7c7baf
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  [#3428] one more db._get_engine replacement


  Commit: b759b226d258cc0e173a6c04064d3886009e87e5
      https://github.com/ckan/ckan/commit/b759b226d258cc0e173a6c04064d3886009e87e5
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datapusher/templates/package/resource_edit_base.html

  Log Message:
  -----------
  [#3414] review clean-up


  Commit: c6a47e4c4e73ce88fc363e39b6515993ba02e756
      https://github.com/ckan/ckan/commit/c6a47e4c4e73ce88fc363e39b6515993ba02e756
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckan/lib/navl/validators.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#3428] datastore_function actions


  Commit: 29d85e4071c47560d7aa37a860c2e7bd9c6c9816
      https://github.com/ckan/ckan/commit/29d85e4071c47560d7aa37a860c2e7bd9c6c9816
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#3428] working triggers (exceptions not handled yet)


  Commit: 151d05a3e8d3343a28a82acc18b8783cae8a26c4
      https://github.com/ckan/ckan/commit/151d05a3e8d3343a28a82acc18b8783cae8a26c4
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  [#3428] start of function create tests


  Commit: c610034cc49ba36506abc4f77c5c398a679a7db8
      https://github.com/ckan/ckan/commit/c610034cc49ba36506abc4f77c5c398a679a7db8
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  [#3428] properly clear functions in datastore tests


  Commit: 3fa8e555239786b057a430294064d86c1d6c1a0e
      https://github.com/ckan/ckan/commit/3fa8e555239786b057a430294064d86c1d6c1a0e
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  [#3428] test redefinition and or_replace


  Commit: f02479d945975f6574d01665b38efd05a1d0c4a1
      https://github.com/ckan/ckan/commit/f02479d945975f6574d01665b38efd05a1d0c4a1
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  [#3428] test datastore_create with missing function


  Commit: 40ece8838a505878dbbde3057bdc318e0b0dbf68
      https://github.com/ckan/ckan/commit/40ece8838a505878dbbde3057bdc318e0b0dbf68
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  [#3428] test triggers apply to _create and _upsert


  Commit: 916f5154e6742623da1b73fe08ce5a1ca3002f80
      https://github.com/ckan/ckan/commit/916f5154e6742623da1b73fe08ce5a1ca3002f80
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

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

  Log Message:
  -----------
  [#3428] trigger exceptions raise ValidationErrors


  Commit: da313efc69f1f3d112aaaa67ed3443d8789f41c6
      https://github.com/ckan/ckan/commit/da313efc69f1f3d112aaaa67ed3443d8789f41c6
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_delete.py

  Log Message:
  -----------
  [#3428] fix datastore_function_delete


  Commit: 2c74e9f75d932f3b9695cff937c4a09aedaaf439
      https://github.com/ckan/ckan/commit/2c74e9f75d932f3b9695cff937c4a09aedaaf439
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-01 (Wed, 01 Mar 2017)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Expose plugin_loaded as a helper.


  Commit: d34e35c347b6949653cd10d3f25e1c5c88e9ad08
      https://github.com/ckan/ckan/commit/d34e35c347b6949653cd10d3f25e1c5c88e9ad08
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  success message for adding a related item


  Commit: d830c3244b243b8b37857b15e602eac096108d27
      https://github.com/ckan/ckan/commit/d830c3244b243b8b37857b15e602eac096108d27
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  fix resource_type


  Commit: 1186b1561cdded12eb837cd092e294d36b5a51bd
      https://github.com/ckan/ckan/commit/1186b1561cdded12eb837cd092e294d36b5a51bd
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-03 (Fri, 03 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #89 from fanjinfei/working2

success message for adding a related item


  Commit: 83f6062bb8998d4de2124a4741b09c5b1a696bf1
      https://github.com/ckan/ckan/commit/83f6062bb8998d4de2124a4741b09c5b1a696bf1
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  fix English text for related item


  Commit: 224e4ae88fd6c759b18420c1c2bd6ce7b93b1ecf
      https://github.com/ckan/ckan/commit/224e4ae88fd6c759b18420c1c2bd6ce7b93b1ecf
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #90 from fanjinfei/working2

fix English text for related item


  Commit: 2842c541e3f39742a7bc202dd616ffa08e51db45
      https://github.com/ckan/ckan/commit/2842c541e3f39742a7bc202dd616ffa08e51db45
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  remove jinja2 BytecodeCache


  Commit: c409c17eb3e8b07232da185350172783927b9ca1
      https://github.com/ckan/ckan/commit/c409c17eb3e8b07232da185350172783927b9ca1
  Author: Ross Thompson <thriuin at users.noreply.github.com>
  Date:   2017-03-10 (Fri, 10 Mar 2017)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Merge pull request #91 from fanjinfei/working2

remove jinja2 BytecodeCache


  Commit: 6e6e123e4b0a3727fc56c6bd7165e5bd8692c8cf
      https://github.com/ckan/ckan/commit/6e6e123e4b0a3727fc56c6bd7165e5bd8692c8cf
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  fix edit resource of draft dataset


  Commit: 3cc45fc452df681cefc4b67de5fe2d6fbb4a72dd
      https://github.com/ckan/ckan/commit/3cc45fc452df681cefc4b67de5fe2d6fbb4a72dd
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #92 from fanjinfei/working2

fix edit resource of draft dataset


  Commit: 6c1186841891fa2d92eea87ce79ca6d435979ee5
      https://github.com/ckan/ckan/commit/6c1186841891fa2d92eea87ce79ca6d435979ee5
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

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

  Log Message:
  -----------
  allow package_search to return id/name only instead of full dataset dictionary


  Commit: 79743bbb82cda9bb000b0ae455172ccc0d724be2
      https://github.com/ckan/ckan/commit/79743bbb82cda9bb000b0ae455172ccc0d724be2
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

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

  Log Message:
  -----------
  allow package_search to return specified fields


  Commit: 7c2248055a1a610f39f282764bd269606e900b96
      https://github.com/ckan/ckan/commit/7c2248055a1a610f39f282764bd269606e900b96
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  add 'fl' in default_package_search_schema


  Commit: 5e9f16d9cd3e3cf8cbed5d7e6a9234d8f0a13bfe
      https://github.com/ckan/ckan/commit/5e9f16d9cd3e3cf8cbed5d7e6a9234d8f0a13bfe
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  backport package_search fl parameter

original in https://github.com/ckan/ckan/pull/3427


  Commit: f53dec9a3ca8657b7ace96479e8675bb58a4a6f2
      https://github.com/ckan/ckan/commit/f53dec9a3ca8657b7ace96479e8675bb58a4a6f2
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/canada-v2.5' into datastore-triggers


  Commit: f309f47aa55a575d011b5d990f9ca848fc9e99a8
      https://github.com/ckan/ckan/commit/f309f47aa55a575d011b5d990f9ca848fc9e99a8
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  get_write_engine fix


  Commit: 3a5721d62561074068e065043694ac0e756bfb88
      https://github.com/ckan/ckan/commit/3a5721d62561074068e065043694ac0e756bfb88
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  catch trigger exceptions on upsert


  Commit: aeb91edfb78a0bc1ea3cd23d6deacb81d1ab01bc
      https://github.com/ckan/ckan/commit/aeb91edfb78a0bc1ea3cd23d6deacb81d1ab01bc
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  pokemon the db errors

gotta catch em all


  Commit: e1aa3d3e7138a79ebbcfdb606252e04809926b45
      https://github.com/ckan/ckan/commit/e1aa3d3e7138a79ebbcfdb606252e04809926b45
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/revision.py
    R ckan/templates/revision/__init__.py
    R ckan/templates/revision/diff.html
    R ckan/templates/revision/list.html
    R ckan/templates/revision/read.html
    R ckan/templates/revision/read_base.html
    R ckan/templates/revision/snippets/revisions_list.html

  Log Message:
  -----------
  Completely remove the revision controller.


  Commit: e05f06aa3f519d5388c0d1121ed74838409ac6a8
      https://github.com/ckan/ckan/commit/e05f06aa3f519d5388c0d1121ed74838409ac6a8
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Performance improvements in group_activity_query


  Commit: b6fa3e8fffd293c32c9fa170f923900a754ac8b3
      https://github.com/ckan/ckan/commit/b6fa3e8fffd293c32c9fa170f923900a754ac8b3
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  Activity queries should return *all* activity events, not just those related to packages.


  Commit: 41874c673dae99a1ebb88f789365afe6cb420b10
      https://github.com/ckan/ckan/commit/41874c673dae99a1ebb88f789365afe6cb420b10
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M ckan/config/routing.py
    A ckan/controllers/revision.py
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html

  Log Message:
  -----------
  Revert "Completely remove the revision controller."

This reverts commit e1aa3d3e7138a79ebbcfdb606252e04809926b45.


  Commit: 5a01275cacb095f0fb557ae52bc54f854f5b4703
      https://github.com/ckan/ckan/commit/5a01275cacb095f0fb557ae52bc54f854f5b4703
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M ckan/controllers/revision.py

  Log Message:
  -----------
  Package auth check on revision diffs.


  Commit: ab1cd833b372092f34879ef1c50d224df9acf100
      https://github.com/ckan/ckan/commit/ab1cd833b372092f34879ef1c50d224df9acf100
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  _records_row error quick hack


  Commit: b93d1a9f4c1f0de01a99b7203e729a4b747279e3
      https://github.com/ckan/ckan/commit/b93d1a9f4c1f0de01a99b7203e729a4b747279e3
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  support chained action in plugins


  Commit: b0e4c47071e532a9bb3c197e07b3291001443ee3
      https://github.com/ckan/ckan/commit/b0e4c47071e532a9bb3c197e07b3291001443ee3
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  fix test case and code style


  Commit: e5fde6199f8dd909f88904a4485482062777cbbb
      https://github.com/ckan/ckan/commit/e5fde6199f8dd909f88904a4485482062777cbbb
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #93 from fanjinfei/working2

support chained action in plugins


  Commit: b1cfd023670115e14d673e01bf5d1f796157723d
      https://github.com/ckan/ckan/commit/b1cfd023670115e14d673e01bf5d1f796157723d
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckan/controllers/revision.py
    M ckan/logic/__init__.py
    M ckan/model/activity.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/canada-v2.5' into datastore-triggers


  Commit: 416547d4ba57885da8f15197d0545e3192afdfa2
      https://github.com/ckan/ckan/commit/416547d4ba57885da8f15197d0545e3192afdfa2
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

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

  Log Message:
  -----------
  fix organization members translation


  Commit: 97e3091bce8f05b7ee9148cfa780c7c2121b1f66
      https://github.com/ckan/ckan/commit/97e3091bce8f05b7ee9148cfa780c7c2121b1f66
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

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

  Log Message:
  -----------
  Merge pull request #94 from fanjinfei/working2

fix organization members translation


  Commit: e305b0ff39e81f287b9d10a04d19355fae49c6bf
      https://github.com/ckan/ckan/commit/e305b0ff39e81f287b9d10a04d19355fae49c6bf
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#3428] create_function: allow arguments+return types


  Commit: 4a4533dca1229e6e87451345690940f7848f412e
      https://github.com/ckan/ckan/commit/4a4533dca1229e6e87451345690940f7848f412e
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/package.py
    M ckan/templates/group/activity_stream.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    R ckan/templates/revision/diff.html
    R ckan/templates/revision/list.html
    R ckan/templates/revision/read.html
    R ckan/templates/revision/read_base.html
    R ckan/templates/revision/snippets/revisions_list.html
    A ckan/templates/snippets/activities/added_tag.html
    A ckan/templates/snippets/activities/changed_group.html
    A ckan/templates/snippets/activities/changed_organization.html
    A ckan/templates/snippets/activities/changed_package.html
    A ckan/templates/snippets/activities/changed_resource.html
    A ckan/templates/snippets/activities/changed_user.html
    A ckan/templates/snippets/activities/deleted_group.html
    A ckan/templates/snippets/activities/deleted_organization.html
    A ckan/templates/snippets/activities/deleted_package.html
    A ckan/templates/snippets/activities/deleted_resource.html
    A ckan/templates/snippets/activities/follow_dataset.html
    A ckan/templates/snippets/activities/follow_group.html
    A ckan/templates/snippets/activities/follow_user.html
    A ckan/templates/snippets/activities/new_group.html
    A ckan/templates/snippets/activities/new_organization.html
    A ckan/templates/snippets/activities/new_package.html
    A ckan/templates/snippets/activities/new_resource.html
    A ckan/templates/snippets/activities/new_user.html
    A ckan/templates/snippets/activities/removed_tag.html
    R ckan/templates/snippets/activity_item.html
    A ckan/templates/snippets/activity_stream.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Backport of extended activities.


  Commit: 61821d32cb5427b5a7c1717145d778ae4003a6ec
      https://github.com/ckan/ckan/commit/61821d32cb5427b5a7c1717145d778ae4003a6ec
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Resolve a bad merge that caused activity_id to only be checked for deleted packages.


  Commit: dd6a91338dce3f3b5f997fdfd6d1ff3e73673bd8
      https://github.com/ckan/ckan/commit/dd6a91338dce3f3b5f997fdfd6d1ff3e73673bd8
  Author: Ian Ward <ian at excess.org>
  Date:   2017-05-08 (Mon, 08 May 2017)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  datastore sort: allow "nulls first|last"


  Commit: 884915dc43e39ce3d95d14e2bd6b3608b27c0a48
      https://github.com/ckan/ckan/commit/884915dc43e39ce3d95d14e2bd6b3608b27c0a48
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  update datastore with tiggers


  Commit: d533fda1c23f606d20238c2608053e38f0f6e3c0
      https://github.com/ckan/ckan/commit/d533fda1c23f606d20238c2608053e38f0f6e3c0
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

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

  Log Message:
  -----------
  add auth for datastore_trigger_each_row


  Commit: 6ddd59e2b414fd07f6fc702ee37b144f99bdb761
      https://github.com/ckan/ckan/commit/6ddd59e2b414fd07f6fc702ee37b144f99bdb761
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  handle exception


  Commit: 68c65e2897300a1db02224c86b192180fffcd647
      https://github.com/ckan/ckan/commit/68c65e2897300a1db02224c86b192180fffcd647
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-05-15 (Mon, 15 May 2017)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  safe escape table name


  Commit: 4109077cde3a50a4eef4828e27bfa727704b10dc
      https://github.com/ckan/ckan/commit/4109077cde3a50a4eef4828e27bfa727704b10dc
  Author: Ian Ward <ian at excess.org>
  Date:   2017-05-15 (Mon, 15 May 2017)

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

  Log Message:
  -----------
  Merge pull request #96 from fanjinfei/working2

update datastore with tiggers


  Commit: de42e5acb654c8a6efb26be3948c32e5b6be2c7c
      https://github.com/ckan/ckan/commit/de42e5acb654c8a6efb26be3948c32e5b6be2c7c
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-05-23 (Tue, 23 May 2017)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/templates/package/activity.html

  Log Message:
  -----------
  Quick pagination for package activity.


Compare: https://github.com/ckan/ckan/compare/22572da457d3^...de42e5acb654

• Previous message: [ckan-changes] [ckan/ckan] 99acbf: [#3471] Fix for small issues and Create dataset pa...
• Next message: [ckan-changes] [ckan/ckan] 9e4599: [#3570] Fix syntax error in resource-view-filters ...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]