[ckan-changes] [okfn/ckan] 37de56: [#3023] Add new extension points to pass the packa...

GitHub noreply at github.com
Fri Jan 25 10:01:40 UTC 2013


  Branch: refs/heads/283-activity-stream-fixes
  Home:   https://github.com/okfn/ckan
  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: 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: 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: b1b155e29d6d3bf286c11889b96a6a63941439b5
      https://github.com/okfn/ckan/commit/b1b155e29d6d3bf286c11889b96a6a63941439b5
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    M ckan/public/base/less/profile.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/group/read_base.html
    A ckan/templates/macros/format.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#235] Makes large numbers smaller if they are higher


  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: 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: 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: 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: 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: 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: 6aae85d1feb0db286846735b29d04085df00ca5f
      https://github.com/okfn/ckan/commit/6aae85d1feb0db286846735b29d04085df00ca5f
  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/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' into 235-popover-large-numbers


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

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  [#235] Minor bug fix in formatters


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

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  [#235] Add SI_number formatter


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#235] New follower_number template helper


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

  Changed paths:
    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/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#235] Templates use new formatter


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

  Changed paths:
    R ckan/templates/macros/format.html

  Log Message:
  -----------
  [#235] Remove format macro


  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: 45c6d0e30c2d9b7749ec5bd9b10fb977b91ff745
      https://github.com/okfn/ckan/commit/45c6d0e30c2d9b7749ec5bd9b10fb977b91ff745
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-01-23 (Wed, 23 Jan 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Call setup_template_variables() in new_metadata()

Fixes #297


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

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  [#281] Fix for incorrect padding right on the resource list for a package

Essentially the fix is as follows:

- Make the "Explore Data" and "Raw Data" links a dropdown
- This allows us to easilt add more links to the dropdown for extensions
- Also allows for better multi-lingual support


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

  Changed paths:
    M ckan/lib/helpers.py
    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/group/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#235] Change function name to SI_number_span()


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/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' into 235-popover-large-numbers


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

  Changed paths:
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/public/base/less/profile.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/group/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  Merge branch '235-popover-large-numbers'


  Commit: 635d1d8190d4b46893fd780e438ff1a7ccbc8b9b
      https://github.com/okfn/ckan/commit/635d1d8190d4b46893fd780e438ff1a7ccbc8b9b
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  Fix activity name, correct function all, and remove print statement


  Commit: b9fdf29cebfaee21d5f825ef8c28427816cb6075
      https://github.com/okfn/ckan/commit/b9fdf29cebfaee21d5f825ef8c28427816cb6075
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

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

  Log Message:
  -----------
  Add code to create an activity


  Commit: 5ef3f1671dab2ba66b76ad626c6b56f74de946be
      https://github.com/okfn/ckan/commit/5ef3f1671dab2ba66b76ad626c6b56f74de946be
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  Create validator for new activity


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

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

  Log Message:
  -----------
  [#281] Recompile main.css


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

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  Merge branch '281-resource-listing-buttons'


  Commit: c296f375164fefd11ee22051e5c024486c6676bc
      https://github.com/okfn/ckan/commit/c296f375164fefd11ee22051e5c024486c6676bc
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

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

  Log Message:
  -----------
  test for create, update, and delete related item


  Commit: fda40076b7092863ef729aa2455a6aabf5c8f083
      https://github.com/okfn/ckan/commit/fda40076b7092863ef729aa2455a6aabf5c8f083
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-01-25 (Fri, 25 Jan 2013)

  Changed paths:
    A CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/model/group.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/profile.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/group/read_base.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/models/test_group.py
    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

  Log Message:
  -----------
  Merge branch 'master' into 283-activity-stream-fixes


Compare: https://github.com/okfn/ckan/compare/5c1170efd1fc...fda40076b709


More information about the ckan-changes mailing list