[ckan-changes] [okfn/ckan] 0ddeec: [#1251] view proxy sort out

[GitHub]

  Branch: refs/heads/1251-resource-view
  Home:   https://github.com/okfn/ckan
  Commit: 0ddeec82f8ce569f6fcb3f591490e2dc2df712ac
      https://github.com/okfn/ckan/commit/0ddeec82f8ce569f6fcb3f591490e2dc2df712ac
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/resourceproxy/plugin.py

  Log Message:
  -----------
  [#1251] view proxy sort out


  Commit: 82101eb7a24939e9b0ce53e335ddf723e822775b
      https://github.com/okfn/ckan/commit/82101eb7a24939e9b0ce53e335ddf723e822775b
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/view_edit_base.html
    M ckanext/imageview/plugin.py
    A ckanext/imageview/tests/__init__.py
    A ckanext/imageview/tests/test_view.py

  Log Message:
  -----------
  fix merge issue in branch


Compare: https://github.com/okfn/ckan/compare/65796b9304b4...82101eb7a249