[ckan-changes] [okfn/ckan] ae5d0a: reformat /ckan/ckan/config/middleware.py

GitHub noreply at github.com
Thu Oct 11 11:19:50 UTC 2012 

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: ae5d0a7b0d75213f653faeeaf3f6520f6e46e47c
      https://github.com/okfn/ckan/commit/ae5d0a7b0d75213f653faeeaf3f6520f6e46e47c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  reformat /ckan/ckan/config/middleware.py


  Commit: b838d56089a300653a370e10307faaf79e1efa5b
      https://github.com/okfn/ckan/commit/b838d56089a300653a370e10307faaf79e1efa5b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  reformat and removed imports from ckan/ckan/lib/plugins.py


  Commit: 00005581cf8d8960fe4d5fbd0958177d45fa9346
      https://github.com/okfn/ckan/commit/00005581cf8d8960fe4d5fbd0958177d45fa9346
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  reformat and removed double imports from ckan/ckan/lib/helpers.py


  Commit: 8430ec8e19e49e5e4afebf357028f5ff927e5782
      https://github.com/okfn/ckan/commit/8430ec8e19e49e5e4afebf357028f5ff927e5782
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/render.py
    R ckan/public/base/.gitignore
    A ckan/public/base/css/fuchsia.min.css
    A ckan/public/base/css/green.min.css
    A ckan/public/base/css/main.min.css
    A ckan/public/base/css/maroon.min.css
    A ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/css/datapreview.css
    A ckan/public/base/datapreview/css/json.css
    A ckan/public/base/datapreview/css/json.min.css
    A ckan/public/base/datapreview/css/pdf.css
    A ckan/public/base/datapreview/css/pdf.min.css
    A ckan/public/base/datapreview/css/recline.css
    A ckan/public/base/datapreview/css/recline.min.css
    R ckan/public/base/datapreview/datapreview.js
    A ckan/public/base/datapreview/img/ajaxload-circle.gif
    A ckan/public/base/datapreview/preview_json.js
    A ckan/public/base/datapreview/preview_json.min.js
    A ckan/public/base/datapreview/preview_pdf.js
    A ckan/public/base/datapreview/preview_pdf.min.js
    A ckan/public/base/datapreview/preview_recline.js
    A ckan/public/base/datapreview/preview_recline.min.js
    M ckan/public/base/datapreview/resource.config
    A ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.min.js
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
    M ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.js
    A ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    A ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
    A ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    A ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
    A ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.js
    A ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
    A ckan/public/base/datapreview/vendor/moment/1.6.2/moment.min.js
    A ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    A ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    A ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    A ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
    A ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    A ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    A ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    A ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    M ckan/public/base/datapreview/vendor/recline/recline.js
    A ckan/public/base/datapreview/vendor/recline/recline.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.min.js
    A ckan/public/base/datapreview/vendor/webL10n/README.md
    A ckan/public/base/datapreview/vendor/webL10n/l10n.js
    A ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
    A ckan/public/base/i18n/bg.min.js
    A ckan/public/base/i18n/ca.min.js
    A ckan/public/base/i18n/cs_CZ.min.js
    A ckan/public/base/i18n/de.min.js
    A ckan/public/base/i18n/el.min.js
    A ckan/public/base/i18n/es.min.js
    A ckan/public/base/i18n/fi.min.js
    A ckan/public/base/i18n/fr.min.js
    A ckan/public/base/i18n/hu.min.js
    A ckan/public/base/i18n/it.min.js
    A ckan/public/base/i18n/lt.min.js
    A ckan/public/base/i18n/lv.min.js
    A ckan/public/base/i18n/nl.min.js
    A ckan/public/base/i18n/no.min.js
    A ckan/public/base/i18n/pl.min.js
    A ckan/public/base/i18n/pt_BR.min.js
    A ckan/public/base/i18n/ro.min.js
    A ckan/public/base/i18n/ru.min.js
    A ckan/public/base/i18n/sk.min.js
    A ckan/public/base/i18n/sl.min.js
    A ckan/public/base/i18n/sq.min.js
    A ckan/public/base/i18n/sr.min.js
    A ckan/public/base/i18n/sr_Latn.min.js
    A ckan/public/base/i18n/sv.min.js
    A ckan/public/base/i18n/zh_TW.min.js
    A ckan/public/base/javascript/client.min.js
    A ckan/public/base/javascript/i18n.min.js
    A ckan/public/base/javascript/main.min.js
    A ckan/public/base/javascript/module.min.js
    A ckan/public/base/javascript/modules/api-info.min.js
    A ckan/public/base/javascript/modules/autocomplete.min.js
    A ckan/public/base/javascript/modules/basic-form.min.js
    A ckan/public/base/javascript/modules/confirm-action.min.js
    A ckan/public/base/javascript/modules/custom-fields.min.js
    A ckan/public/base/javascript/modules/data-viewer.js
    A ckan/public/base/javascript/modules/data-viewer.min.js
    A ckan/public/base/javascript/modules/related-item.min.js
    A ckan/public/base/javascript/modules/resource-form.min.js
    A ckan/public/base/javascript/modules/resource-upload-field.min.js
    A ckan/public/base/javascript/modules/select-switch.min.js
    A ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/notify.min.js
    A ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    A ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    A ckan/public/base/javascript/plugins/jquery.inherit.min.js
    A ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    A ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    A ckan/public/base/javascript/plugins/jquery.slug.min.js
    A ckan/public/base/javascript/plugins/jquery.truncator.min.js
    A ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    A ckan/public/base/javascript/pubsub.min.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/sandbox.min.js
    A ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/less/module.less
    A ckan/public/base/test/spec/ckan.spec.min.js
    A ckan/public/base/test/spec/client.spec.min.js
    A ckan/public/base/test/spec/module.spec.min.js
    A ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    A ckan/public/base/test/spec/modules/basic-form.spec.min.js
    A ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    A ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    A ckan/public/base/test/spec/modules/related-item.spec.min.js
    A ckan/public/base/test/spec/modules/resource-form.spec.min.js
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    A ckan/public/base/test/spec/notify.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    A ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    A ckan/public/base/test/spec/pubsub.spec.min.js
    A ckan/public/base/test/spec/sandbox.spec.min.js
    A ckan/public/base/test/vendor/chai.min.js
    A ckan/public/base/test/vendor/less.min.js
    A ckan/public/base/test/vendor/mocha.min.css
    A ckan/public/base/test/vendor/mocha.min.js
    A ckan/public/base/test/vendor/sinon.min.js
    A ckan/public/base/vendor/bootstrap.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    A ckan/public/base/vendor/html5.min.js
    A ckan/public/base/vendor/jed.min.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload-ui.min.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload.min.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.iframe-transport.min.js
    A ckan/public/base/vendor/jquery.min.js
    A ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/public/base/vendor/resource.config
    A ckan/public/base/vendor/select2/select2.min.css
    A ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/scripts/application.js
    A ckan/public/scripts/outside.js
    A ckan/public/scripts/vendor/resize/resize.js
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/base.html
    A ckan/templates/dataviewer/base.html
    A ckan/templates/dataviewer/json.html
    A ckan/templates/dataviewer/pdf.html
    A ckan/templates/dataviewer/recline.html
    A ckan/templates/dataviewer/snippets/data_preview.html
    A ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/data_api_button.html
    R ckan/templates/snippets/recline-extra-footer.html
    R ckan/templates/snippets/recline-extra-header.html
    M ckan/templates_legacy/package/resource_read.html
    A ckan/templates_legacy/package/snippets/data_preview.html
    M ckan/tests/wsgi_ckanclient.py
    A ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
    A ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_datastore.py
    M doc/apiv3.rst
    M doc/datastore.rst
    M doc/domain-model-resource.rst
    M doc/using-data-api.rst
    M setup.py
    M test-core.ini

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

Conflicts:
	ckan/lib/helpers.py


  Commit: b1f69327a16aff1c57e821886754e4a65ebb0760
      https://github.com/okfn/ckan/commit/b1f69327a16aff1c57e821886754e4a65ebb0760
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M ckan/controllers/storage.py
    M ckan/lib/package_saver.py

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


  Commit: 07d14f538bd97d368e6c50014ed10546dc10e5f3
      https://github.com/okfn/ckan/commit/07d14f538bd97d368e6c50014ed10546dc10e5f3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Merge branch 'pep8'


Compare: https://github.com/okfn/ckan/compare/06285bbc64c3...07d14f538bd9

More information about the ckan-changes mailing list