[ckan-changes] [okfn/ckan] f7ec8a: [#626] Tweaks dashboard to have 3 new subpages

[GitHub]

  Branch: refs/heads/release-v2.1
  Home:   https://github.com/okfn/ckan
  Commit: f7ec8a806bb13d6a8ab2dad1abfed33a76f5746f
      https://github.com/okfn/ckan/commit/f7ec8a806bb13d6a8ab2dad1abfed33a76f5746f
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/nav.less
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/dashboard_datasets.html
    A ckan/templates/user/dashboard_groups.html
    A ckan/templates/user/dashboard_organizations.html

  Log Message:
  -----------
  [#626] Tweaks dashboard to have 3 new subpages

A my datasets, my orgs and my groups pages. Each one showing ownership of the
relevant items within it.

Conflicts:

	ckan/templates/user/dashboard.html


  Commit: 35a461cba8bda3fe7cb34d4be0cb947b15b93a7f
      https://github.com/okfn/ckan/commit/35a461cba8bda3fe7cb34d4be0cb947b15b93a7f
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html

  Log Message:
  -----------
  [#506] Tidys up views to have better breadcrumbs for editin user

Conflicts:

	ckan/templates/user/edit_base.html


  Commit: dc0db61cfd0cc3b9dc5ac7d84628df1e6af3fb72
      https://github.com/okfn/ckan/commit/dc0db61cfd0cc3b9dc5ac7d84628df1e6af3fb72
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html

  Log Message:
  -----------
  [#626] Use helper functions to get orgs/groups for dashboard plus cleanups

Conflicts:

	ckan/templates/group/snippets/group_item.html
	ckan/templates/organization/snippets/organization_item.html


  Commit: e02a5cffd51d7e652dbc0a591e53cfac5e859525
      https://github.com/okfn/ckan/commit/e02a5cffd51d7e652dbc0a591e53cfac5e859525
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html

  Log Message:
  -----------
  [#626] Fix for dashboard templates to go full width


  Commit: 340d758a080dabdc4e60e673c096f8fc9deccb1e
      https://github.com/okfn/ckan/commit/340d758a080dabdc4e60e673c096f8fc9deccb1e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#626] Tweak groups_available docstring


  Commit: a0025d45dc011b378bb2841628885c23fb01bfa2
      https://github.com/okfn/ckan/commit/a0025d45dc011b378bb2841628885c23fb01bfa2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#626] Tweak docstring for am_member param


  Commit: db06a4387e84cefc773116ed385b75305e20bd25
      https://github.com/okfn/ckan/commit/db06a4387e84cefc773116ed385b75305e20bd25
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#626] Tweak docstring for am_member param


  Commit: 913831d595e1f87c152c86d22fc96607e6add363
      https://github.com/okfn/ckan/commit/913831d595e1f87c152c86d22fc96607e6add363
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#626] Add display_name to group/org list for user action


  Commit: 1b1a2a378d51a31f8136b59a9748968b19dea8a6
      https://github.com/okfn/ckan/commit/1b1a2a378d51a31f8136b59a9748968b19dea8a6
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Rebuild CSS


Compare: https://github.com/okfn/ckan/compare/2676bb233e02...1b1a2a378d51