[ckan-changes] [okfn/ckan] 2a184a: [#1251] add view forms

[GitHub]

  Branch: refs/heads/1251-resource-view
  Home:   https://github.com/okfn/ckan
  Commit: 2a184a2261773cef77f416410965b19a67ce03e5
      https://github.com/okfn/ckan/commit/2a184a2261773cef77f416410965b19a67ce03e5
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py
    A ckan/templates/package/edit_view.html
    A ckan/templates/package/new_view.html
    M ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/resource_views.html
    A ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_help.html
    A ckan/templates/package/view_edit_base.html
    M ckanext/imageview/plugin.py
    A ckanext/imageview/theme/templates/image_form.html

  Log Message:
  -----------
  [#1251] add view forms


  Commit: eb5bf29b465dc3319812f52bea49045aaf39e850
      https://github.com/okfn/ckan/commit/eb5bf29b465dc3319812f52bea49045aaf39e850
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/view_edit_base.html

  Log Message:
  -----------
  [#1251] add preview


  Commit: e1e41b2659bac18e83fef4004fcc8250a1ae450e
      https://github.com/okfn/ckan/commit/e1e41b2659bac18e83fef4004fcc8250a1ae450e
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    A ckan/templates/package/snippets/resource_view.html
    M ckanext/imageview/plugin.py
    A ckanext/imageview/theme/templates/image_view.html

  Log Message:
  -----------
  [#1251] fix merge conflicts


Compare: https://github.com/okfn/ckan/compare/5737dcd5998a...e1e41b2659ba