[ckan-changes] [ckan/ckan] 0952e4: A controller action to cycle the API key

GitHub noreply at github.com
Mon Jul 21 16:13:34 UTC 2014


  Branch: refs/heads/1251-resource-view
  Home:   https://github.com/ckan/ckan
  Commit: 0952e46e2178659cd59245abd9f830b8f0fe21c7
      https://github.com/ckan/ckan/commit/0952e46e2178659cd59245abd9f830b8f0fe21c7
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-01 (Wed, 01 Jan 2014)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  A controller action to cycle the API key


  Commit: 7f2a9d2f79d3d10885f89035f9983aaffa10a998
      https://github.com/ckan/ckan/commit/7f2a9d2f79d3d10885f89035f9983aaffa10a998
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-01 (Wed, 01 Jan 2014)

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

  Log Message:
  -----------
  Add a button to the profile page


  Commit: 97645b448955eb3609f8c433b19bc79e71998a67
      https://github.com/ckan/ckan/commit/97645b448955eb3609f8c433b19bc79e71998a67
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Fix pep8 error


  Commit: d63b24edb9b6e7d3969ff9161bce5ce944d41f01
      https://github.com/ckan/ckan/commit/d63b24edb9b6e7d3969ff9161bce5ce944d41f01
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-09 (Thu, 09 Jan 2014)

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

  Log Message:
  -----------
  Create an action function to the heavy lifting


  Commit: 1b61c68259ac080e438ff63433a01e5477613182
      https://github.com/ckan/ckan/commit/1b61c68259ac080e438ff63433a01e5477613182
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-09 (Thu, 09 Jan 2014)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Modify the controller to just use the action


  Commit: f27537477309ae7ef90f06dd42a62ca280350b71
      https://github.com/ckan/ckan/commit/f27537477309ae7ef90f06dd42a62ca280350b71
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

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

  Log Message:
  -----------
  return a result from the logic function


  Commit: a087e508160d3ebada5b84a1c595a52993cd2da1
      https://github.com/ckan/ckan/commit/a087e508160d3ebada5b84a1c595a52993cd2da1
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

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

  Log Message:
  -----------
  fix pep8 error


  Commit: 2e3c49371792b0cb8aa48ece1b46451d3330b776
      https://github.com/ckan/ckan/commit/2e3c49371792b0cb8aa48ece1b46451d3330b776
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-13 (Mon, 13 Jan 2014)

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

  Log Message:
  -----------
  Remove the link from the main page.


  Commit: 11982065f59ba6c660a302f028d6deb8c47c22d8
      https://github.com/ckan/ckan/commit/11982065f59ba6c660a302f028d6deb8c47c22d8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  [#1462] Add guidelines for reviewing pull requests


  Commit: bd44fd53b5b338a8e967f6159cad4b8ffa07a349
      https://github.com/ckan/ckan/commit/bd44fd53b5b338a8e967f6159cad4b8ffa07a349
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.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/validators.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/tests/functional/test_related.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/db.py
    M ckanext/textpreview/tests/test_preview.py
    A doc/.gitignore
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1462-reviewing-guidelines


  Commit: 77d1bfb70c24a242497bd75963196179d4b88c7b
      https://github.com/ckan/ckan/commit/77d1bfb70c24a242497bd75963196179d4b88c7b
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

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

  Log Message:
  -----------
  Add button


  Commit: f645f8a689f95a76acda01e378295ba128f9e715
      https://github.com/ckan/ckan/commit/f645f8a689f95a76acda01e378295ba128f9e715
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Change wording to generate instead of cycle


  Commit: 5bdc5ac29644ce60410d7ee080e3fef46dde5c64
      https://github.com/ckan/ckan/commit/5bdc5ac29644ce60410d7ee080e3fef46dde5c64
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.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/validators.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/tests/functional/test_related.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/db.py
    M ckanext/textpreview/tests/test_preview.py
    A doc/.gitignore
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst

  Log Message:
  -----------
  Merge branch 'master' into 1412-generate-apikey


  Commit: 47de288529fdb8af9e308b720de5b5bfeae932e5
      https://github.com/ckan/ckan/commit/47de288529fdb8af9e308b720de5b5bfeae932e5
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M .coveragerc
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M MANIFEST.in
    M README.rst
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    A ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/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
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/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
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/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/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/resource.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_converters.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    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/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    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
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    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/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/__init__.py
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    M doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/appendices/solr-multicore.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    M doc/conf.py
    R doc/configuration.rst
    M doc/contents.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    M doc/contributing/release-process.rst
    A doc/contributing/simple-code-contributions.rst
    A doc/contributing/string-i18n.rst
    A doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/email-notifications.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/getting-started.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/images/manage_users.jpg
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    M doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M doc/theming/templates.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    M doc/user-guide.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1412-generate-apikey


  Commit: 7f224c69c9ce5b6385aaacc3a7f3cf8674b4be03
      https://github.com/ckan/ckan/commit/7f224c69c9ce5b6385aaacc3a7f3cf8674b4be03
  Author: Rodrigo Parra <rodpar07 at gmail.com>
  Date:   2014-05-24 (Sat, 24 May 2014)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py

  Log Message:
  -----------
  [#1709] Add resource extras to Solr index


  Commit: 1fba75f61f5ab98c165c8b811e5709424961adc5
      https://github.com/ckan/ckan/commit/1fba75f61f5ab98c165c8b811e5709424961adc5
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M CHANGELOG.rst
    M README.rst
    M ckan/config/middleware.py
    M ckan/controllers/related.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.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/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/vendor/jquery.min.js
    A ckan/public/base/vendor/select2/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/templates/footer.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/page.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/templates/package/search.html
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M doc/contributing/architecture.rst
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    A doc/extensions/adding-custom-fields.rst
    M doc/extensions/index.rst
    M doc/images/add_dataset_3.jpg
    M doc/maintaining/installing/deployment.rst
    M doc/theming/best-practices.rst
    M doc/theming/static-files.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1412-generate-apikey


  Commit: 9daaa36f38c9d40905748be8ccc5f405d052262c
      https://github.com/ckan/ckan/commit/9daaa36f38c9d40905748be8ccc5f405d052262c
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  Test the action and auth functions thoroughly


  Commit: da22749b3ef780c00b80aafbf700eca1d5141cea
      https://github.com/ckan/ckan/commit/da22749b3ef780c00b80aafbf700eca1d5141cea
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  pep8 fixes


  Commit: 36599f2c365b118a0e01d7c60d2c2e7b31bdfd9a
      https://github.com/ckan/ckan/commit/36599f2c365b118a0e01d7c60d2c2e7b31bdfd9a
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-06-30 (Mon, 30 Jun 2014)

  Changed paths:
    M Dockerfile
    M contrib/docker/apache.conf

  Log Message:
  -----------
  [#1812] Make docker install's apache filenames consistent

ckan_default is ugly, but I don't want to have different config and log
file paths in docker installs compared to source or package installs.

Fixes #1812


  Commit: 41f67a0aa0494873a7318518ceecf0536e6f67a3
      https://github.com/ckan/ckan/commit/41f67a0aa0494873a7318518ceecf0536e6f67a3
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M Dockerfile
    M contrib/docker/apache.conf

  Log Message:
  -----------
  Merge pull request #1814 from ckan/1812-make-docker-sites-config-filename-consistent

[#1812] Make docker install's apache filenames consistent


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

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

  Log Message:
  -----------
  [#1815] Add "distinct" param to datastore_search

This allows the users to get only the distinct values of the query. The "total"
field on the returned data is related to all fields, not only the distincts.
For example, in our test we have the data:

```json
[
    {"author": "tolstoy", "title": "Anna Karenina"},
    {"author": "tolstoy", "title": "War and Peace"}
]
```

We want to get a list with all authors on the datastore resource. Then we query
the "datastore_search" with:

```json
{
    "resource_id": "the_resource_id",
    "fields": ["author"],
    "distinct": True
}
```

The result is;

```json
{
    "success": True,
    "total": 2,
    "records": [{"author": "tolstoy"}]
}
```

Note that even though there's only one returned record, the "total" field is 2. This is because "total" doesn't take into account the distinct values, but all rows that match our query.


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

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

  Log Message:
  -----------
  [#1830] datastore_search accepts multiple filters values as array

With this patch, if you query the datastore_search with filters:

```json
{
    "filters": {
  "country": ["Brazil", "Argentina"]
    }
}
```

It'll return the rows that have `country IN ("Brazil", "Argentina")`. I had to
change the `datastore_search` extension point on `IDatastore` because I needed
the fields' types. I needed the fields' types because the Datastore accept
fields with array type (e.g. `_text`). When filtering a field that has an array
type, I want to query literally.

In the sample query above, the Datastore can create two different queries,
depending on the type of the `country` field. If it's not an array type, it'll
do as I described above, querying `country IN ("Brazil", "Argentina")`. If it's
of an array type, it'll query literally `country = ["Brazil", "Argentina"]`.


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

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#1830] Keep the fields' order


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

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1830] IDatastore.datastore_delete() receives fields_types

This is to keep it consistent with .datastore_search(), and make the code
started in d3761f8 work.


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

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/interfaces.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1830] IDatastore.datastore_validate() receives fields_types

This is to keep it consistent with .datastore_search(), and make the code
started in d3761f8 work.


  Commit: 27cc2e950565499950f9b07523f6c395d335967b
      https://github.com/ckan/ckan/commit/27cc2e950565499950f9b07523f6c395d335967b
  Author: Erik Schwartz <eschwartz at codeforamerica.org>
  Date:   2014-07-03 (Thu, 03 Jul 2014)

  Changed paths:
    M doc/api/index.rst

  Log Message:
  -----------
  Fix typo 'sucess' => 'success'


  Commit: 5f43452ccc659595340c0aadbfcb3b2c32e7f739
      https://github.com/ckan/ckan/commit/5f43452ccc659595340c0aadbfcb3b2c32e7f739
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    M doc/api/index.rst

  Log Message:
  -----------
  Merge pull request #1831 from eeeschwartz/patch-1

Fix typo 'sucess' => 'success'


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

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#1830] Fix python2.6 support

To do so, we need to add the "ordereddict" requirement.


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

  Changed paths:
    M ckanext/datastore/db.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#1830] Use OrderedDict from ckan.common to fix python2.6 support


  Commit: 40a4d8cd98ab81efedb46631dccb0fa67c7bf9b0
      https://github.com/ckan/ckan/commit/40a4d8cd98ab81efedb46631dccb0fa67c7bf9b0
  Author: Rodrigo Parra <rodpar07 at gmail.com>
  Date:   2014-07-05 (Sat, 05 Jul 2014)

  Changed paths:
    M CHANGELOG.rst
    A Dockerfile
    M bin/travis-install-dependencies
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    A ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/search/__init__.py
    A ckan/new_tests/lib/search/test_index.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/vendor/jquery.min.js
    M ckan/templates/admin/base.html
    A ckan/templates/admin/trash.html
    M ckan/templates/footer.html
    M ckan/templates/package/new_package_form.html
    R ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/snippets/package_form.html
    R ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/page.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/search.html
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/plugin.py
    R ckanext/datastore/bin/__init__.py
    R ckanext/datastore/bin/datastore_setup.py
    R ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    A ckanext/datastore/helpers.py
    A ckanext/datastore/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/set_permissions.sql
    A ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_interface.py
    A ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/templates/package/search.html
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A contrib/docker/apache.conf
    A contrib/docker/apache.wsgi
    A contrib/docker/main.cf
    A contrib/docker/nginx.conf
    A contrib/docker/postgresql/Dockerfile
    A contrib/docker/solr/Dockerfile
    A contrib/docker/solr/schema.xml
    A contrib/docker/svc/ckan/run
    A contrib/docker/svc/nginx/run
    A contrib/docker/svc/postfix/run
    M doc/api/index.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/pull-requests.rst
    M doc/contributing/python.rst
    A doc/extensions/adding-custom-fields.rst
    M doc/extensions/index.rst
    A doc/images/ckan_importing_diagram.graphml
    A doc/images/ckan_importing_diagram.png
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/install-using-docker.rst
    M doc/theming/best-practices.rst
    M doc/theming/css.rst
    M doc/theming/fanstatic.rst
    M doc/theming/javascript.rst
    M doc/theming/static-files.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1709-add-resource-extras-to-solr-index


  Commit: d56b1831b6b801d8bc9c06a50bc6ce4cfbdbc77b
      https://github.com/ckan/ckan/commit/d56b1831b6b801d8bc9c06a50bc6ce4cfbdbc77b
  Author: Rodrigo Parra <rodpar07 at gmail.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

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

  Log Message:
  -----------
  [#1709] Add tests for resource extras indexing


  Commit: 2808b2dbb21fb79ad23c3b5a6bade04d9b200c69
      https://github.com/ckan/ckan/commit/2808b2dbb21fb79ad23c3b5a6bade04d9b200c69
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  Merge pull request #1462 from ckan/1462-reviewing-guidelines

Write guidelines for how to review pull requests


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

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py

  Log Message:
  -----------
  Merge remote-tracking branch 'rparrapy/1709-add-resource-extras-to-solr-index'


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

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

  Log Message:
  -----------
  Merge branch '1815-distinct-datastore-search'


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

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/lib/search/index.py
    M ckan/new_tests/lib/search/test_index.py
    M doc/api/index.rst
    M doc/contributing/reviewing.rst

  Log Message:
  -----------
  Merge branch 'master' into 1830


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

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

  Log Message:
  -----------
  [#1830] Add tests for multiple filters on same field


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

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

  Log Message:
  -----------
  Merge branch '1830-querying-multiple-values-on-the-datastore'


  Commit: e982acae7c26ba3a88b1aafca2046c1ae75773c4
      https://github.com/ckan/ckan/commit/e982acae7c26ba3a88b1aafca2046c1ae75773c4
  Author: Tom Mortimer-Jones <tom at morty.co.uk>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

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

  Log Message:
  -----------
  Small typo


  Commit: 35a9ec55be8ec9d3bc3d373c81f565cfcc09bab4
      https://github.com/ckan/ckan/commit/35a9ec55be8ec9d3bc3d373c81f565cfcc09bab4
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

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

  Log Message:
  -----------
  Merge pull request #1848 from morty/small-typo

[#1848] Small typo


  Commit: 3dde3be6ac33670101cef539fd3d554307798102
      https://github.com/ckan/ckan/commit/3dde3be6ac33670101cef539fd3d554307798102
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-07-21 (Mon, 21 Jul 2014)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge branch '1412-generate-apikey'


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

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

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view

Conflicts:
	ckanext/datastore/tests/test_search.py


Compare: https://github.com/ckan/ckan/compare/f43476c9b627...eb921e6d92b2


More information about the ckan-changes mailing list