[ckan-changes] [okfn/ckan] 92bb07: Auto populate some of context in get_action()

• Previous message: [ckan-changes] [okfn/ckan] 92bb07: Auto populate some of context in get_action()
• Next message: [ckan-changes] [okfn/ckan] 426eee: [#270] Fixes sysadmins not getting all orgs if the...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/2750-add-docs-and-examples-for-idatasetform-and-igroupform
  Home:   https://github.com/okfn/ckan
  Commit: 92bb0729917088d9b8f024a2006ea4f4ac5159bd
      https://github.com/okfn/ckan/commit/92bb0729917088d9b8f024a2006ea4f4ac5159bd
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-15 (Thu, 15 Nov 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Auto populate some of context in get_action()


  Commit: eaed649f0cc7baa11430cf8c123b169d8f85d8c5
      https://github.com/okfn/ckan/commit/eaed649f0cc7baa11430cf8c123b169d8f85d8c5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/publisher/get.py
    A ckan/migration/versions/062_add_dashboard_table.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    A ckan/model/dashboard.py
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dashboard.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/user/dashboard.html
    M ckan/tests/functional/api/test_activity.py
    A ckan/tests/functional/api/test_dashboard.py
    M ckan_deb/usr/lib/ckan/common.sh
    A doc/architecture.rst
    R doc/buildbot.rst
    R doc/coding-standards.rst
    A doc/contributing-docs.rst
    A doc/contributing.rst
    A doc/css-coding-standards.rst
    M doc/datastore-setup.rst
    R doc/domain-model-dataset.rst
    R doc/domain-model-resource.rst
    R doc/domain-model-task-status.rst
    R doc/domain-model.rst
    A doc/html-coding-standards.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/javascript-coding-standards.rst
    A doc/migration.rst
    A doc/python-coding-standards.rst

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


  Commit: 54bbf9b30fdc4659fd3555da05ce81b3836e1ff4
      https://github.com/okfn/ckan/commit/54bbf9b30fdc4659fd3555da05ce81b3836e1ff4
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Fixes to the get action wrapper for no context and extra params


  Commit: 0de26f923c53ffd339ea5f3d136751d4eda2146b
      https://github.com/okfn/ckan/commit/0de26f923c53ffd339ea5f3d136751d4eda2146b
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  We need to pass some values through the wrapper


  Commit: 408ec50cbbf4e5af2ab5328a03e127590b550d0a
      https://github.com/okfn/ckan/commit/408ec50cbbf4e5af2ab5328a03e127590b550d0a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Demo get_action wrapper with user controller


  Commit: 37de568854bb0f2fe9eb816244f060b4f75b2e21
      https://github.com/okfn/ckan/commit/37de568854bb0f2fe9eb816244f060b4f75b2e21
  Author: amercader <amercadero at gmail.com>
  Date:   2012-11-29 (Thu, 29 Nov 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  [#3023] Add new extension points to pass the package dict

When creating or updating a dataset, extensions can hook to the
`after_create` and `after_update` methods to receive the validated data
dict. In the create case, the id is added to the dict.


  Commit: 3cb1945e36736dfc9e2697f7c406c2341d904147
      https://github.com/okfn/ckan/commit/3cb1945e36736dfc9e2697f7c406c2341d904147
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Actions defined externaly do not have a side_effect_free attribute


  Commit: bddc793cea4b32cf7930f2de3bab4d12741ae04c
      https://github.com/okfn/ckan/commit/bddc793cea4b32cf7930f2de3bab4d12741ae04c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-2.0.xml
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/activity.py
    M ckan/model/group.py
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html
    A ckan/templates/package/activity.html
    M ckan/templates/package/read.html
    M ckan/templates/user/dashboard.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/__init__.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M ckanext/multilingual/solr/schema.xml
    M doc/configuration.rst
    M doc/contributing.rst
    A doc/frontend-testing.rst
    M doc/install-from-source.rst
    M doc/python-coding-standards.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

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


  Commit: cc95a6a75e9a7c2864e1f4f6a85ef00ce359714e
      https://github.com/okfn/ckan/commit/cc95a6a75e9a7c2864e1f4f6a85ef00ce359714e
  Author: amercader <amercadero at gmail.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

  Changed paths:
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-2.0.xml
    M ckan/controllers/home.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckanext/multilingual/solr/schema.xml
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch 'master' into 3023-data_dict-extension-points


  Commit: 0d7cfdb2ab1389f6010dae91a255e85095aa97c8
      https://github.com/okfn/ckan/commit/0d7cfdb2ab1389f6010dae91a255e85095aa97c8
  Author: amercader <amercadero at gmail.com>
  Date:   2012-12-06 (Thu, 06 Dec 2012)

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

  Log Message:
  -----------
  [#3023] Pass context object to extensions on after_create and after_update


  Commit: 4de12f1b14d78a77dbf543951a456951b83a156a
      https://github.com/okfn/ckan/commit/4de12f1b14d78a77dbf543951a456951b83a156a
  Author: amercader <amercadero at gmail.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  [#3023] Add new after_show extension point

Gets the package dict just before being sent back to the controller.
Removed an out of date comment on tests.


  Commit: 68b8418d41acce3196eaa7e5c11b0b3146c023fd
      https://github.com/okfn/ckan/commit/68b8418d41acce3196eaa7e5c11b0b3146c023fd
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M README.rst
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-2.0.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    R ckan/controllers/group_formalchemy.py
    M ckan/controllers/home.py
    A ckan/controllers/organization.py
    M ckan/controllers/package.py
    R ckan/controllers/package_formalchemy.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    R ckan/forms/__init__.py
    R ckan/forms/authorization_group.py
    R ckan/forms/authz.py
    R ckan/forms/builder.py
    R ckan/forms/common.py
    R ckan/forms/group.py
    R ckan/forms/package.py
    R ckan/forms/package_dict.py
    R ckan/forms/registry.py
    M ckan/i18n/check_po_files.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/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__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/auth/delete.py
    M ckan/logic/auth/get.py
    R ckan/logic/auth/publisher/__init__.py
    R ckan/logic/auth/publisher/create.py
    R ckan/logic/auth/publisher/delete.py
    R ckan/logic/auth/publisher/get.py
    R ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/063_org_changes.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/main.min.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/maroon.min.css
    M ckan/public/base/css/red.css
    M ckan/public/base/css/red.min.css
    M ckan/public/base/datapreview/css/recline.min.css
    M ckan/public/base/datapreview/preview_recline.min.js
    A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    M ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    M ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    M ckan/public/base/datapreview/vendor/recline/recline.min.js
    A ckan/public/base/images/editing.png
    A ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/client.min.js
    M ckan/public/base/javascript/module.min.js
    A ckan/public/base/javascript/modules/activity-stream.js
    A ckan/public/base/javascript/modules/dashboard.min.js
    M ckan/public/base/javascript/modules/data-viewer.min.js
    A ckan/public/base/javascript/modules/follow.min.js
    M ckan/public/base/javascript/modules/popover-context.js
    A ckan/public/base/javascript/modules/popover-context.min.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/variables.less
    A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    M ckan/templates/activity_streams/activity_stream_items.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
    A ckan/templates/ajax_snippets/popover_context_dataset.html
    A ckan/templates/ajax_snippets/popover_context_group.html
    A ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/base.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/page_header.html
    M ckan/templates/footer.html
    A ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/index.html
    A ckan/templates/group/member_new.html
    A ckan/templates/group/members.html
    M ckan/templates/group/read.html
    A ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    A ckan/templates/organization/about.html
    A ckan/templates/organization/admins.html
    A ckan/templates/organization/base_form_page.html
    A ckan/templates/organization/confirm_delete.html
    A ckan/templates/organization/confirm_delete_member.html
    A ckan/templates/organization/edit.html
    A ckan/templates/organization/edit_base.html
    A ckan/templates/organization/index.html
    A ckan/templates/organization/member_new.html
    A ckan/templates/organization/members.html
    A ckan/templates/organization/new.html
    A ckan/templates/organization/new_organization_form.html
    A ckan/templates/organization/read.html
    A ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/feeds.html
    A ckan/templates/organization/snippets/info.html
    A ckan/templates/organization/snippets/organization_form.html
    A ckan/templates/organization/snippets/organization_item.html
    A ckan/templates/organization/snippets/organization_list.html
    A ckan/templates/package/activity.html
    A ckan/templates/package/activity_stream.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    A ckan/templates/snippets/organization.html
    A ckan/templates/snippets/organization_item.html
    A ckan/templates/snippets/page_header.html
    A ckan/templates/snippets/private.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/read.html
    A ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followers.html
    M ckan/templates_legacy/admin/index.html
    M ckan/templates_legacy/admin/layout.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/forms/__init__.py
    R ckan/tests/forms/test_authz.py
    R ckan/tests/forms/test_group.py
    R ckan/tests/forms/test_package.py
    M ckan/tests/functional/api/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_package.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_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authz.py
    R ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_edit_authz.py
    R ckan/tests/functional/test_publisher_auth.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    R ckan/tests/lib/test_authztool.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_auth.py
    R ckan/tests/misc/test_auth_profiles.py
    R ckan/tests/misc/test_package_saver.py
    M ckan/tests/mock_publisher_auth.py
    R ckan/tests/models/test_authz.py
    M ckan/tests/models/test_group.py
    R ckan/tests/models/test_repo.py
    R ckan/tests/test_authz.py
    M ckan_deb/usr/lib/ckan/common.sh
    M ckanext/multilingual/solr/schema.xml
    M doc/configuration.rst
    M doc/contributing.rst
    A doc/frontend-testing.rst
    M doc/install-from-source.rst
    A doc/organizations_and_groups.rst
    M doc/python-coding-standards.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M test-core.ini

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

Conflicts:
	ckan/controllers/user.py

    - dashboard offset change - trivial

    ckan/logic/__init__.py

    - check_access_old() no longer exists


  Commit: 650b1cd0795edd913162f09b075892c7927a1efb
      https://github.com/okfn/ckan/commit/650b1cd0795edd913162f09b075892c7927a1efb
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Add get_action docstring


  Commit: 283671a71975c701b116fa25d8592b2c29328b07
      https://github.com/okfn/ckan/commit/283671a71975c701b116fa25d8592b2c29328b07
  Author: amercader <amercadero at gmail.com>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    M ckan/logic/action/delete.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
   [#3023] Add new after_delete extension point

Gets the context adn data_dict (tipically with just the id) after
deleting a dataset.


  Commit: e1c8b69512ff04148ba4fefc0292a2e4dbdba503
      https://github.com/okfn/ckan/commit/e1c8b69512ff04148ba4fefc0292a2e4dbdba503
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3030] Move suppress active class into _active()


  Commit: 3b4b268f17b1460c8fb6ce6993363749337b8354
      https://github.com/okfn/ckan/commit/3b4b268f17b1460c8fb6ce6993363749337b8354
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3030] Fix suppress_activew


  Commit: 4ade7982d8ad2a55bb13cc26310f04a0366088a6
      https://github.com/okfn/ckan/commit/4ade7982d8ad2a55bb13cc26310f04a0366088a6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3030] Combine code adding icons


  Commit: 95bb34d7d370d5652383bcb6966f07e254570db8
      https://github.com/okfn/ckan/commit/95bb34d7d370d5652383bcb6966f07e254570db8
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3030] Deprecate subnav_named_route() as identical function nav_named_route() exits


  Commit: 430f407621a72e337c266ed595afb25716f94089
      https://github.com/okfn/ckan/commit/430f407621a72e337c266ed595afb25716f94089
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3030] Remove unused code in lib.helpers - now got via routes


  Commit: 244e7145d9f8def2908020ac6207a2b83fc3fdf0
      https://github.com/okfn/ckan/commit/244e7145d9f8def2908020ac6207a2b83fc3fdf0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3030] Bugfix subnav_named_route()


  Commit: c2ef34513337e832c1c3cfb0cf4c51e876a780a6
      https://github.com/okfn/ckan/commit/c2ef34513337e832c1c3cfb0cf4c51e876a780a6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3030] Increase code sharing in lib helpers


  Commit: 4b8a9c2c9112a4d8dd5eb05f563f84f8a8cbc65e
      https://github.com/okfn/ckan/commit/4b8a9c2c9112a4d8dd5eb05f563f84f8a8cbc65e
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3030] Further code refactor


  Commit: d3edb7e4360140ab9ce4c507118fd508d61d5560
      https://github.com/okfn/ckan/commit/d3edb7e4360140ab9ce4c507118fd508d61d5560
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#220] Improve imports in controller.user


  Commit: 650ff43c4a74c8f28a3fcc70f051dabae2908108
      https://github.com/okfn/ckan/commit/650ff43c4a74c8f28a3fcc70f051dabae2908108
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#220] Remove genshi dependency in controller user


  Commit: fc42fba38ee4e511b4f69a43a29e0a4039921a0a
      https://github.com/okfn/ckan/commit/fc42fba38ee4e511b4f69a43a29e0a4039921a0a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-19 (Wed, 19 Dec 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/package.py
    A ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/datapreview/css/json.css
    R ckan/public/base/datapreview/css/json.min.css
    R ckan/public/base/datapreview/css/pdf.css
    R ckan/public/base/datapreview/css/pdf.min.css
    R ckan/public/base/datapreview/css/recline.css
    R ckan/public/base/datapreview/css/recline.min.css
    R ckan/public/base/datapreview/img/ajaxload-circle.gif
    R ckan/public/base/datapreview/preview_json.js
    R ckan/public/base/datapreview/preview_json.min.js
    R ckan/public/base/datapreview/preview_pdf.js
    R ckan/public/base/datapreview/preview_pdf.min.js
    R ckan/public/base/datapreview/preview_recline.js
    R ckan/public/base/datapreview/preview_recline.min.js
    R ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/moment.js
    R ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    R ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    R ckan/public/base/datapreview/vendor/recline/css/recline.css
    R ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    R ckan/public/base/datapreview/vendor/recline/recline.js
    R ckan/public/base/datapreview/vendor/recline/recline.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.min.js
    R ckan/public/base/datapreview/vendor/webL10n/README.md
    R ckan/public/base/datapreview/vendor/webL10n/l10n.js
    R ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
    M ckan/public/base/less/masthead.less
    R ckan/templates/dataviewer/json.html
    R ckan/templates/dataviewer/pdf.html
    R ckan/templates/dataviewer/recline.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/search.html
    A ckan/templates/tests/mock_json_resource_preview_template.html
    A ckan/templates/tests/mock_resource_preview_template.html
    M ckan/tests/functional/test_package.py
    A ckan/tests/functional/test_preview_interface.py
    A ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_helpers.py
    A ckanext/jsonpreview/__init__.py
    A ckanext/jsonpreview/plugin.py
    A ckanext/jsonpreview/tests/__init__.py
    A ckanext/jsonpreview/tests/test_preview.py
    A ckanext/jsonpreview/theme/public/css/json.css
    A ckanext/jsonpreview/theme/public/css/json.min.css
    A ckanext/jsonpreview/theme/public/preview_json.js
    A ckanext/jsonpreview/theme/public/preview_json.min.js
    A ckanext/jsonpreview/theme/public/resource.config
    A ckanext/jsonpreview/theme/templates/json.html
    A ckanext/pdfpreview/__init__.py
    A ckanext/pdfpreview/plugin.py
    A ckanext/pdfpreview/tests/__init__.py
    A ckanext/pdfpreview/tests/test_preview.py
    A ckanext/pdfpreview/theme/public/css/pdf.css
    A ckanext/pdfpreview/theme/public/css/pdf.min.css
    A ckanext/pdfpreview/theme/public/css/recline.css
    A ckanext/pdfpreview/theme/public/css/recline.min.css
    A ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfpreview/theme/public/preview_pdf.js
    A ckanext/pdfpreview/theme/public/preview_pdf.min.js
    A ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/reclinepreview/__init__.py
    A ckanext/reclinepreview/plugin.py
    A ckanext/reclinepreview/tests/__init__.py
    A ckanext/reclinepreview/tests/test_preview.py
    A ckanext/reclinepreview/theme/public/css/recline.css
    A ckanext/reclinepreview/theme/public/css/recline.min.css
    A ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclinepreview/theme/public/preview_recline.js
    A ckanext/reclinepreview/theme/public/preview_recline.min.js
    A ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    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.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A 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/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
    A ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/resourceproxy/__init__.py
    A ckanext/resourceproxy/controller.py
    A ckanext/resourceproxy/plugin.py
    A ckanext/resourceproxy/tests/__init__.py
    A ckanext/resourceproxy/tests/file_server.py
    A ckanext/resourceproxy/tests/static/huge.json
    A ckanext/resourceproxy/tests/static/test.json
    A ckanext/resourceproxy/tests/test_proxy.py
    M doc/configuration.rst
    M doc/toolkit.rst
    M doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 220-clean-user-controller-imports


  Commit: e8d915d996d8497201273fc63ecb34ea9f34ec77
      https://github.com/okfn/ckan/commit/e8d915d996d8497201273fc63ecb34ea9f34ec77
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    R ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    A ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    A ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/migration/versions/063_org_changes.py
    A ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/model/authz.py
    M ckan/model/dashboard.py
    M ckan/model/user.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/datapreview/css/json.css
    R ckan/public/base/datapreview/css/json.min.css
    R ckan/public/base/datapreview/css/pdf.css
    R ckan/public/base/datapreview/css/pdf.min.css
    R ckan/public/base/datapreview/css/recline.css
    R ckan/public/base/datapreview/css/recline.min.css
    R ckan/public/base/datapreview/img/ajaxload-circle.gif
    R ckan/public/base/datapreview/preview_json.js
    R ckan/public/base/datapreview/preview_json.min.js
    R ckan/public/base/datapreview/preview_pdf.js
    R ckan/public/base/datapreview/preview_pdf.min.js
    R ckan/public/base/datapreview/preview_recline.js
    R ckan/public/base/datapreview/preview_recline.min.js
    R ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/moment.js
    R ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    R ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    R ckan/public/base/datapreview/vendor/recline/css/recline.css
    R ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    R ckan/public/base/datapreview/vendor/recline/recline.js
    R ckan/public/base/datapreview/vendor/recline/recline.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.min.js
    R ckan/public/base/datapreview/vendor/webL10n/README.md
    R ckan/public/base/datapreview/vendor/webL10n/l10n.js
    R ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/masthead.less
    A ckan/templates/activity_streams/activity_stream_email_notifications.text
    M ckan/templates/base.html
    R ckan/templates/dataviewer/json.html
    R ckan/templates/dataviewer/pdf.html
    R ckan/templates/dataviewer/recline.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/package/search.html
    A ckan/templates/tests/mock_json_resource_preview_template.html
    A ckan/templates/tests/mock_resource_preview_template.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/test_dashboard.py
    A ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    A ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    A ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/misc/test_mock_mail_server.py
    M ckan/tests/mock_mail_server.py
    A ckanext/jsonpreview/__init__.py
    A ckanext/jsonpreview/plugin.py
    A ckanext/jsonpreview/tests/__init__.py
    A ckanext/jsonpreview/tests/test_preview.py
    A ckanext/jsonpreview/theme/public/css/json.css
    A ckanext/jsonpreview/theme/public/css/json.min.css
    A ckanext/jsonpreview/theme/public/preview_json.js
    A ckanext/jsonpreview/theme/public/preview_json.min.js
    A ckanext/jsonpreview/theme/public/resource.config
    A ckanext/jsonpreview/theme/templates/json.html
    A ckanext/pdfpreview/__init__.py
    A ckanext/pdfpreview/plugin.py
    A ckanext/pdfpreview/tests/__init__.py
    A ckanext/pdfpreview/tests/test_preview.py
    A ckanext/pdfpreview/theme/public/css/pdf.css
    A ckanext/pdfpreview/theme/public/css/pdf.min.css
    A ckanext/pdfpreview/theme/public/css/recline.css
    A ckanext/pdfpreview/theme/public/css/recline.min.css
    A ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfpreview/theme/public/preview_pdf.js
    A ckanext/pdfpreview/theme/public/preview_pdf.min.js
    A ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/reclinepreview/__init__.py
    A ckanext/reclinepreview/plugin.py
    A ckanext/reclinepreview/tests/__init__.py
    A ckanext/reclinepreview/tests/test_preview.py
    A ckanext/reclinepreview/theme/public/css/recline.css
    A ckanext/reclinepreview/theme/public/css/recline.min.css
    A ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclinepreview/theme/public/preview_recline.js
    A ckanext/reclinepreview/theme/public/preview_recline.min.js
    A ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    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.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A 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/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
    A ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/resourceproxy/__init__.py
    A ckanext/resourceproxy/controller.py
    A ckanext/resourceproxy/plugin.py
    A ckanext/resourceproxy/tests/__init__.py
    A ckanext/resourceproxy/tests/file_server.py
    A ckanext/resourceproxy/tests/static/huge.json
    A ckanext/resourceproxy/tests/static/test.json
    A ckanext/resourceproxy/tests/test_proxy.py
    M doc/configuration.rst
    A doc/email-notifications.rst
    M doc/index.rst
    M doc/toolkit.rst
    M doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 3030-clean-helper-functions

Conflicts:
	ckan/lib/helpers.py

    trivial merge


  Commit: f3c9fd69c031da7e13a78d7f4a80857ffcd242a6
      https://github.com/okfn/ckan/commit/f3c9fd69c031da7e13a78d7f4a80857ffcd242a6
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-12-21 (Fri, 21 Dec 2012)

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

  Log Message:
  -----------
  [247] fixes #247 by disallowing anonymous users to edit something that they are not allowed to create


  Commit: a385e6476c2b084594ff99f8acca1352a31419d5
      https://github.com/okfn/ckan/commit/a385e6476c2b084594ff99f8acca1352a31419d5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-08 (Tue, 08 Jan 2013)

  Changed paths:
    R ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    A ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    A ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.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/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/migration/versions/063_org_changes.py
    A ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/model/authz.py
    M ckan/model/dashboard.py
    M ckan/model/user.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/datapreview/css/json.css
    R ckan/public/base/datapreview/css/json.min.css
    R ckan/public/base/datapreview/css/pdf.css
    R ckan/public/base/datapreview/css/pdf.min.css
    R ckan/public/base/datapreview/css/recline.css
    R ckan/public/base/datapreview/css/recline.min.css
    R ckan/public/base/datapreview/img/ajaxload-circle.gif
    R ckan/public/base/datapreview/preview_json.js
    R ckan/public/base/datapreview/preview_json.min.js
    R ckan/public/base/datapreview/preview_pdf.js
    R ckan/public/base/datapreview/preview_pdf.min.js
    R ckan/public/base/datapreview/preview_recline.js
    R ckan/public/base/datapreview/preview_recline.min.js
    R ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/moment.js
    R ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    R ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    R ckan/public/base/datapreview/vendor/recline/css/recline.css
    R ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    R ckan/public/base/datapreview/vendor/recline/recline.js
    R ckan/public/base/datapreview/vendor/recline/recline.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.min.js
    R ckan/public/base/datapreview/vendor/webL10n/README.md
    R ckan/public/base/datapreview/vendor/webL10n/l10n.js
    R ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/masthead.less
    A ckan/templates/activity_streams/activity_stream_email_notifications.text
    M ckan/templates/ajax_snippets/popover_context_dataset.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/base.html
    R ckan/templates/dataviewer/json.html
    R ckan/templates/dataviewer/pdf.html
    R ckan/templates/dataviewer/recline.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/package/search.html
    A ckan/templates/tests/mock_json_resource_preview_template.html
    A ckan/templates/tests/mock_resource_preview_template.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_dashboard.py
    A ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    A ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    A ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/misc/test_mock_mail_server.py
    M ckan/tests/mock_mail_server.py
    A ckanext/jsonpreview/__init__.py
    A ckanext/jsonpreview/plugin.py
    A ckanext/jsonpreview/tests/__init__.py
    A ckanext/jsonpreview/tests/test_preview.py
    A ckanext/jsonpreview/theme/public/css/json.css
    A ckanext/jsonpreview/theme/public/css/json.min.css
    A ckanext/jsonpreview/theme/public/preview_json.js
    A ckanext/jsonpreview/theme/public/preview_json.min.js
    A ckanext/jsonpreview/theme/public/resource.config
    A ckanext/jsonpreview/theme/templates/json.html
    A ckanext/pdfpreview/__init__.py
    A ckanext/pdfpreview/plugin.py
    A ckanext/pdfpreview/tests/__init__.py
    A ckanext/pdfpreview/tests/test_preview.py
    A ckanext/pdfpreview/theme/public/css/pdf.css
    A ckanext/pdfpreview/theme/public/css/pdf.min.css
    A ckanext/pdfpreview/theme/public/css/recline.css
    A ckanext/pdfpreview/theme/public/css/recline.min.css
    A ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfpreview/theme/public/preview_pdf.js
    A ckanext/pdfpreview/theme/public/preview_pdf.min.js
    A ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/reclinepreview/__init__.py
    A ckanext/reclinepreview/plugin.py
    A ckanext/reclinepreview/tests/__init__.py
    A ckanext/reclinepreview/tests/test_preview.py
    A ckanext/reclinepreview/theme/public/css/recline.css
    A ckanext/reclinepreview/theme/public/css/recline.min.css
    A ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclinepreview/theme/public/preview_recline.js
    A ckanext/reclinepreview/theme/public/preview_recline.min.js
    A ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    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.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A 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/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
    A ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/resourceproxy/__init__.py
    A ckanext/resourceproxy/controller.py
    A ckanext/resourceproxy/plugin.py
    A ckanext/resourceproxy/tests/__init__.py
    A ckanext/resourceproxy/tests/file_server.py
    A ckanext/resourceproxy/tests/static/huge.json
    A ckanext/resourceproxy/tests/static/test.json
    A ckanext/resourceproxy/tests/test_proxy.py
    M doc/configuration.rst
    A doc/email-notifications.rst
    M doc/index.rst
    M doc/organizations_and_groups.rst
    M doc/toolkit.rst
    M doc/writing-extensions.rst
    M setup.py
    M test-core.ini

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

Conflicts:
	ckan/logic/__init__.py

    imports


  Commit: 268e90727ced9572fcbf5c57a22540be8ea71e95
      https://github.com/okfn/ckan/commit/268e90727ced9572fcbf5c57a22540be8ea71e95
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-08 (Tue, 08 Jan 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Import _ from pylons


  Commit: d6bebc641e0e9481cfd554e05871053d1af3f392
      https://github.com/okfn/ckan/commit/d6bebc641e0e9481cfd554e05871053d1af3f392
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-08 (Tue, 08 Jan 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Import base not import from base


  Commit: 3e1321f425646f35e991ca443968fe09e3bfe591
      https://github.com/okfn/ckan/commit/3e1321f425646f35e991ca443968fe09e3bfe591
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-08 (Tue, 08 Jan 2013)

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

  Log Message:
  -----------
  [#3021] Make user dropdown work with no js


  Commit: 669a559654f3666d3cd58d51c6b39eb403228eb3
      https://github.com/okfn/ckan/commit/669a559654f3666d3cd58d51c6b39eb403228eb3
  Author: John Martin <me at johnmart.in>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dropdown.less
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  [#3012] Small tweaks and lessifying JS dropdown


  Commit: d9282952a5b0b2d329605ce6fc9cc65594a066f1
      https://github.com/okfn/ckan/commit/d9282952a5b0b2d329605ce6fc9cc65594a066f1
  Author: John Martin <me at johnmart.in>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

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

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


  Commit: 4bb1a405971770894899de3437e70cd2cd454d88
      https://github.com/okfn/ckan/commit/4bb1a405971770894899de3437e70cd2cd454d88
  Author: John Martin <me at johnmart.in>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

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

  Log Message:
  -----------
  Merge pull request #261 from okfn/3021-logout-no-js

[#3021] Make user dropdown work with no js


  Commit: 4977df6ec5f4cda863151d0b8705c187df4a2975
      https://github.com/okfn/ckan/commit/4977df6ec5f4cda863151d0b8705c187df4a2975
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    R ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    R ckan/controllers/group_formalchemy.py
    M ckan/controllers/home.py
    A ckan/controllers/organization.py
    M ckan/controllers/package.py
    R ckan/controllers/package_formalchemy.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    R ckan/forms/__init__.py
    R ckan/forms/authorization_group.py
    R ckan/forms/authz.py
    R ckan/forms/builder.py
    R ckan/forms/common.py
    R ckan/forms/group.py
    R ckan/forms/package.py
    R ckan/forms/package_dict.py
    R ckan/forms/registry.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    A ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    A ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.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/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
    R ckan/logic/auth/publisher/__init__.py
    R ckan/logic/auth/publisher/create.py
    R ckan/logic/auth/publisher/delete.py
    R ckan/logic/auth/publisher/get.py
    R ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/063_org_changes.py
    A ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/authz.py
    M ckan/model/dashboard.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/main.min.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/maroon.min.css
    M ckan/public/base/css/red.css
    M ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/css/json.css
    R ckan/public/base/datapreview/css/json.min.css
    R ckan/public/base/datapreview/css/pdf.css
    R ckan/public/base/datapreview/css/pdf.min.css
    R ckan/public/base/datapreview/css/recline.css
    R ckan/public/base/datapreview/css/recline.min.css
    R ckan/public/base/datapreview/img/ajaxload-circle.gif
    R ckan/public/base/datapreview/preview_json.js
    R ckan/public/base/datapreview/preview_json.min.js
    R ckan/public/base/datapreview/preview_pdf.js
    R ckan/public/base/datapreview/preview_pdf.min.js
    R ckan/public/base/datapreview/preview_recline.js
    R ckan/public/base/datapreview/preview_recline.min.js
    R ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/moment.js
    R ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    R ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    R ckan/public/base/datapreview/vendor/recline/css/recline.css
    R ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    R ckan/public/base/datapreview/vendor/recline/recline.js
    R ckan/public/base/datapreview/vendor/recline/recline.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.min.js
    R ckan/public/base/datapreview/vendor/webL10n/README.md
    R ckan/public/base/datapreview/vendor/webL10n/l10n.js
    R ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
    A ckan/public/base/images/editing.png
    M ckan/public/base/images/placeholder-group.png
    A ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/client.min.js
    M ckan/public/base/javascript/module.min.js
    A ckan/public/base/javascript/modules/activity-stream.js
    A ckan/public/base/javascript/modules/dashboard.min.js
    M ckan/public/base/javascript/modules/data-viewer.min.js
    A ckan/public/base/javascript/modules/follow.min.js
    M ckan/public/base/javascript/modules/popover-context.js
    A ckan/public/base/javascript/modules/popover-context.min.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/variables.less
    A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    A ckan/templates/activity_streams/activity_stream_email_notifications.text
    M ckan/templates/activity_streams/activity_stream_items.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
    A ckan/templates/ajax_snippets/popover_context_dataset.html
    A ckan/templates/ajax_snippets/popover_context_group.html
    A ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/base.html
    R ckan/templates/dataviewer/json.html
    R ckan/templates/dataviewer/pdf.html
    R ckan/templates/dataviewer/recline.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/page_header.html
    M ckan/templates/footer.html
    M ckan/templates/group/base_form_page.html
    A ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/index.html
    A ckan/templates/group/member_new.html
    A ckan/templates/group/members.html
    M ckan/templates/group/read.html
    A ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    A ckan/templates/organization/about.html
    A ckan/templates/organization/admins.html
    A ckan/templates/organization/base_form_page.html
    A ckan/templates/organization/confirm_delete.html
    A ckan/templates/organization/confirm_delete_member.html
    A ckan/templates/organization/edit.html
    A ckan/templates/organization/edit_base.html
    A ckan/templates/organization/index.html
    A ckan/templates/organization/member_new.html
    A ckan/templates/organization/members.html
    A ckan/templates/organization/new.html
    A ckan/templates/organization/new_organization_form.html
    A ckan/templates/organization/read.html
    A ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/feeds.html
    A ckan/templates/organization/snippets/info.html
    A ckan/templates/organization/snippets/organization_form.html
    A ckan/templates/organization/snippets/organization_item.html
    A ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    A ckan/templates/package/activity_stream.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    A ckan/templates/snippets/organization.html
    A ckan/templates/snippets/organization_item.html
    A ckan/templates/snippets/page_header.html
    A ckan/templates/snippets/private.html
    A ckan/templates/tests/mock_json_resource_preview_template.html
    A ckan/templates/tests/mock_resource_preview_template.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read.html
    A ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followers.html
    M ckan/templates_legacy/admin/index.html
    M ckan/templates_legacy/admin/layout.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/forms/__init__.py
    R ckan/tests/forms/test_authz.py
    R ckan/tests/forms/test_group.py
    R ckan/tests/forms/test_package.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_package.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
    A ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authz.py
    R ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/functional/test_pagination.py
    A ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_publisher_auth.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    R ckan/tests/lib/test_authztool.py
    A ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    A ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_auth.py
    R ckan/tests/misc/test_auth_profiles.py
    M ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_package_saver.py
    M ckan/tests/mock_mail_server.py
    R ckan/tests/models/test_authz.py
    R ckan/tests/models/test_repo.py
    R ckan/tests/test_authz.py
    M ckan_deb/usr/lib/ckan/common.sh
    A ckanext/jsonpreview/__init__.py
    A ckanext/jsonpreview/plugin.py
    A ckanext/jsonpreview/tests/__init__.py
    A ckanext/jsonpreview/tests/test_preview.py
    A ckanext/jsonpreview/theme/public/css/json.css
    A ckanext/jsonpreview/theme/public/css/json.min.css
    A ckanext/jsonpreview/theme/public/preview_json.js
    A ckanext/jsonpreview/theme/public/preview_json.min.js
    A ckanext/jsonpreview/theme/public/resource.config
    A ckanext/jsonpreview/theme/templates/json.html
    A ckanext/pdfpreview/__init__.py
    A ckanext/pdfpreview/plugin.py
    A ckanext/pdfpreview/tests/__init__.py
    A ckanext/pdfpreview/tests/test_preview.py
    A ckanext/pdfpreview/theme/public/css/pdf.css
    A ckanext/pdfpreview/theme/public/css/pdf.min.css
    A ckanext/pdfpreview/theme/public/css/recline.css
    A ckanext/pdfpreview/theme/public/css/recline.min.css
    A ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfpreview/theme/public/preview_pdf.js
    A ckanext/pdfpreview/theme/public/preview_pdf.min.js
    A ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/reclinepreview/__init__.py
    A ckanext/reclinepreview/plugin.py
    A ckanext/reclinepreview/tests/__init__.py
    A ckanext/reclinepreview/tests/test_preview.py
    A ckanext/reclinepreview/theme/public/css/recline.css
    A ckanext/reclinepreview/theme/public/css/recline.min.css
    A ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclinepreview/theme/public/preview_recline.js
    A ckanext/reclinepreview/theme/public/preview_recline.min.js
    A ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    A ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    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.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A 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/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    A ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
    A ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/resourceproxy/__init__.py
    A ckanext/resourceproxy/controller.py
    A ckanext/resourceproxy/plugin.py
    A ckanext/resourceproxy/tests/__init__.py
    A ckanext/resourceproxy/tests/file_server.py
    A ckanext/resourceproxy/tests/static/huge.json
    A ckanext/resourceproxy/tests/static/test.json
    A ckanext/resourceproxy/tests/test_proxy.py
    M doc/configuration.rst
    A doc/email-notifications.rst
    M doc/index.rst
    A doc/organizations_and_groups.rst
    M doc/toolkit.rst
    M doc/writing-extensions.rst
    M setup.py
    M test-core.ini

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


  Commit: a390cdf49cad3f9736a6e2a159107d10128c4864
      https://github.com/okfn/ckan/commit/a390cdf49cad3f9736a6e2a159107d10128c4864
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    M ckan/controllers/package.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/action/create.py
    M ckan/logic/action/update.py
    A ckan/migration/versions/066_default_package_type.py
    M ckan/model/package.py
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dropdown.less
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/facet_list.html
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/test_tag_vocab_plugin.py
    M doc/configuration.rst
    M doc/datastore-api.rst
    M doc/datastore.rst

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


  Commit: e1821b791bfb3f4718d6d42a06252b5f50d20e33
      https://github.com/okfn/ckan/commit/e1821b791bfb3f4718d6d42a06252b5f50d20e33
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-10 (Thu, 10 Jan 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Improve get_action() docstring: PEP257 style and generally more explicit


  Commit: 732fe91fe8a104ff7bd516674d9f5e8209540e52
      https://github.com/okfn/ckan/commit/732fe91fe8a104ff7bd516674d9f5e8209540e52
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Fix a small copy-paste error in datastore docs

Change "suggested that this is fixed before continuing with the CKAN
install" to "suggested that this is fixed before continuing with the
datastore setup".


  Commit: b13c91f53c32aadb34753f67a40e3f8dcd6538dd
      https://github.com/okfn/ckan/commit/b13c91f53c32aadb34753f67a40e3f8dcd6538dd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Change writuser to ckanuser in datastore setup instructions

Use the same postgres username as the CKAN source install instructions
use, otherwise users will run into errors when following the datastore
setup instructions.


  Commit: 337253bb6780a9a2de0a0260b5d0982ab4250081
      https://github.com/okfn/ckan/commit/337253bb6780a9a2de0a0260b5d0982ab4250081
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Remove some unnecessary lines from datastore docs


  Commit: 19f3b3698895cc514fd0d453c5430e04cae04d3b
      https://github.com/okfn/ckan/commit/19f3b3698895cc514fd0d453c5430e04cae04d3b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#268] Correct datastore db name in ini template

The default development.ini file should use the same datastore database
name as used in the datastore setup instructions, otherwise the
instructions won't work.

Also delete unnecessary additional #'s


  Commit: 61b2fa062964b57fecde000978a3f337738d1d46
      https://github.com/okfn/ckan/commit/61b2fa062964b57fecde000978a3f337738d1d46
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Clarify that datastore URLs are in CKAN ini

Clarify that the ckan.datastore.write_url and read_url are set in the
CKAN config file.


  Commit: 6c9a7692295b1a48a58a01492b0562db36ed9a2f
      https://github.com/okfn/ckan/commit/6c9a7692295b1a48a58a01492b0562db36ed9a2f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Delete a couple of unnecessary lines from datastore docs


  Commit: 40435dd1715c311821fd5503a03fd543e9f755e6
      https://github.com/okfn/ckan/commit/40435dd1715c311821fd5503a03fd543e9f755e6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Correct the case of a title in the docs

Titles Should Be In Title Case


  Commit: 26d38f2def40861ae35041d98368a902e5eba79f
      https://github.com/okfn/ckan/commit/26d38f2def40861ae35041d98368a902e5eba79f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Clarify SQL_SUPER_USER in datastore docs


  Commit: 01c5a8dc84963a73b79344d9dd3d9078af23a2b7
      https://github.com/okfn/ckan/commit/01c5a8dc84963a73b79344d9dd3d9078af23a2b7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Remove unnecessary detail from datastore docs

Users just want to get it working, don't care how it used to be
implemented.


  Commit: 8189892ac504901e12b38d25f555e4628ef9435e
      https://github.com/okfn/ckan/commit/8189892ac504901e12b38d25f555e4628ef9435e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Clarify a note in the docs

Use a link to make it clear which 'steps below' the note is referring
to, and change the note to a warning.


  Commit: 82be9aa197bc36083a1e9f2fbbac362d626634ec
      https://github.com/okfn/ckan/commit/82be9aa197bc36083a1e9f2fbbac362d626634ec
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Minor corrections to datastore setup docs

Typos etc.


  Commit: 981949c6622d21f4f9cf462bc1969ade64b8609b
      https://github.com/okfn/ckan/commit/981949c6622d21f4f9cf462bc1969ade64b8609b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-11 (Fri, 11 Jan 2013)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Merge branch 'autofix_config_get_action'


  Commit: 5d311b3eaa056885f873d0007bf7562ac38ad8d0
      https://github.com/okfn/ckan/commit/5d311b3eaa056885f873d0007bf7562ac38ad8d0
  Author: amercader <amercadero at gmail.com>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number


  Commit: cff07be27df9daa398b29c7256b966fca063577e
      https://github.com/okfn/ckan/commit/cff07be27df9daa398b29c7256b966fca063577e
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

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

  Log Message:
  -----------
  Fixed template


  Commit: 32dd5e2fee75c38aaec176389adfb7eea044c608
      https://github.com/okfn/ckan/commit/32dd5e2fee75c38aaec176389adfb7eea044c608
  Author: amercader <amercadero at gmail.com>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

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

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


  Commit: 58eea3ae8156306e8feec96d20d76791c95408cc
      https://github.com/okfn/ckan/commit/58eea3ae8156306e8feec96d20d76791c95408cc
  Author: amercader <amercadero at gmail.com>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

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

  Log Message:
  -----------
  Fixes sysadmins not getting all orgs if they hadn't created them


  Commit: d6491612b5310b85e84d544429c04d34f23d19d8
      https://github.com/okfn/ckan/commit/d6491612b5310b85e84d544429c04d34f23d19d8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

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

  Log Message:
  -----------
  [#270] Add comment


  Commit: 70fdfa6843490195de727c592a1f065aab5ee4b8
      https://github.com/okfn/ckan/commit/70fdfa6843490195de727c592a1f065aab5ee4b8
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

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

  Log Message:
  -----------
  Make package item extensible


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

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

  Log Message:
  -----------
  [#272] Fix template indentation


  Commit: 8c69f13a0d9988c0411792dcde9cdd18d35b4c58
      https://github.com/okfn/ckan/commit/8c69f13a0d9988c0411792dcde9cdd18d35b4c58
  Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

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

  Log Message:
  -----------
  Corrected hidden macros


  Commit: 92f212ea6d5c50ed1ce9f7c6c672e64261b25ee6
      https://github.com/okfn/ckan/commit/92f212ea6d5c50ed1ce9f7c6c672e64261b25ee6
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M ckanext/datastore/bin/datastore_setup.py

  Log Message:
  -----------
  [#268] Errors in psql during datastore set up are now noticed, also disable forced password prompt


  Commit: 5c501e3d7cbf4b93feb2a12a5b4365d718ece3c9
      https://github.com/okfn/ckan/commit/5c501e3d7cbf4b93feb2a12a5b4365d718ece3c9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#268] Add simple datastore setup tests that does not require an API key


  Commit: a75779d2c212a21fad2a4157bc1ba11fd0499fa8
      https://github.com/okfn/ckan/commit/a75779d2c212a21fad2a4157bc1ba11fd0499fa8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    A .travis.yml
    M README.rst

  Log Message:
  -----------
  Add basic Travis-CI support

It's running only CKAN core's tests on SQLite so far.


  Commit: 3dad293bcd7b57e136acff14ac80cfc6bbde167f
      https://github.com/okfn/ckan/commit/3dad293bcd7b57e136acff14ac80cfc6bbde167f
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Fix Build Status image


  Commit: 9f2cf6556edfa7332ca57fccf7c849e2279a6dda
      https://github.com/okfn/ckan/commit/9f2cf6556edfa7332ca57fccf7c849e2279a6dda
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  Fixing minor typo in the docs


  Commit: 085d9c99b0e66e41cf5d756738eed2a84843a59b
      https://github.com/okfn/ckan/commit/085d9c99b0e66e41cf5d756738eed2a84843a59b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    A .travis.yml
    M README.rst
    M ckan/__init__.py
    M doc/test.rst

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


  Commit: 6aaf60436fbba2588dc1271dacaeb32abb6f02ca
      https://github.com/okfn/ckan/commit/6aaf60436fbba2588dc1271dacaeb32abb6f02ca
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    A .travis.yml
    M README.rst
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    A ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.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/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/migration/versions/063_org_changes.py
    A ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/065_add_email_notifications_preference.py
    A ckan/migration/versions/066_default_package_type.py
    M ckan/model/dashboard.py
    M ckan/model/package.py
    M ckan/model/user.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dropdown.less
    M ckan/public/base/less/forms.less
    A ckan/templates/activity_streams/activity_stream_email_notifications.text
    M ckan/templates/ajax_snippets/popover_context_dataset.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/base.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/index.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/functional/api/test_dashboard.py
    A ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    A ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/misc/test_mock_mail_server.py
    M ckan/tests/mock_mail_server.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/test_tag_vocab_plugin.py
    M doc/configuration.rst
    M doc/datastore-api.rst
    M doc/datastore.rst
    A doc/email-notifications.rst
    M doc/index.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 220-clean-user-controller-imports


  Commit: 85e94eb894b0ae0a2e6cd14b525acd5a450555dd
      https://github.com/okfn/ckan/commit/85e94eb894b0ae0a2e6cd14b525acd5a450555dd
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  [#286] Fix group autocomplete to not show orgs


  Commit: 76cc9d3b8641489dc8e6674cb0e46ade02ce0b25
      https://github.com/okfn/ckan/commit/76cc9d3b8641489dc8e6674cb0e46ade02ce0b25
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Run DataStore tests in Travis-CI

I had to do a workaround so "paster datastore set-permissions" would work. The
problem is that the code calls psql passing the -W option. This option asks for
the database's password, even if you don't need it. So I simply removed it.

We should look into a better solution for this.


  Commit: 19ddbed2206bd8dd0a22d378aa4ef08d437f8eef
      https://github.com/okfn/ckan/commit/19ddbed2206bd8dd0a22d378aa4ef08d437f8eef
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Set up IRC notifications for Travis-CI


  Commit: c17478f7146a13e7aea118e5fe72474277c304b2
      https://github.com/okfn/ckan/commit/c17478f7146a13e7aea118e5fe72474277c304b2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-20 (Sun, 20 Jan 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#269] Database URLs are not commented out by default


  Commit: a9caab85789987307f72d0e72790020e444e4cc9
      https://github.com/okfn/ckan/commit/a9caab85789987307f72d0e72790020e444e4cc9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-20 (Sun, 20 Jan 2013)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  [#269] Add link to DataStore setup instructions to source install docs


  Commit: 2011dcbe07c7a7634633bfcced2ab861dc1c5821
      https://github.com/okfn/ckan/commit/2011dcbe07c7a7634633bfcced2ab861dc1c5821
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    A .travis.yml
    M README.rst
    M ckan/__init__.py
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/templates/macros/form.html
    M ckan/templates/snippets/package_item.html
    M doc/test.rst

  Log Message:
  -----------
  Merge branch 'master' into 268-datastore-setup-instructions-dont-work


  Commit: ac6eaa89822172268d155be2e460e7c0f4f0d28d
      https://github.com/okfn/ckan/commit/ac6eaa89822172268d155be2e460e7c0f4f0d28d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  [#269] Cleared datastore setup step in source install docs


  Commit: 38cb403a67121c79acb5193840203e8c2e829a62
      https://github.com/okfn/ckan/commit/38cb403a67121c79acb5193840203e8c2e829a62
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#269] Commented datastore URLs by default


  Commit: c9a1bcca6843e4763b0b80b40d2054b436998a0d
      https://github.com/okfn/ckan/commit/c9a1bcca6843e4763b0b80b40d2054b436998a0d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    A CONTRIBUTING.rst
    R doc/contributing-docs.rst
    R doc/contributing.rst
    M doc/index.rst

  Log Message:
  -----------
  Add CONTRIBUTING.rst file

Move doc/contributing.rst and doc/contributing-docs.rst into
/CONTRIBUTING.rst, now it should show up on GitHub:
https://github.com/blog/1184-contributing-guidelines


  Commit: 8fb9bf6e8ebaaa0a42c538ce09fbe9a1269a6960
      https://github.com/okfn/ckan/commit/8fb9bf6e8ebaaa0a42c538ce09fbe9a1269a6960
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Attempt to fix contributing to docs link


  Commit: fff0a0e7d6215a36941d523453bac67ebd720e2a
      https://github.com/okfn/ckan/commit/fff0a0e7d6215a36941d523453bac67ebd720e2a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Fix a typo


  Commit: 2e8097d850de01dfbd69c4e624952c138b8dd1c3
      https://github.com/okfn/ckan/commit/2e8097d850de01dfbd69c4e624952c138b8dd1c3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    A .travis.yml
    A CONTRIBUTING.rst
    M README.rst
    M ckan/__init__.py
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/templates/macros/form.html
    M ckan/templates/snippets/package_item.html
    R doc/contributing-docs.rst
    R doc/contributing.rst
    M doc/index.rst
    M doc/test.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 268-datastore-setup-instructions-dont-work


  Commit: 06815383d603ae4b7b11663b31211a0d191533ca
      https://github.com/okfn/ckan/commit/06815383d603ae4b7b11663b31211a0d191533ca
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datastore/bin/datastore_setup.py
    M doc/datastore-setup.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch '268-datastore-setup-instructions-dont-work' of github.com:okfn/ckan into 268-datastore-setup-instructions-dont-work


  Commit: e3100e91aa6c1da8246c3961408d77083b257910
      https://github.com/okfn/ckan/commit/e3100e91aa6c1da8246c3961408d77083b257910
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  Update solr schema in solr setup docs


  Commit: 7aafdb9af7d477ab0cf7e7a43bb52316c861b351
      https://github.com/okfn/ckan/commit/7aafdb9af7d477ab0cf7e7a43bb52316c861b351
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datastore/bin/datastore_setup.py
    M doc/datastore-setup.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch '268-datastore-setup-instructions-dont-work'


  Commit: b575a8a63d03768b3b8ab9d04d695e39916e9534
      https://github.com/okfn/ckan/commit/b575a8a63d03768b3b8ab9d04d695e39916e9534
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

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

  Log Message:
  -----------
  [#248] Fix auth function


  Commit: 2165bdaa214995c1f4998633382ac7ad4fac3519
      https://github.com/okfn/ckan/commit/2165bdaa214995c1f4998633382ac7ad4fac3519
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#220] Fix asbool callw


  Commit: a1d4d3cad76fa66e3cadbe241f61da2e091abbf0
      https://github.com/okfn/ckan/commit/a1d4d3cad76fa66e3cadbe241f61da2e091abbf0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#220] Fix broken tests due to markdown processing


  Commit: 94e21ce3676a6a261c80c5147a8c68619f7cb030
      https://github.com/okfn/ckan/commit/94e21ce3676a6a261c80c5147a8c68619f7cb030
  Author: John Glover <j at johnglover.net>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#220] Some PEP8 fixes for user controller.


  Commit: aa7aa5df70474db2aa320c685b98a0ee4703b585
      https://github.com/okfn/ckan/commit/aa7aa5df70474db2aa320c685b98a0ee4703b585
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #220 from okfn/220-clean-user-controller-imports

User Controller is a mess


  Commit: ce79a5d1cf1b6ead2518ce646ad1ca69925677e0
      https://github.com/okfn/ckan/commit/ce79a5d1cf1b6ead2518ce646ad1ca69925677e0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    A .travis.yml
    A CONTRIBUTING.rst
    M README.rst
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/celery_app.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
    A ckan/migration/versions/066_default_package_type.py
    M ckan/model/package.py
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dropdown.less
    M ckan/templates/ajax_snippets/popover_context_dataset.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/package_item.html
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/test_tag_vocab_plugin.py
    M doc/configuration.rst
    R doc/contributing-docs.rst
    R doc/contributing.rst
    M doc/datastore-api.rst
    M doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/solr-setup.rst
    M doc/test.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3030-clean-helper-functions


  Commit: e3699a4d1b852001b7f7d55f3ba0785bf28b3e09
      https://github.com/okfn/ckan/commit/e3699a4d1b852001b7f7d55f3ba0785bf28b3e09
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch '3030-clean-helper-functions'


  Commit: ca05ff1f6085692a3fcd77835489b90426b716fb
      https://github.com/okfn/ckan/commit/ca05ff1f6085692a3fcd77835489b90426b716fb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    A .travis.yml
    A CONTRIBUTING.rst
    M README.rst
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dropdown.less
    M ckan/templates/macros/form.html
    M ckan/templates/snippets/package_item.html
    M ckanext/datastore/bin/datastore_setup.py
    R doc/contributing-docs.rst
    R doc/contributing.rst
    M doc/datastore-setup.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/solr-setup.rst
    M doc/test.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 2750-add-docs-and-examples-for-idatasetform-and-igroupform


  Commit: c4e26bfea4d14d4646f289af059b9ca7ed2927e0
      https://github.com/okfn/ckan/commit/c4e26bfea4d14d4646f289af059b9ca7ed2927e0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

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

  Log Message:
  -----------
  [#247] Fix indent and trailing ))


  Commit: 00dd6dd32470e833ec98f6c9870755c39fb83658
      https://github.com/okfn/ckan/commit/00dd6dd32470e833ec98f6c9870755c39fb83658
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    A .travis.yml
    A CONTRIBUTING.rst
    M README.rst
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/celery_app.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
    A ckan/migration/versions/066_default_package_type.py
    M ckan/model/package.py
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/dropdown.less
    M ckan/templates/macros/form.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/package_item.html
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclinepreview/plugin.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/test_tag_vocab_plugin.py
    M doc/configuration.rst
    R doc/contributing-docs.rst
    R doc/contributing.rst
    M doc/datastore-api.rst
    M doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/solr-setup.rst
    M doc/test.rst

  Log Message:
  -----------
  Merge branch 'master' into 247-auth-action-update


  Commit: 0b6c6e9fa58fea34c0c1e19433be98faaee09865
      https://github.com/okfn/ckan/commit/0b6c6e9fa58fea34c0c1e19433be98faaee09865
  Author: amercader <amercadero at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  [#3023] Fix failing test


  Commit: 391df0ba5b5c00ecd4e08d865d97419ce0c553c4
      https://github.com/okfn/ckan/commit/391df0ba5b5c00ecd4e08d865d97419ce0c553c4
  Author: amercader <amercadero at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  [#286] Add a test


  Commit: 17d3bb8c9d6c3c0e0727b13ca5d1e074a2835eea
      https://github.com/okfn/ckan/commit/17d3bb8c9d6c3c0e0727b13ca5d1e074a2835eea
  Author: amercader <amercadero at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/model/group.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  Merge and close #286


  Commit: 8798b1bc60aafb65570d2fc2c0a188bda402d03c
      https://github.com/okfn/ckan/commit/8798b1bc60aafb65570d2fc2c0a188bda402d03c
  Author: kindly <kindly at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    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/plugins/interfaces.py
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3023-data_dict-extension-points'


  Commit: bc1d99ca5ea1f6acdcce21333eb576ead2d68cb3
      https://github.com/okfn/ckan/commit/bc1d99ca5ea1f6acdcce21333eb576ead2d68cb3
  Author: kindly <kindly at gmail.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/247-auth-action-update'


  Commit: aacf8f6967721164d72924f70e620df6da6c56f3
      https://github.com/okfn/ckan/commit/aacf8f6967721164d72924f70e620df6da6c56f3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    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/update.py
    M ckan/model/group.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 2750-add-docs-and-examples-for-idatasetform-and-igroupform


  Commit: d6e38adda267b78cf31101868d05aa945c223c67
      https://github.com/okfn/ckan/commit/d6e38adda267b78cf31101868d05aa945c223c67
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    R ckanext/example_idatasetform/templates/package/new_package_form.html
    A ckanext/example_idatasetform/templates/package/new_package_metadata.html
    R ckanext/example_idatasetform/templates/package/read_core.html
    A ckanext/example_idatasetform/templates/package/snippets/package_form.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html

  Log Message:
  -----------
  [#2750] Update the templates for CKAN 2.0

Update the ckanext/example_idatasetform templates for CKAN 2.0.


  Commit: bad9a0eb11e830b2a96442a5031604ef4a8eceb2
      https://github.com/okfn/ckan/commit/bad9a0eb11e830b2a96442a5031604ef4a8eceb2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckanext/example_idatasetform/plugin.py

  Log Message:
  -----------
  [#2750] Implement db_to_form_schema_options()

Implement do_to_form_schema_options() and form_to_db_schema_options() so
that ckanext-exampleidatasetform's db_to_form_schema() and
form_to_db_schema() methods actually get called.

This is a temporary fix, this needs to be sorted out in CKAN core.


Compare: https://github.com/okfn/ckan/compare/430e445bf7b0...bad9a0eb11e8

• Previous message: [ckan-changes] [okfn/ckan] 92bb07: Auto populate some of context in get_action()
• Next message: [ckan-changes] [okfn/ckan] 426eee: [#270] Fixes sysadmins not getting all orgs if the...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]