[ckan-changes] [ckan/ckan] 4332c7: [#2472] Offer existing license in form if it is mi...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 4332c72d57e259335064e87e22f1319487596a42
      https://github.com/ckan/ckan/commit/4332c72d57e259335064e87e22f1319487596a42
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#2472] Offer existing license in form if it is missing from current license.

(Extracted from 2478-licenses-specific)


  Commit: 97b91f796807eefc4838c6543696ea28235c98f3
      https://github.com/ckan/ckan/commit/97b91f796807eefc4838c6543696ea28235c98f3
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-07-01 (Wed, 01 Jul 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge branch '2472-offer-existing-license'

Conflicts:
	ckan/tests/lib/test_helpers.py


Compare: https://github.com/ckan/ckan/compare/c8fcc9de5a46...97b91f796807