[ckan-changes] [okfn/ckan] 132343: [#851] Don't specify http for dataproxy url to all...
GitHub
noreply at github.com
Mon Jun 24 09:38:57 UTC 2013
Branch: refs/heads/master
Home: https://github.com/okfn/ckan
Commit: 13234320aec6c34b5c3d846cdb9770585966bf9e
https://github.com/okfn/ckan/commit/13234320aec6c34b5c3d846cdb9770585966bf9e
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-06-04 (Tue, 04 Jun 2013)
Changed paths:
M ckanext/reclinepreview/theme/public/preview_recline.js
Log Message:
-----------
[#851] Don't specify http for dataproxy url to allow usage on https pages
Commit: 157542458fbaec1ffae9b84ee76ecd40306431df
https://github.com/okfn/ckan/commit/157542458fbaec1ffae9b84ee76ecd40306431df
Author: John Glover <j at johnglover.net>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M .gitmodules
A .pipignore
M CHANGELOG.rst
M LICENSE.txt
M bin/travis-build
M ckan/controllers/api.py
M ckan/controllers/package.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/068_add_package_extras_index.py
M ckan/model/meta.py
R ckan/model/test_user.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
M ckan/public/base/css/main.css
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/javascript/modules/confirm-action.js
A ckan/public/base/javascript/modules/media-grid.js
M ckan/public/base/javascript/modules/related-item.js
M ckan/public/base/javascript/modules/resource-upload-field.js
A ckan/public/base/javascript/plugins/jquery.masonry.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
M ckan/public/base/less/homepage.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/media.less
M ckan/public/base/less/module.less
M ckan/templates/group/snippets/group_item.html
M ckan/templates/group/snippets/group_list.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/organization/snippets/organization_item.html
M ckan/templates/organization/snippets/organization_list.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/resource_read.html
M ckan/templates/related/dashboard.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/related/snippets/related_list.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/organization_item.html
M ckan/tests/__init__.py
M ckan/tests/functional/test_related.py
M ckan/tests/lib/test_email_notifications.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_user.py
M ckan/tests/schema/test_schema.py
M ckan/tests/test_coding_standards.py
M ckanext/datastore/controller.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_create.py
M ckanext/datastore/tests/test_delete.py
M ckanext/datastore/tests/test_dump.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
M ckanext/example_idatasetform/plugin.py
M ckanext/pdfpreview/theme/public/resource.config
A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
M ckanext/pdfpreview/theme/templates/pdf.html
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/test_tag_vocab_plugin.py
A dev-requirements.txt
M doc/_themes/sphinx-theme-okfn
A doc/changelog.rst
M doc/conf.py
M doc/data-viewer.rst
M doc/datastore.rst
M doc/documentation-guidelines.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/installing.rst
M doc/paster.rst
M doc/release-process.rst
R doc/releases.rst
M doc/test.rst
M doc/toolkit.rst
A doc/upgrade-package-ckan-1-to-2.rst
A doc/upgrade-package-to-minor-release.rst
A doc/upgrade-package-to-patch-release.rst
A doc/upgrade-source.rst
R doc/upgrading-a-package-install.rst
R doc/upgrading-a-source-install.rst
A doc/upgrading.rst
M fabfile.py
R pip-requirements-docs.txt
R pip-requirements-test.txt
R pip-requirements.txt
A requirements.txt
M setup.py
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into 851-relative-recline-url
Commit: faf6514389f2228e71c20e84fc3c7f480c6e9dc9
https://github.com/okfn/ckan/commit/faf6514389f2228e71c20e84fc3c7f480c6e9dc9
Author: John Glover <j at johnglover.net>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M ckanext/reclinepreview/theme/public/preview_recline.js
Log Message:
-----------
Merge pull request #851 from okfn/851-relative-recline-url
Recline preview does not work on ssl page
Compare: https://github.com/okfn/ckan/compare/d6b239caaf27...faf6514389f2
More information about the ckan-changes
mailing list