[ckan-changes] [okfn/ckan] 37b8a0: [master][#1709]: Fix for simple_search broken on h...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 37b8a0b742ed21c9ec415f77d1f7b62052ae9464
      https://github.com/okfn/ckan/commit/37b8a0b742ed21c9ec415f77d1f7b62052ae9464
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/lib/search/sql.py
  A ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  [master][#1709]: Fix for simple_search broken on home page and added simple tests.


  Commit: 4325830ab0aa50cb2e27f3a691b5265ca7148271
      https://github.com/okfn/ckan/commit/4325830ab0aa50cb2e27f3a691b5265ca7148271
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
  M ckan/logic/schema.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
  A ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/graph-flot.css
  A ckan/public/scripts/vendor/recline/css/images/edit-map.png
  A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
  A ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/group/layout.html
  M ckan/templates/js_strings.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html

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

Conflicts:
	ckan/lib/search/sql.py


Compare: https://github.com/okfn/ckan/compare/fda5bbb...4325830