[ckan-changes] [okfn/ckan] f98638: [#398] Fix delete org

GitHub noreply at github.com
Thu Mar 7 16:57:36 UTC 2013


  Branch: refs/heads/release-v2.0
  Home:   https://github.com/okfn/ckan
  Commit: f9863827b00e007a20da5b83590765a55bc7d044
      https://github.com/okfn/ckan/commit/f9863827b00e007a20da5b83590765a55bc7d044
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

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

  Log Message:
  -----------
  [#398] Fix delete org


  Commit: ce9dafffe73af301fbfab24c7702c61b989b5941
      https://github.com/okfn/ckan/commit/ce9dafffe73af301fbfab24c7702c61b989b5941
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  Check that page is a positive integer (Fixes #344)


  Commit: 92fe9899693b8334197ab0e953c0ff74d0e53e2c
      https://github.com/okfn/ckan/commit/92fe9899693b8334197ab0e953c0ff74d0e53e2c
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    R ckan/controllers/datastore.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    A ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/js/.jshintrc
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/accordion.less
    M ckan/public/base/vendor/bootstrap/less/alerts.less
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    M ckan/public/base/vendor/bootstrap/less/button-groups.less
    M ckan/public/base/vendor/bootstrap/less/buttons.less
    M ckan/public/base/vendor/bootstrap/less/carousel.less
    M ckan/public/base/vendor/bootstrap/less/close.less
    M ckan/public/base/vendor/bootstrap/less/code.less
    M ckan/public/base/vendor/bootstrap/less/component-animations.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/forms.less
    M ckan/public/base/vendor/bootstrap/less/grid.less
    M ckan/public/base/vendor/bootstrap/less/hero-unit.less
    M ckan/public/base/vendor/bootstrap/less/labels-badges.less
    M ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/media.less
    M ckan/public/base/vendor/bootstrap/less/mixins.less
    M ckan/public/base/vendor/bootstrap/less/modals.less
    M ckan/public/base/vendor/bootstrap/less/navbar.less
    M ckan/public/base/vendor/bootstrap/less/navs.less
    M ckan/public/base/vendor/bootstrap/less/pager.less
    M ckan/public/base/vendor/bootstrap/less/pagination.less
    M ckan/public/base/vendor/bootstrap/less/popovers.less
    M ckan/public/base/vendor/bootstrap/less/progress-bars.less
    M ckan/public/base/vendor/bootstrap/less/reset.less
    M ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    M ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/bootstrap/less/scaffolding.less
    M ckan/public/base/vendor/bootstrap/less/sprites.less
    M ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    M ckan/public/base/vendor/bootstrap/less/thumbnails.less
    M ckan/public/base/vendor/bootstrap/less/tooltip.less
    M ckan/public/base/vendor/bootstrap/less/type.less
    M ckan/public/base/vendor/bootstrap/less/utilities.less
    M ckan/public/base/vendor/bootstrap/less/variables.less
    M ckan/public/base/vendor/bootstrap/less/wells.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/resource.config
    R ckan/templates/admin/authz.html
    M ckan/templates/admin/snippets/header.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/toolbar.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/form.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/package/base_form_page.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    R ckan/templates/package/resource_api_data.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/functional/api/test_activity.py
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/lib/test_helpers.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 344-page-param-positive-check


  Commit: 64896c92f6a44b50c0e29e2991e2fc0bb65e5bbb
      https://github.com/okfn/ckan/commit/64896c92f6a44b50c0e29e2991e2fc0bb65e5bbb
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Add test and actually fix the bug too


  Commit: adaf01792f8be4fd950e4bbb1d0ef97cec9c52bb
      https://github.com/okfn/ckan/commit/adaf01792f8be4fd950e4bbb1d0ef97cec9c52bb
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  Add i18n


  Commit: 7da3f255d48184bf45efd7fe526e86b997798cdd
      https://github.com/okfn/ckan/commit/7da3f255d48184bf45efd7fe526e86b997798cdd
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M .travis.yml
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    A ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/model/group_extra.py
    M ckan/model/package_extra.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/bg.png
    M ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/nav-active.png
    A ckan/public/base/images/nav.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/modules/dashboard.js
    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/follower-list.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.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/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    A ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/confirm_reset.html
    M ckan/templates/admin/index.html
    R ckan/templates/admin/snippets/header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/group/about.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
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/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
    R ckan/templates/package/snippets/back_to_package_action.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/social.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    A ckan/templates/user/edit_base.html
    M ckan/templates/user/list.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/followers.html
    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_email_notifications.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/bin/datastore_setup.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_upsert.py
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M doc/writing-extensions.rst

  Log Message:
  -----------
  Merge branch 'master' into 344-page-param-positive-check


  Commit: 2a458e6d61295f8bd968fe0cb45faeb0699d6058
      https://github.com/okfn/ckan/commit/2a458e6d61295f8bd968fe0cb45faeb0699d6058
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#493] Fix schema so we can change private via web interface


  Commit: a2ecef41ff4feb89c2eba4dc763126591f7dd230
      https://github.com/okfn/ckan/commit/a2ecef41ff4feb89c2eba4dc763126591f7dd230
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Merge pull request #401 from okfn/344-page-param-positive-check

Check that page is a positive integer (Fixes #344)


  Commit: b67a91845584e3c7fe48be32e0eada424f011711
      https://github.com/okfn/ckan/commit/b67a91845584e3c7fe48be32e0eada424f011711
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/lib/jinja_extensions.py
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 493-schema-fix


  Commit: 44f3ee8d7acc4bbfec05ad00b6f3cffb50bebca5
      https://github.com/okfn/ckan/commit/44f3ee8d7acc4bbfec05ad00b6f3cffb50bebca5
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M .travis.yml
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    R ckan/controllers/datastore.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.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/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.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/schema.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/package_extra.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/bg.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/nav-active.png
    A ckan/public/base/images/nav.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/popover-context.js
    R ckan/public/base/javascript/modules/popover-context.min.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    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/follower-list.less
    A ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    R ckan/public/base/less/popover-context.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/js/.jshintrc
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/accordion.less
    M ckan/public/base/vendor/bootstrap/less/alerts.less
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    M ckan/public/base/vendor/bootstrap/less/button-groups.less
    M ckan/public/base/vendor/bootstrap/less/buttons.less
    M ckan/public/base/vendor/bootstrap/less/carousel.less
    M ckan/public/base/vendor/bootstrap/less/close.less
    M ckan/public/base/vendor/bootstrap/less/code.less
    M ckan/public/base/vendor/bootstrap/less/component-animations.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/forms.less
    M ckan/public/base/vendor/bootstrap/less/grid.less
    M ckan/public/base/vendor/bootstrap/less/hero-unit.less
    M ckan/public/base/vendor/bootstrap/less/labels-badges.less
    M ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/media.less
    M ckan/public/base/vendor/bootstrap/less/mixins.less
    M ckan/public/base/vendor/bootstrap/less/modals.less
    M ckan/public/base/vendor/bootstrap/less/navbar.less
    M ckan/public/base/vendor/bootstrap/less/navs.less
    M ckan/public/base/vendor/bootstrap/less/pager.less
    M ckan/public/base/vendor/bootstrap/less/pagination.less
    M ckan/public/base/vendor/bootstrap/less/popovers.less
    M ckan/public/base/vendor/bootstrap/less/progress-bars.less
    M ckan/public/base/vendor/bootstrap/less/reset.less
    M ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    M ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/bootstrap/less/scaffolding.less
    M ckan/public/base/vendor/bootstrap/less/sprites.less
    M ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    M ckan/public/base/vendor/bootstrap/less/thumbnails.less
    M ckan/public/base/vendor/bootstrap/less/tooltip.less
    M ckan/public/base/vendor/bootstrap/less/type.less
    M ckan/public/base/vendor/bootstrap/less/utilities.less
    M ckan/public/base/vendor/bootstrap/less/variables.less
    M ckan/public/base/vendor/bootstrap/less/wells.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/resource.config
    R ckan/templates/admin/authz.html
    A ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/confirm_reset.html
    M ckan/templates/admin/index.html
    R ckan/templates/admin/snippets/header.html
    R ckan/templates/ajax_snippets/popover_context_dataset.html
    R ckan/templates/ajax_snippets/popover_context_group.html
    R ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/toolbar.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.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
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.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/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    R ckan/templates/package/resource_api_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/back_to_package_action.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
    A ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/snippets/activity_item.html
    A ckan/templates/snippets/context.html
    A ckan/templates/snippets/context/dataset.html
    A ckan/templates/snippets/context/group.html
    A ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/popover_context.html
    M ckan/templates/snippets/social.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    A ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/list.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/followers.html
    M ckan/templates_legacy/package/search.html
    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/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_licenses.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_ratings.py
    M ckan/tests/functional/api/model/test_relationships.py
    M ckan/tests/functional/api/model/test_revisions.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_api.py
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/api/test_misc.py
    M ckan/tests/functional/api/test_package_search.py
    M ckan/tests/functional/api/test_resource_search.py
    M ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/db.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
    A ckanext/example_itemplatehelpers/__init__.py
    A ckanext/example_itemplatehelpers/plugin.py
    A ckanext/example_itemplatehelpers/templates/home/index.html
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/multilingual/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/preview_recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    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 398-delete-org-fix


  Commit: e7e40509fdcae0c1e524a2b49261206d859385c7
      https://github.com/okfn/ckan/commit/e7e40509fdcae0c1e524a2b49261206d859385c7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#493] Fix check_data_dict()


  Commit: 26efb7dcd5ae39d7a72dde1756aa70113e217e44
      https://github.com/okfn/ckan/commit/26efb7dcd5ae39d7a72dde1756aa70113e217e44
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

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

  Log Message:
  -----------
  [#494] Fix deleting datasets of org


  Commit: 72828dad23684c09a99eedb26abe2d5e6835a664
      https://github.com/okfn/ckan/commit/72828dad23684c09a99eedb26abe2d5e6835a664
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#494] Better flash message for delete org


  Commit: ef516ed7de1d750d7aa14311338382ec7c8a8bcd
      https://github.com/okfn/ckan/commit/ef516ed7de1d750d7aa14311338382ec7c8a8bcd
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

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

  Log Message:
  -----------
  Merge branch '398-delete-org-fix'


  Commit: 70ed2f2942946b97d278e53a57cb70b0a2935d76
      https://github.com/okfn/ckan/commit/70ed2f2942946b97d278e53a57cb70b0a2935d76
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/logic/action/delete.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 493-schema-fix


  Commit: 3c243e6a3085930d195441a5412717f98dae3904
      https://github.com/okfn/ckan/commit/3c243e6a3085930d195441a5412717f98dae3904
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  Merge branch '493-schema-fix'


  Commit: 6d013ad234b2333e871508019289a79a45194341
      https://github.com/okfn/ckan/commit/6d013ad234b2333e871508019289a79a45194341
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

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

  Log Message:
  -----------
  Merge branch '494-org-500-take2'

Conflicts:
	ckan/logic/action/delete.py


  Commit: f0fc7203c0cb73d69a15ee6e1bb97dd1aaa72b58
      https://github.com/okfn/ckan/commit/f0fc7203c0cb73d69a15ee6e1bb97dd1aaa72b58
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/schema.py

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


  Commit: 6514f8f9c1d65eda9134a821c0ad1c296ff52f59
      https://github.com/okfn/ckan/commit/6514f8f9c1d65eda9134a821c0ad1c296ff52f59
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

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

  Log Message:
  -----------
  [#474] Removes 'a' from 'Edit a Organization'


  Commit: d89d5ef520c4fd33766b8e155635fb5fc445ad94
      https://github.com/okfn/ckan/commit/d89d5ef520c4fd33766b8e155635fb5fc445ad94
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/variables.less

  Log Message:
  -----------
  [#474] Tweaks to pills and tags


  Commit: 56cebfeb7bcaa91233843bdfbc6a6b564779354e
      https://github.com/okfn/ckan/commit/56cebfeb7bcaa91233843bdfbc6a6b564779354e
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/templates/package/snippets/info.html

  Log Message:
  -----------
  [#474] CSS tweaks to modules and navs


  Commit: 6539d1d9445e955d70ae12893a5efeee005be8d1
      https://github.com/okfn/ckan/commit/6539d1d9445e955d70ae12893a5efeee005be8d1
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [#474] Homepage tag title tweak


  Commit: cc3e03d6a71ee4d42eec27ac9140c23acecad20f
      https://github.com/okfn/ckan/commit/cc3e03d6a71ee4d42eec27ac9140c23acecad20f
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

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

  Log Message:
  -----------
  [#474] Makes resource heading overflow properly


  Commit: 3a9f259b702167774c72f16b6f2ebccda69c6984
      https://github.com/okfn/ckan/commit/3a9f259b702167774c72f16b6f2ebccda69c6984
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/plugins.py
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  Adds follower and activity stream support to orgs


  Commit: 046bba77db8f7baf62f07e91b6e9c285a77d8462
      https://github.com/okfn/ckan/commit/046bba77db8f7baf62f07e91b6e9c285a77d8462
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  When the secondary block is empty add .no-nav to .wrapper


  Commit: 9391022d07817d32ecec036aeb62508ebb375f6c
      https://github.com/okfn/ckan/commit/9391022d07817d32ecec036aeb62508ebb375f6c
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/templates/error_document_template.html
    M ckan/templates/home/about.html

  Log Message:
  -----------
  Fixes the 2 current templates with the correct new behaviour for .no-nav


  Commit: 25a79ad92f345e21f435f83a1d37804a290eca6a
      https://github.com/okfn/ckan/commit/25a79ad92f345e21f435f83a1d37804a290eca6a
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

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

  Log Message:
  -----------
  [#552] Adds inner block to user page header tabs

Conflicts:
	ckan/templates/user/read_base.html

    nasty merge conflict


  Commit: 6d78537c2eebfcfbf988189ccb973c09ffbd6f66
      https://github.com/okfn/ckan/commit/6d78537c2eebfcfbf988189ccb973c09ffbd6f66
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/admin/base.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/user/edit_base.html

  Log Message:
  -----------
  [#552] Adds page_header_tabs block for extensions to be able to add to tabs

Conflicts:
	ckan/config/routing.py
	ckan/templates/organization/read_base.html
	ckan/templates/user/read_base.html

    conflicts resolved


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

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

  Log Message:
  -----------
  [#552] Adds inner block to user page header tabs

Conflicts:
	ckan/templates/user/read_base.html

    the usual conflict


  Commit: 716bf81363ca1a623c0819c0f0a97054520d4dc8
      https://github.com/okfn/ckan/commit/716bf81363ca1a623c0819c0f0a97054520d4dc8
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

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

  Log Message:
  -----------
  Adds URL to the resource page just below the title


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

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

  Log Message:
  -----------
  Makes no results message work in all different contexts


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

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

  Log Message:
  -----------
  [#472] Fix dataset messages on general searches groups/orgs etc

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

    trivial conflict


  Commit: 12dac92c8b18d026e9d5f6c05d0ec1ce50d216aa
      https://github.com/okfn/ckan/commit/12dac92c8b18d026e9d5f6c05d0ec1ce50d216aa
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    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/module.less
    M ckan/public/base/less/nav.less
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Adds new JS module for hiding and showing extra meta information

Conflicts:
	ckan/public/base/less/tables.less

    this was removed in this merge as not used in ckan.less


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

  Changed paths:
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/tables.less

  Log Message:
  -----------
  SPECIAL css fixes for 2.0 only


  Commit: 72dcef5ec419943b146cf5e415bf1309ab8138f6
      https://github.com/okfn/ckan/commit/72dcef5ec419943b146cf5e415bf1309ab8138f6
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/table-toggle-more.js

  Log Message:
  -----------
  [#499] Whitespace fix


  Commit: 8329ff472d2e9750f0f84f5f5940d0e25957fd8e
      https://github.com/okfn/ckan/commit/8329ff472d2e9750f0f84f5f5940d0e25957fd8e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/templates/footer.html

  Log Message:
  -----------
  Show latest api docs when not release version


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

  Changed paths:
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/package/search.html

  Log Message:
  -----------
  Adds g.ckan_doc_version into more templates


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

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

  Log Message:
  -----------
  [#474] Capitalization tweaks


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

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.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/variables.less
    M ckan/templates/home/index.html
    M ckan/templates/organization/edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/info.html
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Merge branch '474-theme-tweaks' into fixes-for-2.0

Conflicts:
	ckan/logic/schema.py

    trivial merge


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

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

  Log Message:
  -----------
  [#472] Unify the dataset searches to give consistent results text

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

    trivial merge


  Commit: 16e3684cb32413274a3de402679760c7ab362bb9
      https://github.com/okfn/ckan/commit/16e3684cb32413274a3de402679760c7ab362bb9
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

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

  Log Message:
  -----------
  Adds autocomplete="off" to dashboard dropdown filter


  Commit: 02dad0d2e55ac23294ce799ed64dd041bff3ac06
      https://github.com/okfn/ckan/commit/02dad0d2e55ac23294ce799ed64dd041bff3ac06
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#548] Fix broken password reset and add FIXMEs


  Commit: ca0a0fa028428104fac92cc87baf4f65daddf431
      https://github.com/okfn/ckan/commit/ca0a0fa028428104fac92cc87baf4f65daddf431
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

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

  Log Message:
  -----------
  [#546] Allow GET API actions to not have parameters

For actions like package_list or group_list you still had to provide
parameters as in:

http://demo.ckan.org/api/3/action/package_list?foo

These changes allow to not pass any param so an empty dict is passed to
the logic layer, where if a necessary param is missing a ValidationError
will be raised.

Also adds some missing tests for GETable actions.


  Commit: 2048b72981ef210993a850292d087ed532f3b9eb
      https://github.com/okfn/ckan/commit/2048b72981ef210993a850292d087ed532f3b9eb
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckan/tests/lib/test_datapreview.py

  Log Message:
  -----------
  [#553] Catch exceptions by urlparse with horrible URLs


  Commit: 0422fd12e80326923685e7e59985c8df57887020
      https://github.com/okfn/ckan/commit/0422fd12e80326923685e7e59985c8df57887020
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

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

  Log Message:
  -----------
  [#553] Replace == with is when comparing to bool in test


  Commit: 7057921fbebf773e7e77b865b158f12e70628bc5
      https://github.com/okfn/ckan/commit/7057921fbebf773e7e77b865b158f12e70628bc5
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

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

  Log Message:
  -----------
  [#553] Test whether unicode urls break url comparison


  Commit: 56e54155cafe5474cf93633fd5c983d7430fb768
      https://github.com/okfn/ckan/commit/56e54155cafe5474cf93633fd5c983d7430fb768
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/app_globals.py
    M ckan/lib/plugins.py
    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/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A 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/development/snippets/page_header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/read_base.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    R ckan/templates/snippets/page_header.html
    A ckan/templates/snippets/search_result_text.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Merge branch 'fixes-for-2.0' into release-v2.0


  Commit: d83a7f1aa18369ba4bf13b2ce7472a94c2ba9b16
      https://github.com/okfn/ckan/commit/d83a7f1aa18369ba4bf13b2ce7472a94c2ba9b16
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/home/snippets/about_text.html
    M ckan/templates/package/base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/related/base_form_page.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/package_item.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/user/logout_first.html

  Log Message:
  -----------
  Template translation review

Known issue: h.time_ago_in_words_from_str

Conflicts:

	ckan/templates/package/snippets/package_metadata_fields.html


  Commit: a46571a6ac35a5820fb0373e09f19994fbda7596
      https://github.com/okfn/ckan/commit/a46571a6ac35a5820fb0373e09f19994fbda7596
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

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

  Log Message:
  -----------
  Fixes after review


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

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

  Log Message:
  -----------
  Fix translation issue with package search


  Commit: 10dde35dd91e9b1c8b17d3b989f03c9ab25de074
      https://github.com/okfn/ckan/commit/10dde35dd91e9b1c8b17d3b989f03c9ab25de074
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Fix crash in stage 3 when ValidationErrors occur

Basically when raising a ValidationError on stage 3 of the dataset
creation, the new_metadata method didn't set context before
_setup_template_variables was called, raising an exception.

Note that this prevents the exception, but the message is still not
shown (see #586).


Compare: https://github.com/okfn/ckan/compare/abee9cd6ce27...10dde35dd91e


More information about the ckan-changes mailing list