[ckan-changes] [okfn/ckan] 5d1e58: Cleaner fix to model import issue
GitHub
noreply at github.com
Thu Dec 20 13:44:45 UTC 2012
Branch: refs/heads/master
Home: https://github.com/okfn/ckan
Commit: 5d1e58018c3e8d894146b28f2da4f8316ddd99a0
https://github.com/okfn/ckan/commit/5d1e58018c3e8d894146b28f2da4f8316ddd99a0
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-18 (Tue, 18 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Cleaner fix to model import issue
Commit: 1e5b931bd9228a7992f997a04fdf1c4039c6a294
https://github.com/okfn/ckan/commit/1e5b931bd9228a7992f997a04fdf1c4039c6a294
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-20 (Thu, 20 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/controllers/user.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/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/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/test_dashboard.py
A ckan/tests/functional/api/test_email_notifications.py
M ckan/tests/functional/test_package.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/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 clean-model-dictize
Commit: 2b6101a81a129ec77fba1b1ab63396b54e662e9d
https://github.com/okfn/ckan/commit/2b6101a81a129ec77fba1b1ab63396b54e662e9d
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-20 (Thu, 20 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Fix dictization fix - missing import
Commit: 08d3341b48e906add11d1f0758bb3f582ba8040b
https://github.com/okfn/ckan/commit/08d3341b48e906add11d1f0758bb3f582ba8040b
Author: amercader <amercadero at gmail.com>
Date: 2012-12-20 (Thu, 20 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Merge branch 'clean-model-dictize'
Compare: https://github.com/okfn/ckan/compare/9c15d8c74781...08d3341b48e9
More information about the ckan-changes
mailing list