[ckan-changes] [okfn/ckan] 27ac56: [#590] Renames edit to admin

[GitHub]

  Branch: refs/heads/release-v2.0
  Home:   https://github.com/okfn/ckan
  Commit: 27ac56bf3415f8e44a94d7fd6bee0b25742bea96
      https://github.com/okfn/ckan/commit/27ac56bf3415f8e44a94d7fd6bee0b25742bea96
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

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

  Log Message:
  -----------
  [#590] Renames edit to admin


  Commit: 6f9a14c2299a9bdc683915026d7c448d687d3188
      https://github.com/okfn/ckan/commit/6f9a14c2299a9bdc683915026d7c448d687d3188
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M ckan/templates/organization/edit_base.html

  Log Message:
  -----------
  [#590] Changes breadcrumb to admin


  Commit: 63157a81dc1647fb43b7a0dae8dc3884e9c6ad9b
      https://github.com/okfn/ckan/commit/63157a81dc1647fb43b7a0dae8dc3884e9c6ad9b
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M ckan/templates/organization/new.html

  Log Message:
  -----------
  [#592] Removes page header on create org page


  Commit: c4da37fe2ac63906a42663d6c66aeaf387bf39b5
      https://github.com/okfn/ckan/commit/c4da37fe2ac63906a42663d6c66aeaf387bf39b5
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M ckan/templates/organization/new.html

  Log Message:
  -----------
  [#592] Grammarification

Conflicts:

	ckan/templates/organization/new.html


  Commit: 1eb432aa11b85f22b3b2cf59ac446a46958f9486
      https://github.com/okfn/ckan/commit/1eb432aa11b85f22b3b2cf59ac446a46958f9486
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/group/index.html
    M ckan/templates/organization/index.html
    M ckan/templates/snippets/search_result_text.html

  Log Message:
  -----------
  [#583] Improvements to the search text including number formatting, groups, orgs

Conflicts:
	ckan/templates/group/index.html
	ckan/templates/organization/index.html

    not too bad merges


Compare: https://github.com/okfn/ckan/compare/3c30303e7450...1eb432aa11b8