[ckan-changes] [okfn/ckan] f16450: [#1695][logic, doc, config]: Added way to create rel...

Fri Jan 27 14:52:20 UTC 2012

  Branch: refs/heads/feature-1515-activity-streams
  Home:   https://github.com/okfn/ckan
  Commit: f16450c1c34cac09046a098273f66d2b75aa87dd
      https://github.com/okfn/ckan/commit/f16450c1c34cac09046a098273f66d2b75aa87dd
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-24 (Tue, 24 Jan 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/lib/search/index.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/schema.py
  M ckan/model/package.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_relationships.py
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/file-upload.rst
  M doc/index.rst

  Log Message:
  -----------
  [#1695][logic,doc,config]: Added way to create relationship by POST to the Register (instead of Entity). Correct API docs for creating relationship and recovered lost Model Methods section.

  Commit: 631faa872aa7af5f64c0e1ededfd09ee6a0f64e7
      https://github.com/okfn/ckan/commit/631faa872aa7af5f64c0e1ededfd09ee6a0f64e7
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-24 (Tue, 24 Jan 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/helpers.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/_util.html
  A ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/layout_base.html
  R ckan/templates/package/facets.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/test_group.py
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  M doc/theming.rst

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

  Commit: ef6675ddf450543df9cdd0aac64de3530e34fe35
      https://github.com/okfn/ckan/commit/ef6675ddf450543df9cdd0aac64de3530e34fe35
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-24 (Tue, 24 Jan 2012)

  Changed paths:
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  Revert "Fixed the test_mapper_plugin_fired test so that it runs with the version of pyutillib that"

This reverts commit a267347d4fdd6a0d1cc0a69917e860a5c5c15a91.

Ross was inadvertantly getting the test working with pyutilib 4.4, but we use 4.1 (trunk at 1972).

  Commit: 1b64e9ad5c05fa07072d45e359eb5e313e33d41d
      https://github.com/okfn/ckan/commit/1b64e9ad5c05fa07072d45e359eb5e313e33d41d
  Author: John Glover <j at johnglover.net>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M doc/paster.rst

  Log Message:
  -----------
  [docs] Fix mistake in paster command

  Commit: 54f0711e5a14c8402fe3501a099984004bde265b
      https://github.com/okfn/ckan/commit/54f0711e5a14c8402fe3501a099984004bde265b
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [master][doc]: Improve detail of SOLR multi-core docs.

  Commit: 46018fba736fab7713593b3b28df4ac72cc75e3b
      https://github.com/okfn/ckan/commit/46018fba736fab7713593b3b28df4ac72cc75e3b
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1583][l]: Moving template changes into ckanext-qa. Keeping core functionality (eg. hover-help).

  Commit: 87a724c2f280e726b927024bae1bbbf4bf357657
      https://github.com/okfn/ckan/commit/87a724c2f280e726b927024bae1bbbf4bf357657
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/lib/search/index.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/schema.py
  M ckan/model/package.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/test_plugins.py
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/file-upload.rst
  M doc/index.rst
  M doc/paster.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-1583-qa

  Commit: 8f3c70c3f3008acf9e3bfcc813f40df07c6ee4c5
      https://github.com/okfn/ckan/commit/8f3c70c3f3008acf9e3bfcc813f40df07c6ee4c5
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M ckan/public/css/style.css
  A ckan/public/images/icons/star.png
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'feature-1583-qa'

  Commit: 3f7d4a5ed32fade49c4dae3e9bc8d2b28f85b29c
      https://github.com/okfn/ckan/commit/3f7d4a5ed32fade49c4dae3e9bc8d2b28f85b29c
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M ckan/forms/group.py

  Log Message:
  -----------
  [#1530][s]: Realigning help text. Affects datacatalogs.org. Committed to master; closes #1530

  Commit: f878ffea5683c15ee3aa8b1da20fc66e20089d21
      https://github.com/okfn/ckan/commit/f878ffea5683c15ee3aa8b1da20fc66e20089d21
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M ckan/templates/facets.html

  Log Message:
  -----------
  [master][html] Altered facet_sidebar function to have use a custom title for the facet header

  Commit: 0d3543cd8cb6212786925bfa89f3922b030d9040
      https://github.com/okfn/ckan/commit/0d3543cd8cb6212786925bfa89f3922b030d9040
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/hash.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/common.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/lib/test_solr_search_index.py
  M doc/configuration.rst

  Log Message:
  -----------
  [master][#1708][config,controllers,lib]: Fix bug causing SOLR settings being lost.

  Commit: bc8b1edabb58a45101698131af895713d081d25b
      https://github.com/okfn/ckan/commit/bc8b1edabb58a45101698131af895713d081d25b
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/forms/group.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/star.png
  M ckan/templates/facets.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M doc/paster.rst

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

  Commit: 6939a35fbd44386577bacd0db21aa940e1900265
      https://github.com/okfn/ckan/commit/6939a35fbd44386577bacd0db21aa940e1900265
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/group/read.html

  Log Message:
  -----------
  [#1583][s]: Aesthetic fixes. Closes #1583.

  Commit: 048f58748b052ecd9efaa0b6940d3c1659990494
      https://github.com/okfn/ckan/commit/048f58748b052ecd9efaa0b6940d3c1659990494
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/group/read.html

  Log Message:
  -----------
  Merge branch 'feature-1583-qa'

  Commit: aec525e931dae303567c828cb77894273c62c2bb
      https://github.com/okfn/ckan/commit/aec525e931dae303567c828cb77894273c62c2bb
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_pagination.py

  Log Message:
  -----------
  [master][tests]: Fix tests broken in #1521 branch.

  Commit: 7a51a16c16007e9e0d1d62dec26e3b1c7dbcf282
      https://github.com/okfn/ckan/commit/7a51a16c16007e9e0d1d62dec26e3b1c7dbcf282
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [master][doc][xs]: I got permissions errors with multicore SOLR which were fixed by using jetty user to create the data dirs.

  Commit: 804b5497bcf448b9aa4cb087696a11579d96731b
      https://github.com/okfn/ckan/commit/804b5497bcf448b9aa4cb087696a11579d96731b
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/lib/cli.py
  M ckan/lib/dumper.py

  Log Message:
  -----------
  [master][#1710][cli]: Dumper for user info - to create "announce" email list.

  Commit: 6c9705d87cebaaca7adbbed71917ee5a46715d86
      https://github.com/okfn/ckan/commit/6c9705d87cebaaca7adbbed71917ee5a46715d86
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/templates/group/layout.html

  Log Message:
  -----------
  [bugfix][xs]: Bad merge had duplicated a navlink.

  Commit: 95606b51ed7eb37a9f5453105b5f1259fcf5af3d
      https://github.com/okfn/ckan/commit/95606b51ed7eb37a9f5453105b5f1259fcf5af3d
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/templates/js_strings.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [#1716][m]: Moved the unsaved changes warning to the bottom of the page to save nav-links from jumping out of the way of the mouse.

  Commit: 2bd50d92f48ca67edb69e51a7bcfc5009d77a785
      https://github.com/okfn/ckan/commit/2bd50d92f48ca67edb69e51a7bcfc5009d77a785
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/templates/js_strings.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  Merge branch 'feature-1716-ux-tweak'

  Commit: eda8cbac06dfe750c2b48eb55e57ed25d2dcd3ac
      https://github.com/okfn/ckan/commit/eda8cbac06dfe750c2b48eb55e57ed25d2dcd3ac
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/templates/js_strings.html

  Log Message:
  -----------
  [#1716][xs]: Hotfix to string content. Closes #1716.

  Commit: a348b36d1093e91deaa4e27541e6444e8ea81d6b
      https://github.com/okfn/ckan/commit/a348b36d1093e91deaa4e27541e6444e8ea81d6b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  Fix a couple of typos

  Commit: f4d991282b850a2c8fa8ccccdbe5e3d5abda5fcc
      https://github.com/okfn/ckan/commit/f4d991282b850a2c8fa8ccccdbe5e3d5abda5fcc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  Fix a typo in default_resource_schema()

  Commit: 68a15ec3f3d1f4f1e396dd27c8564895f4d05490
      https://github.com/okfn/ckan/commit/68a15ec3f3d1f4f1e396dd27c8564895f4d05490
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/migration/versions/034_resource_group_table.py

  Log Message:
  -----------
  Fix a typo in a comment

  Commit: 5616bc2053c8773147acfbf68a48c867656d49e6
      https://github.com/okfn/ckan/commit/5616bc2053c8773147acfbf68a48c867656d49e6
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [#1425][m]: Redesigned front-end for dataset deletion. Closes #1425.

  Commit: f3a4c3de70da08d396da4e65a5d286b253be0e0b
      https://github.com/okfn/ckan/commit/f3a4c3de70da08d396da4e65a5d286b253be0e0b
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [#1425][m]: Redesigned front-end for dataset deletion. Closes #1425.

  Commit: 810317ce3c9c2f35ea792345ac65bda925d2a079
      https://github.com/okfn/ckan/commit/810317ce3c9c2f35ea792345ac65bda925d2a079
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Log Message:
  -----------
  Merge branch 'feature-1425-dataset-delete'

  Commit: 9cee66a878b0b3fb7733730b0ebc942217bc94ba
      https://github.com/okfn/ckan/commit/9cee66a878b0b3fb7733730b0ebc942217bc94ba
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js

  Log Message:
  -----------
  [#1602,js/vendor][s]: add jquery.mustache.

  Commit: 92504e7f9b8ac74d29f4a31b14d99b273deba68c
      https://github.com/okfn/ckan/commit/92504e7f9b8ac74d29f4a31b14d99b273deba68c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    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

  Log Message:
  -----------
  [#1602,js/vendor][m]: add in recline data explorer library.

* Recline is (non-minified) consolidated as of https://github.com/okfn/recline/commit/8fa93dcbe9d076774bd04b14cc128ab634f6e800.

  Commit: 7c782212dc66f915ee3f5deaad72cb948abe3eb8
      https://github.com/okfn/ckan/commit/7c782212dc66f915ee3f5deaad72cb948abe3eb8
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1602,js][m]: replace old Data Explorer with new Recline Data Explorer.

* Everything working (as far as I can tell using my demo resource data).

  Commit: 211c8006fe28106f532db5f09ca47e02f065f454
      https://github.com/okfn/ckan/commit/211c8006fe28106f532db5f09ca47e02f065f454
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    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/package/resource_read.html

  Log Message:
  -----------
  [#1602,merge][s]: Merge branch 'feature-1602-data-viewer-v2' - fixes #1602.

  Commit: fda5bbb8927f1220598cf2225954c7f3f4443321
      https://github.com/okfn/ckan/commit/fda5bbb8927f1220598cf2225954c7f3f4443321
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/lib/search/sql.py

  Log Message:
  -----------
  [#1709][xs]: correct sql search so it correctly does unfiltered search when passed '*:*' as query.

* commiting this fix in master because so tiny (plus had it in #1602 branch but thought better to commit here than there).

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

  Changed paths:
    M ckan/lib/cli.py
  M ckan/lib/dumper.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/sql.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/group/read.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

  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

  Commit: 02788e7339c69fddba1e6b70c14762872b8f27b0
      https://github.com/okfn/ckan/commit/02788e7339c69fddba1e6b70c14762872b8f27b0
  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:
  -----------
  Merge branch 'master' of ssh://github.com/okfn/ckan

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

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [master][#1708][xs]: Protect against import of controller/search code before config initialisation.

  Commit: 28ffe574c94b67bcdc22de2f0c851f3fcf54870c
      https://github.com/okfn/ckan/commit/28ffe574c94b67bcdc22de2f0c851f3fcf54870c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/forms/group.py
  M ckan/lib/cli.py
  M ckan/lib/dumper.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/common.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/lib/search/sql.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/schema.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/model/package.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/star.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.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/_util.html
  A ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  R ckan/templates/package/facets.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  A ckan/tests/lib/test_simple_search.py
  M ckan/tests/lib/test_solr_search_index.py
  M ckan/tests/test_plugins.py
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/file-upload.rst
  M doc/index.rst
  M doc/paster.rst
  M doc/solr-setup.rst
  M doc/theming.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1515-activity-streams

Conflicts:
	ckan/controllers/group.py
	ckan/logic/action/create.py
	ckan/logic/action/update.py

Compare: https://github.com/okfn/ckan/compare/65778a6...28ffe57