[ckan-changes] [okfn/ckan] 5f1ba2: [#507] Allow the template cache to be reset

GitHub noreply at github.com
Wed Jul 31 14:55:07 UTC 2013


  Branch: refs/heads/1117-start-new-test-suite
  Home:   https://github.com/okfn/ckan
  Commit: 5f1ba2b9840a1c02c9b2b91c968ca884f2335d47
      https://github.com/okfn/ckan/commit/5f1ba2b9840a1c02c9b2b91c968ca884f2335d47
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

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

  Log Message:
  -----------
  [#507] Allow the template cache to be reset


  Commit: 331087d35b2db7290f1fb83286d9435e08d88ea6
      https://github.com/okfn/ckan/commit/331087d35b2db7290f1fb83286d9435e08d88ea6
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#547] Rework the plugins and config stuff


  Commit: 5fca5c0fbeab407528ff17c2be9a24526ec7b0dc
      https://github.com/okfn/ckan/commit/5fca5c0fbeab407528ff17c2be9a24526ec7b0dc
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#549] Fix some tests


  Commit: 3fcbcc40f363758c2cbddcc87a5391ce40fe36ae
      https://github.com/okfn/ckan/commit/3fcbcc40f363758c2cbddcc87a5391ce40fe36ae
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py

  Log Message:
  -----------
  [#547] Fix some extension tests


  Commit: c3cae2396f5c6d4d9058abf646831241601b5ab7
      https://github.com/okfn/ckan/commit/c3cae2396f5c6d4d9058abf646831241601b5ab7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M ckan/plugins/core.py
    M ckanext/pdfpreview/tests/test_preview.py

  Log Message:
  -----------
  [#547] Attempt to fix test via simplified plugins


  Commit: e9f4df5203b7f26efb2b2c6a44d45d41a7a1d5c9
      https://github.com/okfn/ckan/commit/e9f4df5203b7f26efb2b2c6a44d45d41a7a1d5c9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M ckan/plugins/core.py
    M ckanext/pdfpreview/tests/test_preview.py

  Log Message:
  -----------
  Revert "[#547] Attempt to fix test via simplified plugins"

This reverts commit c3cae2396f5c6d4d9058abf646831241601b5ab7.

a commit too far


  Commit: fa137ca86c64b7854d7d601834e72dc46318b2f1
      https://github.com/okfn/ckan/commit/fa137ca86c64b7854d7d601834e72dc46318b2f1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#547] Resource proxy test changes


  Commit: 5ea2a1dddded74c0ea52c8f17f3680fb6d5656f8
      https://github.com/okfn/ckan/commit/5ea2a1dddded74c0ea52c8f17f3680fb6d5656f8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  Revert "[#547] Resource proxy test changes"

This reverts commit fa137ca86c64b7854d7d601834e72dc46318b2f1.

didn't help


  Commit: d6c3443fcf17e57edde1f377067f6a4307fa82e0
      https://github.com/okfn/ckan/commit/d6c3443fcf17e57edde1f377067f6a4307fa82e0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py

  Log Message:
  -----------
  [#549] Fix tests due to SingletonPlugin Issues


  Commit: d6ebff78246edb093583491fc6e4a0df23e52cb7
      https://github.com/okfn/ckan/commit/d6ebff78246edb093583491fc6e4a0df23e52cb7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M .travis.yml
    A bin/travis-build
    A ckan/common.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/029_version_groups.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
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckan/public/base/images/table-seperator.png
    A ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/tables.less
    M ckan/public/base/less/variables.less
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    M ckan/templates/organization/about.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/info.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/package/snippets/resources_list.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    A ckan/templates/snippets/search_result_text.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    A ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.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/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.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/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_dumper.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    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
    R ckanext/publisher_form/__init__.py
    R ckanext/publisher_form/forms.py
    R ckanext/publisher_form/templates/dataset_form.html
    R ckanext/publisher_form/templates/publisher_form.html
    R ckanext/publisher_form/templates/publisher_index.html
    R ckanext/publisher_form/templates/publisher_layout.html
    R ckanext/publisher_form/templates/publisher_new.html
    R ckanext/publisher_form/templates/publisher_read.html
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    R doc/about.rst
    R doc/administrative-dashboard.rst
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/architecture.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.update.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    R doc/forms.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/legacy-api.rst
    M doc/loading-data.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: 591297d80132bdd7ea5ed9f217721b2c69acfbe9
      https://github.com/okfn/ckan/commit/591297d80132bdd7ea5ed9f217721b2c69acfbe9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

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

  Log Message:
  -----------
  [#547] Remove test that does not work with Travis as illogical


  Commit: 795e7734e722d60a4ddcb254ec7dbd8444849816
      https://github.com/okfn/ckan/commit/795e7734e722d60a4ddcb254ec7dbd8444849816
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/templates/package/search.html
    M doc/legacy-api.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: efc9c45cc48bc8f8ed0984b8e3f206ce30ba3b11
      https://github.com/okfn/ckan/commit/efc9c45cc48bc8f8ed0984b8e3f206ce30ba3b11
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#547] Remove surpless code


  Commit: a01bd2137041abd642dab9db9c61ed078e6a7dd1
      https://github.com/okfn/ckan/commit/a01bd2137041abd642dab9db9c61ed078e6a7dd1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

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

  Log Message:
  -----------
  [#547] Allow IDatasetForm dynamic uploads


  Commit: 2371c05cbacc3aaca5b3bdc386647624638d4dc5
      https://github.com/okfn/ckan/commit/2371c05cbacc3aaca5b3bdc386647624638d4dc5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#547] Refactor and clean plugins.core


  Commit: f871e87e9d26a7e711cdf75d8076f12f26432c48
      https://github.com/okfn/ckan/commit/f871e87e9d26a7e711cdf75d8076f12f26432c48
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    M ckan/tests/ckantestplugin/setup.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/mock_plugin.py
    M ckan/tests/test_plugins.py
    M test-core.ini

  Log Message:
  -----------
  [#547] Fix core tests


  Commit: 4fd5d3ac68432d563dd77dedbc927794b3111c99
      https://github.com/okfn/ckan/commit/4fd5d3ac68432d563dd77dedbc927794b3111c99
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [#547] Fix test tag vocab plugin


  Commit: 3dae7fed1f72d21e353465ccef67d1e7ad8fb56f
      https://github.com/okfn/ckan/commit/3dae7fed1f72d21e353465ccef67d1e7ad8fb56f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/plugins/core.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    M setup.py

  Log Message:
  -----------
  [#547] Move test_plugins into ckan proper


  Commit: 15d17bac4e09d2f85f48ea853f6d18cc9838d077
      https://github.com/okfn/ckan/commit/15d17bac4e09d2f85f48ea853f6d18cc9838d077
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#547] Remove debug print statement


  Commit: 04cebecb53e6cdcc4741904799f92e561cb0a54c
      https://github.com/okfn/ckan/commit/04cebecb53e6cdcc4741904799f92e561cb0a54c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/tests/functional/test_group.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#547] Remove extra unused code and fix core test bug


  Commit: 11a924986d231ce4b84fbe02a69b0b491c3f64fa
      https://github.com/okfn/ckan/commit/11a924986d231ce4b84fbe02a69b0b491c3f64fa
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-07 (Sun, 07 Apr 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/tests/ckantestplugins.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#547] Refix main tests after refactor


  Commit: 1b10016071571ccf6be9d34a2432c0a66a9a73c9
      https://github.com/okfn/ckan/commit/1b10016071571ccf6be9d34a2432c0a66a9a73c9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#547] Ckanext test fixes


  Commit: afdd9c8f0b2e007431d1b1d7cce1352f20aa345d
      https://github.com/okfn/ckan/commit/afdd9c8f0b2e007431d1b1d7cce1352f20aa345d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#547] Pep8 fix


  Commit: f6c77958ad3cc702210afb42396a815dce99f958
      https://github.com/okfn/ckan/commit/f6c77958ad3cc702210afb42396a815dce99f958
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py
    R doc/contrib.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: a0ae6e97ab3776e9946342eb8cf8353ec09c138b
      https://github.com/okfn/ckan/commit/a0ae6e97ab3776e9946342eb8cf8353ec09c138b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/tests/ckantestplugins.py
    M setup.py

  Log Message:
  -----------
  [#547] Add new test plugin


  Commit: a2598d267bf049a0b8bb81ca8204e0ba3cbf8806
      https://github.com/okfn/ckan/commit/a2598d267bf049a0b8bb81ca8204e0ba3cbf8806
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/model/extension.py
    M ckan/model/modification.py

  Log Message:
  -----------
  [#547] Improve the notification plugins


  Commit: e5b40802441aff8216b29d5a9662d3311af0f54b
      https://github.com/okfn/ckan/commit/e5b40802441aff8216b29d5a9662d3311af0f54b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M README.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.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/ckan.pot
    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
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/render.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.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/activity_streams/activity_stream_items.html
    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
    A ckan/templates/group/history.html
    M ckan/templates/group/snippets/group_item.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/organization_item.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/snippets/data_api_button.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/related/snippets/related_item.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/facet_list.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_home.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
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.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
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    R doc/CHANGELOG.rst
    M doc/_templates/footer.html
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/commenting.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.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
    A doc/images/admin-page.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
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.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
    A doc/installing.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
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publisher-profile.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    A doc/releases.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love

Conflicts:
	ckan/config/environment.py
	ckanext/pdfpreview/tests/test_preview.py
	ckanext/textpreview/tests/test_preview.py

    trivial merges


  Commit: 6fc6bfdbd13e8756e3c732c6a0498cf3a6262641
      https://github.com/okfn/ckan/commit/6fc6bfdbd13e8756e3c732c6a0498cf3a6262641
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  [#547] Fix tests affected by merge


  Commit: eeb9ed36792af4e8098a1a21d2e268a57625879c
      https://github.com/okfn/ckan/commit/eeb9ed36792af4e8098a1a21d2e268a57625879c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#547] Fixes to final test fails


  Commit: e4b2c2c5a0d0f03ebbfe6bfda17419a5e484fefe
      https://github.com/okfn/ckan/commit/e4b2c2c5a0d0f03ebbfe6bfda17419a5e484fefe
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

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

  Log Message:
  -----------
  [#547] Fix not unloading plugin in legacy modeaw


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

  Changed paths:
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/config/environment.py
    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
    M ckan/lib/app_globals.py
    M ckan/lib/base.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/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    A ckan/migration/versions/068_add_package_extras_index.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/test.rst
    M doc/upgrading-a-package-install.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love

Conflicts:
	ckan/config/environment.py
	ckan/lib/plugins.py

    trivial fixes


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

  Changed paths:
    M ckan/lib/base.py
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#547] Code cleanups


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

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#547] Travis fix


  Commit: c36481b4a03013a38ff39543807f1f06addaa0cb
      https://github.com/okfn/ckan/commit/c36481b4a03013a38ff39543807f1f06addaa0cb
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#547] Test fixed


  Commit: 42a09a6abb8050b808258e3355a7e4d043ad56ff
      https://github.com/okfn/ckan/commit/42a09a6abb8050b808258e3355a7e4d043ad56ff
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#547] Fixes to datastore plugin


  Commit: 2c4279111cadb6e660bb17705a82f43af0fd0dec
      https://github.com/okfn/ckan/commit/2c4279111cadb6e660bb17705a82f43af0fd0dec
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#547] Test fixes for datastore


  Commit: 9f6ab9ceda6cc5a81a601a43620e3739a21a22e1
      https://github.com/okfn/ckan/commit/9f6ab9ceda6cc5a81a601a43620e3739a21a22e1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/tests/test_dump.py

  Log Message:
  -----------
  [#547] Fix routes issue and datastore dump


  Commit: 1c8ddf22cd80b61ad89456c912f5ea2c8ffa4eb6
      https://github.com/okfn/ckan/commit/1c8ddf22cd80b61ad89456c912f5ea2c8ffa4eb6
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/api.py
    M ckan/model/meta.py
    M ckan/tests/__init__.py
    M ckanext/datastore/plugin.py
    A doc/changelog.rst
    M doc/conf.py
    M doc/index.rst
    M doc/installing.rst
    M doc/release-process.rst
    R doc/releases.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love

Conflicts:
	ckanext/datastore/plugin.py

    minor change to new_resource_show


  Commit: 6cafd91b9f1c472a261b5b0aef8bbb6b060172cf
      https://github.com/okfn/ckan/commit/6cafd91b9f1c472a261b5b0aef8bbb6b060172cf
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    R build.sh
    R fabfile.py
    R jshint.json
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  [#985] Remove files that are not needed any more from ckan root


  Commit: 42ef41fd7fb0a85c80b38902033813f26b98a005
      https://github.com/okfn/ckan/commit/42ef41fd7fb0a85c80b38902033813f26b98a005
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M .gitmodules
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.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/model/user.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/test_tag_vocab_plugin.py
    M doc/data-viewer.rst
    M doc/paster.rst
    M doc/toolkit.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: 21d88806b15f1f37f2d46331f2eb4cff4237447e
      https://github.com/okfn/ckan/commit/21d88806b15f1f37f2d46331f2eb4cff4237447e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1051] Coding standards: Fix remaining nasty str(..)


  Commit: 95dec8c992d6ce844da4c5ea5fd080bad074c758
      https://github.com/okfn/ckan/commit/95dec8c992d6ce844da4c5ea5fd080bad074c758
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/lib/navl/__init__.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1051] Coding standards: Fix remaining bad spellings


  Commit: 7abd369dee46ecdf2cc02ac61e15e3eb0eb872f7
      https://github.com/okfn/ckan/commit/7abd369dee46ecdf2cc02ac61e15e3eb0eb872f7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M bin/ckan_spam.py
    M ckan/lib/package_saver.py
    M ckan/tests/test_coding_standards.py
    M ckanext/stats/stats.py

  Log Message:
  -----------
  [#1051] Coding standards: Fix some import *


  Commit: 887e50f43b8f1aba642c7f1223d301642c3ea0f5
      https://github.com/okfn/ckan/commit/887e50f43b8f1aba642c7f1223d301642c3ea0f5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

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

  Log Message:
  -----------
  [#818] Try order by id to prevent test fail


  Commit: edfe6146ac5f961dd1a628343c1dff7f56a30c99
      https://github.com/okfn/ckan/commit/edfe6146ac5f961dd1a628343c1dff7f56a30c99
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read_base.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/new.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge branch 'master' into 1051-code-cleanups-for-2.2


  Commit: b8c1a55570341e47154221d38e097225886a5897
      https://github.com/okfn/ckan/commit/b8c1a55570341e47154221d38e097225886a5897
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

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

  Log Message:
  -----------
  [#1051] Fix tag_create function params


  Commit: d593c6d21e752760161c5954121f1e2d608ce13e
      https://github.com/okfn/ckan/commit/d593c6d21e752760161c5954121f1e2d608ce13e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

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

  Log Message:
  -----------
  [#1051] Clean calling params to activity_create action


  Commit: e55bfb5f006a9a905ca1feace2dc6c5a9526f4c6
      https://github.com/okfn/ckan/commit/e55bfb5f006a9a905ca1feace2dc6c5a9526f4c6
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/model/package_relationship.py
    M ckan/templates/macros/autoform.html
    M doc/templating.rst

  Log Message:
  -----------
  [#1064] Don't translate empty strings


  Commit: 9eea461444450fe4557a8887130b56eec9d13483
      https://github.com/okfn/ckan/commit/9eea461444450fe4557a8887130b56eec9d13483
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M .tx/config

  Log Message:
  -----------
  [#1065] Update transifex host in .tx/config

You'll proabably need to update your ~/.transifexrc file as well.


  Commit: f39233e80fad842a978eb5c13f9e9ff49a5e8971
      https://github.com/okfn/ckan/commit/f39233e80fad842a978eb5c13f9e9ff49a5e8971
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

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

  Log Message:
  -----------
  [#1081] Remove junk code (unrelated)


  Commit: 50ba9bf6a8cd00ad7055260ea565290db4f7e166
      https://github.com/okfn/ckan/commit/50ba9bf6a8cd00ad7055260ea565290db4f7e166
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  [#1081] Clean model.resource and get now returns Resource


  Commit: fe79fed5782e17e410fbd68f7b9c1309f1f08f86
      https://github.com/okfn/ckan/commit/fe79fed5782e17e410fbd68f7b9c1309f1f08f86
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  [#1081] Add new get_package_id() method to Resource


  Commit: c972c1c02778d484cb22158a0980bf52564a8327
      https://github.com/okfn/ckan/commit/c972c1c02778d484cb22158a0980bf52564a8327
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

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

  Log Message:
  -----------
  [#1081] resource_delete updates the package


  Commit: eb72f9f1d98329cc7bc7014b284cd7bd30d9b3e0
      https://github.com/okfn/ckan/commit/eb72f9f1d98329cc7bc7014b284cd7bd30d9b3e0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  [#1081] Pep8 model.resource


  Commit: 068560134febb3550b656571786e605afdd46819
      https://github.com/okfn/ckan/commit/068560134febb3550b656571786e605afdd46819
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

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

  Log Message:
  -----------
  [#1081] Fix for test


  Commit: 7882f27654cf0d78f25d7a9b6311aee0a7514008
      https://github.com/okfn/ckan/commit/7882f27654cf0d78f25d7a9b6311aee0a7514008
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#1082] Upgrade to font-awesome


  Commit: ab2c66e25dd99ce9e152002afdb8d3b909015357
      https://github.com/okfn/ckan/commit/ab2c66e25dd99ce9e152002afdb8d3b909015357
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less

  Log Message:
  -----------
  [#1082] Upgrade bootstrap


  Commit: 27967b6d7c21f4c475cbd907da6ebc77b4c044fc
      https://github.com/okfn/ckan/commit/27967b6d7c21f4c475cbd907da6ebc77b4c044fc
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/public/base/vendor/jquery.js

  Log Message:
  -----------
  [#1082] Upgrade to jQuery


  Commit: ea6cdd73d439e5614106f964c5a48ef1e0728c87
      https://github.com/okfn/ckan/commit/ea6cdd73d439e5614106f964c5a48ef1e0728c87
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js

  Log Message:
  -----------
  [#1082] jQuery.browser was removed in 1.9


  Commit: d4639179a9a4b19bbb0a05f1a8109cffa7de033c
      https://github.com/okfn/ckan/commit/d4639179a9a4b19bbb0a05f1a8109cffa7de033c
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M ckan/public/base/test/index.html

  Log Message:
  -----------
  [#1082] jQuery.ajax.error deprecatedin favour of .fail in jQuery 1.8


  Commit: 05096e995088c9571ea109cfac7c34d0a50d5bac
      https://github.com/okfn/ckan/commit/05096e995088c9571ea109cfac7c34d0a50d5bac
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M ckan/templates/ajax_snippets/related-item.html

  Log Message:
  -----------
  [#1082] Fix for undefined variable within mocha tests


  Commit: f9e43bbaad7a9103a2210df62170677a3916bf30
      https://github.com/okfn/ckan/commit/f9e43bbaad7a9103a2210df62170677a3916bf30
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js

  Log Message:
  -----------
  [#1082] Fix for jQuery.contains as params should be dom elements and not jQuery collections


  Commit: 3fc2bf4c0e120a37ffd19e225de523e577933003
      https://github.com/okfn/ckan/commit/3fc2bf4c0e120a37ffd19e225de523e577933003
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js

  Log Message:
  -----------
  [#801] Upgrade to mocha


  Commit: 13f90eb34162d534887c156f986ac21ade8db9a1
      https://github.com/okfn/ckan/commit/13f90eb34162d534887c156f986ac21ade8db9a1
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/public/base/test/index.html

  Log Message:
  -----------
  [#801] Get mocha running within mocha-phantomjs


  Commit: f8a5d32b2fe7ef3df2e54b5cc364eaf4ea1e7d59
      https://github.com/okfn/ckan/commit/f8a5d32b2fe7ef3df2e54b5cc364eaf4ea1e7d59
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Run mocha tests on travis


  Commit: a33cc3ce73cdfa12efd3af8bf3b570cf0839c5d9
      https://github.com/okfn/ckan/commit/a33cc3ce73cdfa12efd3af8bf3b570cf0839c5d9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Run CKAN in background when running mocha tests. Might not work but need to test on travis.


  Commit: 9305d5eee71ce2561ba61322e268b83a108f4e25
      https://github.com/okfn/ckan/commit/9305d5eee71ce2561ba61322e268b83a108f4e25
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  [#1116] Don't demand things that we don't do


  Commit: 709130978a0247ed2c95f14af4c647f35ac72347
      https://github.com/okfn/ckan/commit/709130978a0247ed2c95f14af4c647f35ac72347
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1115] Changes name of parent header block


  Commit: 2f4818c42a1f06f7f0b7a6305c071b2c1f161065
      https://github.com/okfn/ckan/commit/2f4818c42a1f06f7f0b7a6305c071b2c1f161065
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Correct ini file


  Commit: c0d288cee5a32ff84bd827a9c51d2563250f5d73
      https://github.com/okfn/ckan/commit/c0d288cee5a32ff84bd827a9c51d2563250f5d73
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build
    M ckan/public/base/test/index.html

  Log Message:
  -----------
  [#801] Simplified the logic for running the mocha tests in and out of browser


  Commit: 197bb64d892a58c12c25f6590f020b08ec660db2
      https://github.com/okfn/ckan/commit/197bb64d892a58c12c25f6590f020b08ec660db2
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/templates/ajax_snippets/related-item.html

  Log Message:
  -----------
  [#801] Fix for related-item.html snippet so that all mocha tests pass


  Commit: 1a94014cb546f8b5b01d093822aebf27f260de6c
      https://github.com/okfn/ckan/commit/1a94014cb546f8b5b01d093822aebf27f260de6c
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

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

  Log Message:
  -----------
  [#1091] Text change to the additional data


  Commit: 037a61e62bf8196dcf9bd2d3d698b5d6688ce3d0
      https://github.com/okfn/ckan/commit/037a61e62bf8196dcf9bd2d3d698b5d6688ce3d0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M .tx/config

  Log Message:
  -----------
  Merge branch '1065-update-transifex-host'


  Commit: 0484de2246c9297881493436bd28cc33bc3c17ef
      https://github.com/okfn/ckan/commit/0484de2246c9297881493436bd28cc33bc3c17ef
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

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

  Log Message:
  -----------
  [#1081] Do not actually delete the resource


  Commit: 1a5b63cf2e732a25e2eb89b53c369b295e0aa95a
      https://github.com/okfn/ckan/commit/1a5b63cf2e732a25e2eb89b53c369b295e0aa95a
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Move install of npm deps to before nosetests


  Commit: 5e74df6fa130b866587d28e1080b83c2063320a8
      https://github.com/okfn/ckan/commit/5e74df6fa130b866587d28e1080b83c2063320a8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    A doc/changelog.rst

  Log Message:
  -----------
  Put the changelog symlink back into the docs

not sure how this got removed


  Commit: f58397694ee5175a1831e70e05003403023852d9
      https://github.com/okfn/ckan/commit/f58397694ee5175a1831e70e05003403023852d9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

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

  Log Message:
  -----------
  [#1114] Do not reuse the variable name as it leaks


  Commit: c6ab247c4035b94acada443b6653e6f5716b0261
      https://github.com/okfn/ckan/commit/c6ab247c4035b94acada443b6653e6f5716b0261
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Merge branch '1116-branch-standards'


  Commit: 2eb573f2ad08bbeb63d6b50902c3761abb3b38fe
      https://github.com/okfn/ckan/commit/2eb573f2ad08bbeb63d6b50902c3761abb3b38fe
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/forms.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#1089] Add required '*' to forms

* Adds extra params to form macros called `is_required`
* Also adds extra macro for outputting the '* is required field' on the bottom
of forms
* Also adds said params to needed forms


  Commit: 5a0bee09d5a01c0ef6563375ae8debd63dea7c9f
      https://github.com/okfn/ckan/commit/5a0bee09d5a01c0ef6563375ae8debd63dea7c9f
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

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

  Log Message:
  -----------
  [#1115] Change block names within child template and not parent as it could cause block extension issues


  Commit: d7b5b3ce1df8c3d6e997acbc151c2a0c1958f8c2
      https://github.com/okfn/ckan/commit/d7b5b3ce1df8c3d6e997acbc151c2a0c1958f8c2
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Moved mocha to before nosetests


  Commit: dd46f25a8c756d2221c8bc8f824e09b3d10005a7
      https://github.com/okfn/ckan/commit/dd46f25a8c756d2221c8bc8f824e09b3d10005a7
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/public/base/test/spec/ckan.spec.js

  Log Message:
  -----------
  [#801] Added deliberate failing test for travis


  Commit: 7d4f06b8a5ec36140e028883af81c5529ac041fd
      https://github.com/okfn/ckan/commit/7d4f06b8a5ec36140e028883af81c5529ac041fd
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '1091-additional-data-info-whatever'


  Commit: 3df0637d6450af2abc57b98fcce1a46fe4e41947
      https://github.com/okfn/ckan/commit/3df0637d6450af2abc57b98fcce1a46fe4e41947
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

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

  Log Message:
  -----------
  [#1119] Text preview was made for XML and Json. Increase their precendence. Also typos.


  Commit: b247bfa72c49318e9c0468436dd06f75aeeb9663
      https://github.com/okfn/ckan/commit/b247bfa72c49318e9c0468436dd06f75aeeb9663
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '1119-text-preview-can-preview-xml-and-json'


  Commit: 91c1a980001282c8f6ffe12f99e6b2068d387a95
      https://github.com/okfn/ckan/commit/91c1a980001282c8f6ffe12f99e6b2068d387a95
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#1119] Pep 8


  Commit: 84f48d278cf655f6f9356b6462eeb362d711b173
      https://github.com/okfn/ckan/commit/84f48d278cf655f6f9356b6462eeb362d711b173
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1120] Add check for datastore_make_public


  Commit: 6702740876009d73a6a530a41983947826c40937
      https://github.com/okfn/ckan/commit/6702740876009d73a6a530a41983947826c40937
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

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

  Log Message:
  -----------
  [#1120] Tests for make_public added auth function


  Commit: 580bf09308ac2bd3c984f46a38005f3c25f930ba
      https://github.com/okfn/ckan/commit/580bf09308ac2bd3c984f46a38005f3c25f930ba
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#1119] This is the PEP8 I meant


  Commit: ef42ca60233c9a00d125c8c85bcb48fd52e1934c
      https://github.com/okfn/ckan/commit/ef42ca60233c9a00d125c8c85bcb48fd52e1934c
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '818-attempt-to-fix-recuring-test-fail'


  Commit: 6c7b1eed6b1f5799a84c088736992cc39ab102b9
      https://github.com/okfn/ckan/commit/6c7b1eed6b1f5799a84c088736992cc39ab102b9
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M bin/ckan_spam.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/package_saver.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckanext/stats/stats.py

  Log Message:
  -----------
  Merge branch '1051-code-cleanups-for-2.2'


  Commit: 10419c91bb0948bef03d424d02ec84a91f97f4ad
      https://github.com/okfn/ckan/commit/10419c91bb0948bef03d424d02ec84a91f97f4ad
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/ajax_snippets/related-item.html

  Log Message:
  -----------
  Merge branch '1082-upgrade-frontend'


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

  Changed paths:
    R build.sh
    R fabfile.py
    R jshint.json
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch '985-clean-up-repo'


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

  Changed paths:
    R build.sh
    R fabfile.py
    R jshint.json
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch '985-clean-up-repo'


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

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M bin/ckan_edit_local.py
    M bin/ckan_spam.py
    R build.sh
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/datapreview.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/model/license.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.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_item.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/dashboard_datasets.html
    A ckan/templates/user/dashboard_groups.html
    A ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/resource_read.html
    A ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_revision_search.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_helpers.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/stats.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    R fabfile.py
    R jshint.json
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  [399] merge issue


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

  Changed paths:
    M ckan/lib/base.py
    M ckanext/datastore/tests/test_dump.py

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


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

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/delete.py
    M ckan/model/resource.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge pull request #1081 from okfn/1081-delete-resource-to-update-package

Package index not rebuilt when resources deleted


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

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/model/package_relationship.py
    M ckan/templates/macros/autoform.html
    M doc/templating.rst

  Log Message:
  -----------
  Merge pull request #1064 from okfn/1064-dont-translate-empty-string

Don't translate empty strings


  Commit: b89ab943d01aa0ab8142ff9bbc8016a08464f5f8
      https://github.com/okfn/ckan/commit/b89ab943d01aa0ab8142ff9bbc8016a08464f5f8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] a more precise kill and some extra comments


  Commit: ced323274132a9c4f65b30f3988ab762954f25fe
      https://github.com/okfn/ckan/commit/ced323274132a9c4f65b30f3988ab762954f25fe
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Sleep so ckan is up and running


  Commit: 9d0db5b8ed052d009e47b63af73179b085ce9a8d
      https://github.com/okfn/ckan/commit/9d0db5b8ed052d009e47b63af73179b085ce9a8d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Return errors to travis


  Commit: a22375da22d7efd34db5eb1292ac48bc69de34b9
      https://github.com/okfn/ckan/commit/a22375da22d7efd34db5eb1292ac48bc69de34b9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Improve output so fails easier to find


  Commit: 89dd6ec630aa40d6754a5d1886e1938eabe14df9
      https://github.com/okfn/ckan/commit/89dd6ec630aa40d6754a5d1886e1938eabe14df9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/test/spec/ckan.spec.js

  Log Message:
  -----------
  Revert "[#801] Added deliberate failing test for travis"

fix the mocha test that was made to fail for testing

This reverts commit dd46f25a8c756d2221c8bc8f824e09b3d10005a7.


  Commit: e60c59e8db9510cf9554966e26119388a3aa3dfd
      https://github.com/okfn/ckan/commit/e60c59e8db9510cf9554966e26119388a3aa3dfd
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

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

  Log Message:
  -----------
  fix paster db clean


  Commit: 0a339db6bb17cb9e16eb203def3fc1b8bd540029
      https://github.com/okfn/ckan/commit/0a339db6bb17cb9e16eb203def3fc1b8bd540029
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build
    M ckan/public/base/test/index.html
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js

  Log Message:
  -----------
  Merge branch '801-travis-run-mocha-tests'


  Commit: 1c3604db32a03180a63259119f8006301a019c38
      https://github.com/okfn/ckan/commit/1c3604db32a03180a63259119f8006301a019c38
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1089] Doc block updates


  Commit: 9e68c7fa9419d8c7b110e4a7e7fa4dac5061eb37
      https://github.com/okfn/ckan/commit/9e68c7fa9419d8c7b110e4a7e7fa4dac5061eb37
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

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

  Log Message:
  -----------
  [#1124] Fix for IE7+8 language dropdown appearing too far down the page


  Commit: ef5f8da1ebf679183f869608363fa5e48a817f7a
      https://github.com/okfn/ckan/commit/ef5f8da1ebf679183f869608363fa5e48a817f7a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/forms.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge branch '1089-required-fields'


  Commit: 8e8e3dcf05596711b0ed4b62b5e46958aeeab3bc
      https://github.com/okfn/ckan/commit/8e8e3dcf05596711b0ed4b62b5e46958aeeab3bc
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Recompile css


  Commit: 9fd0096769713d7831e32589de7a5b0f2bec4f8d
      https://github.com/okfn/ckan/commit/9fd0096769713d7831e32589de7a5b0f2bec4f8d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '1124-ie7-language-dropdown-fix'


  Commit: 1468e69f41eac574d7b28beda836af114fd2b66c
      https://github.com/okfn/ckan/commit/1468e69f41eac574d7b28beda836af114fd2b66c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Recompile css


  Commit: a88506447e924e5f3f49e055947d1f9004f35566
      https://github.com/okfn/ckan/commit/a88506447e924e5f3f49e055947d1f9004f35566
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

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

  Log Message:
  -----------
  [#1127] pass image_url in organization_list_for_user


  Commit: f343d869683643dec14b87d3c047e321567bcaff
      https://github.com/okfn/ckan/commit/f343d869683643dec14b87d3c047e321567bcaff
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

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

  Log Message:
  -----------
  [#1127] pass image_url in group_list_authz


  Commit: 397684ad3374c300dad401f53473f8f6d16ad700
      https://github.com/okfn/ckan/commit/397684ad3374c300dad401f53473f8f6d16ad700
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

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

  Log Message:
  -----------
  Merge pull request #1127 from okfn/1127-org-images-dashboard

Organization images do not display on Organization user dashboard page


  Commit: 5634f9db4dcb6e8cb0d59aad66d2b52dc31dc9cf
      https://github.com/okfn/ckan/commit/5634f9db4dcb6e8cb0d59aad66d2b52dc31dc9cf
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M doc/documentation-guidelines.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  [#1128] Fix requirements file name in documentation


  Commit: 2be3bcfb05c672f2fd3fcb23b5094961aa71a2b8
      https://github.com/okfn/ckan/commit/2be3bcfb05c672f2fd3fcb23b5094961aa71a2b8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M doc/documentation-guidelines.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge pull request #1129 from okfn/1128-requirements-filenames-outdated

[#1128] Fix requirements file name in documentation


  Commit: ba9f6058280555ec8680331bac04e546318bb5db
      https://github.com/okfn/ckan/commit/ba9f6058280555ec8680331bac04e546318bb5db
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M bin/travis-build
    M ckan/controllers/admin.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/logic/test_action.py
    M doc/documentation-guidelines.rst
    M doc/templating.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: c85ec7a1716c618e0618409ff48a831327a33952
      https://github.com/okfn/ckan/commit/c85ec7a1716c618e0618409ff48a831327a33952
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '1114-fix-delete-vocab-tag'


  Commit: 4be790c6f60eeb05a0c40ef33fa02572c9fe760a
      https://github.com/okfn/ckan/commit/4be790c6f60eeb05a0c40ef33fa02572c9fe760a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '1120-datastore-make-public'


  Commit: 6f44db77d478a7eed1c3e515dcf95beca7d21cf7
      https://github.com/okfn/ckan/commit/6f44db77d478a7eed1c3e515dcf95beca7d21cf7
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


  Commit: 24ca402ad105b8d3c0a7db39789d7a6d28a22446
      https://github.com/okfn/ckan/commit/24ca402ad105b8d3c0a7db39789d7a6d28a22446
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '1123-paster-db-clean-fix'

Conflicts:
	ckan/config/environment.py


  Commit: ec41bee8ce2f3af43002ca3f9ead30f242fa2693
      https://github.com/okfn/ckan/commit/ec41bee8ce2f3af43002ca3f9ead30f242fa2693
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  Merge branch '1115-header-block-recursion'


  Commit: 1bb66d777326e9ca965c4d28bf87f35da8a97df6
      https://github.com/okfn/ckan/commit/1bb66d777326e9ca965c4d28bf87f35da8a97df6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M .tx/config
    M CONTRIBUTING.rst
    M bin/ckan_spam.py
    M bin/travis-build
    R build.sh
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.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/model/extension.py
    M ckan/model/modification.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    M ckan/plugins/core.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/mock_plugin.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    A doc/changelog.rst
    M doc/documentation-guidelines.rst
    M doc/templating.rst
    M doc/upgrade-source.rst
    R fabfile.py
    R jshint.json
    M setup.py
    M test-core.ini
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite


Compare: https://github.com/okfn/ckan/compare/782fc4b166fb...1bb66d777326


More information about the ckan-changes mailing list