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

GitHub noreply at github.com
Mon Jul 20 16:17:40 UTC 2015


  Branch: refs/heads/wet4
  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: 620d33fbc8b2c57716d9420c54686acffb37a711
      https://github.com/ckan/ckan/commit/620d33fbc8b2c57716d9420c54686acffb37a711
  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:
  -----------
  Merge pull request #45 from wardi/canada-v2.1

duplicate extras workaround 2 of 2


  Commit: 074e41c02fbd609e163af870a824b63362f45a02
      https://github.com/ckan/ckan/commit/074e41c02fbd609e163af870a824b63362f45a02
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1301] Adds skip to content accessibility block


  Commit: a299a7463d35eef8e4a81a59d72016628a4f6843
      https://github.com/ckan/ckan/commit/a299a7463d35eef8e4a81a59d72016628a4f6843
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/header.html
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1301] Adds header label block and flash message inner


  Commit: 167062a174c695cddb71b362c2c50617818ef6e3
      https://github.com/ckan/ckan/commit/167062a174c695cddb71b362c2c50617818ef6e3
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#1301] Added a couple of template blocks to the activity_streams snippet

Conflicts:
	ckan/templates/activity_streams/activity_stream_items.html


  Commit: 86b0b299ef557b2d04664851ec6cd90a812872d7
      https://github.com/ckan/ckan/commit/86b0b299ef557b2d04664851ec6cd90a812872d7
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/snippets/group_item.html

  Log Message:
  -----------
  [#1301] Added template blocks to group_item.html


  Commit: 9fdb12c3a84751d05b7db94bf838a33f3ea0464a
      https://github.com/ckan/ckan/commit/9fdb12c3a84751d05b7db94bf838a33f3ea0464a
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/snippets/package_list.html

  Log Message:
  -----------
  [#1301] Adds template blocks to package_list.html


  Commit: adfa1399f5b0c12cabd5bb4962b9237575f386aa
      https://github.com/ckan/ckan/commit/adfa1399f5b0c12cabd5bb4962b9237575f386aa
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  [#1301] Added a few template blocks to the facet lists

Conflicts:
	ckan/templates/snippets/facet_list.html


  Commit: 157c83a6db37a57834af4adf8fe423ca9191c389
      https://github.com/ckan/ckan/commit/157c83a6db37a57834af4adf8fe423ca9191c389
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/snippets/package_item.html

  Log Message:
  -----------
  [#1301] Added more template blocks to package_item.html snippet


  Commit: 0542cf8cba00798dc3c0a690f86b743b1a9a96ff
      https://github.com/ckan/ckan/commit/0542cf8cba00798dc3c0a690f86b743b1a9a96ff
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/snippets/follow_button.html

  Log Message:
  -----------
  [#1301] Adds blocks for follow button classes

Conflicts:
	ckan/templates/snippets/follow_button.html


  Commit: 6155837e731f4e8bd40e12d0e8efdaa9a42dc8a2
      https://github.com/ckan/ckan/commit/6155837e731f4e8bd40e12d0e8efdaa9a42dc8a2
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

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

  Log Message:
  -----------
  [#1301] Adds a load of template blocks to the package info template

Conflicts:
	ckan/templates/package/snippets/info.html


  Commit: e994162181fd79c4b59dfd82b2b1157123eadcbe
      https://github.com/ckan/ckan/commit/e994162181fd79c4b59dfd82b2b1157123eadcbe
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/social.html

  Log Message:
  -----------
  [#1301] Improves the package read page snippets

Conflicts:
	ckan/templates/snippets/license.html


  Commit: 2e10eae4bcd984262b1235d9e545e857dd0024d3
      https://github.com/ckan/ckan/commit/2e10eae4bcd984262b1235d9e545e857dd0024d3
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/snippets/tag_list.html

  Log Message:
  -----------
  [#1301] Adds template blocks to tag_list


  Commit: 7b55ef7f2e3b50054dd288f51ae33faace2fa2e3
      https://github.com/ckan/ckan/commit/7b55ef7f2e3b50054dd288f51ae33faace2fa2e3
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html

  Log Message:
  -----------
  [#1301] Adds template blocks to resource listings

Conflicts:
	ckan/templates/package/snippets/resources_list.html


  Commit: d946bf05d97a9e4e420be88aa9d22036b8778b12
      https://github.com/ckan/ckan/commit/d946bf05d97a9e4e420be88aa9d22036b8778b12
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

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

  Log Message:
  -----------
  [#1301] Adds more blocks to the resources snippet


  Commit: 417b56b837f964b145930e17bca3a2508ec24fda
      https://github.com/ckan/ckan/commit/417b56b837f964b145930e17bca3a2508ec24fda
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

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

  Log Message:
  -----------
  [#1301] Adds template blocks to the resource_read template


  Commit: 1cb66364ef04234938da6159b10947927be32cb7
      https://github.com/ckan/ckan/commit/1cb66364ef04234938da6159b10947927be32cb7
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/package/search.html
    M ckan/templates/snippets/search_form.html

  Log Message:
  -----------
  [#1301] Adds template blocks to the package search and search form


  Commit: a629cfa6dc3cb6daa5668aa066a98df73e26fbbe
      https://github.com/ckan/ckan/commit/a629cfa6dc3cb6daa5668aa066a98df73e26fbbe
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

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

  Log Message:
  -----------
  [#1301] Adds more template blocks to sidebar on the user profile


  Commit: 071478c81ff6bc9f036438c2ae8405f5c3986f38
      https://github.com/ckan/ckan/commit/071478c81ff6bc9f036438c2ae8405f5c3986f38
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  [#1301] Adds blocks to group and org based templates

Conflicts:
	ckan/templates/group/snippets/group_item.html
	ckan/templates/organization/snippets/organization_item.html
	ckan/templates/snippets/organization.html


  Commit: 9362212d5f3338107952b98fb739a34a981341f1
      https://github.com/ckan/ckan/commit/9362212d5f3338107952b98fb739a34a981341f1
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

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

  Log Message:
  -----------
  [#1301] Adds blocks to the package form buttons

Conflicts:
	ckan/templates/package/snippets/resource_form.html


  Commit: 14656ae8a5aecd307df851928888e448e481cdf0
      https://github.com/ckan/ckan/commit/14656ae8a5aecd307df851928888e448e481cdf0
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

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

  Log Message:
  -----------
  [#1301] Adds hanging enblock


  Commit: 9792b4c2d587e1e4c62010fca55250d537cff2f0
      https://github.com/ckan/ckan/commit/9792b4c2d587e1e4c62010fca55250d537cff2f0
  Author: John Martin <me at johnmart.in>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html

  Log Message:
  -----------
  [#1301] Adds more template blocks to the user forms

Conflicts:
	ckan/templates/user/login.html


Compare: https://github.com/ckan/ckan/compare/22572da457d3^...9792b4c2d587


More information about the ckan-changes mailing list