[ckan-changes] [okfn/ckan] 64c321: [#322] Adds the organization to the dataset page

Wed Feb 6 17:23:08 UTC 2013

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 64c321509656b7e46f6c65142a19694a4ad3c2e3
      https://github.com/okfn/ckan/commit/64c321509656b7e46f6c65142a19694a4ad3c2e3
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-01 (Fri, 01 Feb 2013)

  Changed paths:
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  [#322] Adds the organization to the dataset page


  Commit: 6233b9ade80a26354f705c6b42c14d03cd5fd868
      https://github.com/okfn/ckan/commit/6233b9ade80a26354f705c6b42c14d03cd5fd868
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/model/__init__.py
    M ckan/model/meta.py
    M ckan/templates/group/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  #322 merge master conflicts


  Commit: bba7c62c4324272c7295bd5e2041865b1271db3c
      https://github.com/okfn/ckan/commit/bba7c62c4324272c7295bd5e2041865b1271db3c
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  Merge branch '322-show-organizations-on-dataset'


  Commit: baaf68819563f5158585362ab1822fd4aff3b02a
      https://github.com/okfn/ckan/commit/baaf68819563f5158585362ab1822fd4aff3b02a
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less
    M ckan/templates/snippets/related.html

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


Compare: https://github.com/okfn/ckan/compare/28e20cc88474...baaf68819563