[ckan-changes] [okfn/ckan] 46cd94: Merge branch 'feature-2375-demo-theme' of https://...

Thu May 31 15:44:20 UTC 2012

  Branch: refs/heads/feature-2445-add-related-new
  Home:   https://github.com/okfn/ckan
  Commit: 46cd94bcf927ffe07950d41fc153b94b4d03b005
      https://github.com/okfn/ckan/commit/46cd94bcf927ffe07950d41fc153b94b4d03b005
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/html_resources/__init__.py
    M ckan/lib/dictization/model_dictize.py
    A ckan/lib/extract.py
    M ckan/lib/helpers.py
    M ckan/lib/render.py
    A ckan/public/base/images/ckan.ico
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/templates/base.html
    M ckan/templates/header.html
    M ckan/templates/package/new.html
    A ckan/templates/package/new_package_form.html
    M ckan/templates/package/read.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/package_list.html
    A ckan/templates/snippets/popular.html
    M ckan/templates/snippets/social.html
    A ckan/templates/snippets/sort_by.html
    M setup.py

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of https://github.com/okfn/ckan into feature-2375-demo-theme


  Commit: 259065e07e286b50436b56ddbaa984abb768bf92
      https://github.com/okfn/ckan/commit/259065e07e286b50436b56ddbaa984abb768bf92
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/related.py
    M ckan/logic/schema.py
    A ckan/templates/related/edit.html
    A ckan/templates/related/edit_form.html
    A ckan/templates/related/new.html

  Log Message:
  -----------
  Updated the related controller to provide a /new and /edit url

Merged most of the new/edit code to save duplication


  Commit: 8d15ebbc70613a1309ab3dc51f089d59f88db1b8
      https://github.com/okfn/ckan/commit/8d15ebbc70613a1309ab3dc51f089d59f88db1b8
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  Added i18n import


  Commit: b30801453bdafde0f99aec582f90a8b6eed7274b
      https://github.com/okfn/ckan/commit/b30801453bdafde0f99aec582f90a8b6eed7274b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M ckan/templates/related/edit.html
    M ckan/templates/related/new.html

  Log Message:
  -----------
  Added text to sidebar for new/edit pages


Compare: https://github.com/okfn/ckan/compare/46cd94b^...b308014