[ckan-changes] [okfn/ckan] 4181b4: [master][noticket]: Fix - if db is not initialised...

GitHub noreply at github.com
Wed May 9 11:36:44 UTC 2012


  Branch: refs/heads/feature-2304-follow
  Home:   https://github.com/okfn/ckan
  Commit: 4181b42a26cdfdf5bda024fa28c00368dd5e2ab5
      https://github.com/okfn/ckan/commit/4181b42a26cdfdf5bda024fa28c00368dd5e2ab5
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  [master][noticket]: Fix - if db is not initialised and you are logged in then before this fix you get a 500 error, but now you get a nice 503 and message.


  Commit: 8c04017fbc7da1c983c285128abbe522a1bf5dfc
      https://github.com/okfn/ckan/commit/8c04017fbc7da1c983c285128abbe522a1bf5dfc
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    R ckan/public/css/blueprint/ie.css
    R ckan/public/css/blueprint/print.css
    R ckan/public/css/blueprint/screen.css
    R ckan/public/css/bootstrap.css
    A ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
    A ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    M ckan/templates/admin/trash.html
    M ckan/templates/authorization_group/edit_form.html
    M ckan/templates/facets.html
    M ckan/templates/group/authz.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/history.html
    M ckan/templates/group/new_group_form.html
    M ckan/templates/group/read.html
    M ckan/templates/home/index.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/editresources.html
    M ckan/templates/package/history.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_form.html
    M ckan/templates/revision/diff.html
    M ckan/templates/revision/list.html
    M ckan/templates/revision/read.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates/user/request_reset.html
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckanext/publisher_form/templates/dataset_form.html
    M ckanext/publisher_form/templates/publisher_form.html
    M ckanext/publisher_form/templates/publisher_read.html
    R doc/ckan_form_guidance.doc
    M doc/datastore.rst
    A pip-requirements-docs.txt

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


  Commit: f4aa0e8df4adcd38b32730317c935cfcb1121f4b
      https://github.com/okfn/ckan/commit/f4aa0e8df4adcd38b32730317c935cfcb1121f4b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  pep8 fixes for plugins


  Commit: 38f1b5610fe48be60da14b90a00622510314264f
      https://github.com/okfn/ckan/commit/38f1b5610fe48be60da14b90a00622510314264f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/__init__.py
    M ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/schema-1.4.xml
    M ckan/controllers/package.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/public/css/style.css
    M ckan/public/scripts/vendor/recline/css/graph.css
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/templates/_util.html
    M ckan/templates/package/related_list.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_alphabet_pagination.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckanext/multilingual/solr/schema.xml
    M doc/index.rst
    M doc/solr-setup.rst
    M doc/using-data-api.rst
    M pip-requirements.txt

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


  Commit: 071b9668ca9c36842d24c710b6028e55402f97a5
      https://github.com/okfn/ckan/commit/071b9668ca9c36842d24c710b6028e55402f97a5
  Author: amercader <amercadero at gmail.com>
  Date:   2012-04-29 (Sun, 29 Apr 2012)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [doc][xs] Nicer fix for SOLR JDK startup issue


  Commit: f3d836753b4c2ae915319729872f16b8404763e4
      https://github.com/okfn/ckan/commit/f3d836753b4c2ae915319729872f16b8404763e4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/logic/converters.py
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/js_strings.html
    M ckanext/multilingual/plugin.py
    M doc/solr-setup.rst

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


  Commit: 3e6e195550725f1801d3eb31f61ba9bf768219f0
      https://github.com/okfn/ckan/commit/3e6e195550725f1801d3eb31f61ba9bf768219f0
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

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

  Log Message:
  -----------
  Moving links about


  Commit: 681d544290ce8eaab8b6ec63cfbdcf350b44eb3d
      https://github.com/okfn/ckan/commit/681d544290ce8eaab8b6ec63cfbdcf350b44eb3d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckanext/organizations/forms.py
    M ckanext/organizations/templates/organization_package_form.html

  Log Message:
  -----------
  Update to fix organization dataset form and resource upload


  Commit: b9bd40e3b17e29429a11cdd34a9112b30afa5954
      https://github.com/okfn/ckan/commit/b9bd40e3b17e29429a11cdd34a9112b30afa5954
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [xs] Removing unused route


  Commit: 10bb7f20a28caa429c0783100011d491fc3fed76
      https://github.com/okfn/ckan/commit/10bb7f20a28caa429c0783100011d491fc3fed76
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/base.py

  Log Message:
  -----------
  [release-v1.6.1][noticket] repoze.who handler paths are now read from who.ini so that they can be moved in the URI space. Added comments and logging.


  Commit: 5c72aa3d2485ca7fc96f27c567d455c431401b95
      https://github.com/okfn/ckan/commit/5c72aa3d2485ca7fc96f27c567d455c431401b95
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/templates/user/login.html

  Log Message:
  -----------
  Addition to who change (last commit).


  Commit: fe973717d4a6ed00b326af921e3df246e5b3a67b
      https://github.com/okfn/ckan/commit/fe973717d4a6ed00b326af921e3df246e5b3a67b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/logic/converters.py
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    M ckanext/multilingual/plugin.py
    M ckanext/organizations/forms.py
    M ckanext/organizations/templates/organization_package_form.html
    M doc/solr-setup.rst

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


  Commit: ded67ed21753d2d2d1a123b2325a1296080ce08b
      https://github.com/okfn/ckan/commit/ded67ed21753d2d2d1a123b2325a1296080ce08b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/templates/facets.html

  Log Message:
  -----------
  facets.html make comments template only


  Commit: 289a36784403ee6bb23c656bb415770ef52b38d5
      https://github.com/okfn/ckan/commit/289a36784403ee6bb23c656bb415770ef52b38d5
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  Add additional bold variant of the Ubuntu font family

This allows us to have bold headers at smaller font sizes.


  Commit: 693eebbf3867001c0450c1e7bc54e4c496223be6
      https://github.com/okfn/ckan/commit/693eebbf3867001c0450c1e7bc54e4c496223be6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/js_strings.html

  Log Message:
  -----------
  fix js strings to use dump_json()


  Commit: 010066dd0a7e3ae439c1677b8ad4e9386135517a
      https://github.com/okfn/ckan/commit/010066dd0a7e3ae439c1677b8ad4e9386135517a
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  fix 404 tracking error


  Commit: b1d529fc360bb4e935a68210de59eca21628c42f
      https://github.com/okfn/ckan/commit/b1d529fc360bb4e935a68210de59eca21628c42f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/facets.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html

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


  Commit: 762906da1ba23408b0dd16c5420b8cb27e53cc0a
      https://github.com/okfn/ckan/commit/762906da1ba23408b0dd16c5420b8cb27e53cc0a
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

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

  Log Message:
  -----------
  Refactor related delete button

Removed the inline click handlers and moved the JavaScript into
application.js. Also remove the item with JavaScript rather than reload
the page.


  Commit: 2379ee908e45502ef0adcb9c51738ec0b28bb4ed
      https://github.com/okfn/ckan/commit/2379ee908e45502ef0adcb9c51738ec0b28bb4ed
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [2204] Related items description expands without breaking the grid


  Commit: 29028181dbbb1fe1209b52b02ebcaf71d440166f
      https://github.com/okfn/ckan/commit/29028181dbbb1fe1209b52b02ebcaf71d440166f
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [2204] jQuery.fn.truncate() skips short text

If the text is shorter than the max length then the plugin will skip
the element.


  Commit: abcf0cf5507633e22df6c862dccb947c8ddb0cae
      https://github.com/okfn/ckan/commit/abcf0cf5507633e22df6c862dccb947c8ddb0cae
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [2204] Tidy up delete buttons

Now square with same border on all sides plus they only show on hover.


  Commit: 3991c18ac482e9b5a55dd520acea7cd6bbf54f68
      https://github.com/okfn/ckan/commit/3991c18ac482e9b5a55dd520acea7cd6bbf54f68
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/helpers.py
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  make tracking optional via config options


  Commit: 45c30b64ae44c4b7f82400bb7d05107b2662dd45
      https://github.com/okfn/ckan/commit/45c30b64ae44c4b7f82400bb7d05107b2662dd45
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/config/routing.py

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


  Commit: dcb2432cd2f745faa92b7f0ffde2616cd18f659b
      https://github.com/okfn/ckan/commit/dcb2432cd2f745faa92b7f0ffde2616cd18f659b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [2204] Add hover intent to description toggle

This prevents unwanted expansion of description text when mousing over
the page.


  Commit: 1c56149bab168f730b80e88699463573a0d153a0
      https://github.com/okfn/ckan/commit/1c56149bab168f730b80e88699463573a0d153a0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [xs] docstring typo fix


  Commit: 1cdada36cbc99b2594688c00243df49de2d2ff44
      https://github.com/okfn/ckan/commit/1cdada36cbc99b2594688c00243df49de2d2ff44
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [xs] add new lang_native_name() template helper


  Commit: a75b6814606f2519614291b25938b9f9abd0694d
      https://github.com/okfn/ckan/commit/a75b6814606f2519614291b25938b9f9abd0694d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [xs] update comment


  Commit: 673304329400c5a1ae9e3ccd53f28dc79a249995
      https://github.com/okfn/ckan/commit/673304329400c5a1ae9e3ccd53f28dc79a249995
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [2332] Align group logo to top of heading text


  Commit: 7ab53a35e926aea85fdda0508fd7e383f6a1f421
      https://github.com/okfn/ckan/commit/7ab53a35e926aea85fdda0508fd7e383f6a1f421
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [2332] Fix indented headings on groups page


  Commit: 02e17845bd9e6d1b62ba2614f7fbb63537f74a23
      https://github.com/okfn/ckan/commit/02e17845bd9e6d1b62ba2614f7fbb63537f74a23
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [2332] Fix width of navigation on resources page

This was actually an issue with the rest of the page being wider than
the all the others making the navigation look narrower. I've reduced
the width to 940px, this was originally set to 950px by Rufus as a fix
to #1396 but change does not seem to affect the page.


  Commit: b1a28e800bbdec70c75b7c2fbf719741d7acd6fb
      https://github.com/okfn/ckan/commit/b1a28e800bbdec70c75b7c2fbf719741d7acd6fb
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [2332] Update Bootstrap to 2.0.3


  Commit: 62ce626b0c5931605aa82d07c2401865bd40d26b
      https://github.com/okfn/ckan/commit/62ce626b0c5931605aa82d07c2401865bd40d26b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/helpers.py
    M ckan/templates/layout_base.html

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


  Commit: baebb6854e3304dbe3c08d82f004aab42504f74b
      https://github.com/okfn/ckan/commit/baebb6854e3304dbe3c08d82f004aab42504f74b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/css/style.css
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [2332] Normalise the margins on the homepage heading


  Commit: 4bd2e33cc8df765bb8eef09186fe4ba13eb6a19d
      https://github.com/okfn/ckan/commit/4bd2e33cc8df765bb8eef09186fe4ba13eb6a19d
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [2332] Tweak the spacing in the header

Gave the login text a little more space between it and the line height
and added a bit more padding to the bottom.


  Commit: 296034982b3522b9e65005af0f5ea5ec69726edb
      https://github.com/okfn/ckan/commit/296034982b3522b9e65005af0f5ea5ec69726edb
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py

  Log Message:
  -----------
  [master,doc][xs]: show documentation version number in top bar.


  Commit: c1d648c7860bc5bac63ddee6953dbaed4e155999
      https://github.com/okfn/ckan/commit/c1d648c7860bc5bac63ddee6953dbaed4e155999
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py

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


  Commit: 4827743e99d17ff3c1a70d2d255a494728c2fbf6
      https://github.com/okfn/ckan/commit/4827743e99d17ff3c1a70d2d255a494728c2fbf6
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [1650] Fixed native name for language to optionally take a parameter


  Commit: 5638aedacab6b2655c378e95fea88474fb6e9505
      https://github.com/okfn/ckan/commit/5638aedacab6b2655c378e95fea88474fb6e9505
  Author: John Glover <j at johnglover.net>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    A ckanext/multilingual/__init__.py

  Log Message:
  -----------
  [xs][multilingual] bug fix: add missing __init__.py file to ckanext/multilingual extension


  Commit: 8c4715c4b37da8a71a24319e353c29ce97a657b2
      https://github.com/okfn/ckan/commit/8c4715c4b37da8a71a24319e353c29ce97a657b2
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    A ckanext/multilingual/__init__.py

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


  Commit: cc6ab63185580ecc44652d21fe6b491db458c15e
      https://github.com/okfn/ckan/commit/cc6ab63185580ecc44652d21fe6b491db458c15e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Remove session cooky after request has been processed. This caused obscure bug in DGU when you tried to save the session straight in the next request after deleting it. If you check after the request is done, then you take account of the wishes in that request. Therefore you also do not need the check to see if you are on a particular page that might create the session.


  Commit: ea19469809efa739d9c8bce21bc7dec8df4ea9ab
      https://github.com/okfn/ckan/commit/ea19469809efa739d9c8bce21bc7dec8df4ea9ab
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/group.py

  Log Message:
  -----------
  Fix counts that are including private datasets


  Commit: 96e486d2b8dbc0eb2350b8b51c42cd8eada27f1d
      https://github.com/okfn/ckan/commit/96e486d2b8dbc0eb2350b8b51c42cd8eada27f1d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/templates/home/index.html
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  Merge branch 'feature-2332-theme-ui' of https://github.com/okfn/ckan


  Commit: 742fede21e3c9f425ffd1d7393c516a949ca857d
      https://github.com/okfn/ckan/commit/742fede21e3c9f425ffd1d7393c516a949ca857d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    R MIGRATE.txt
    R RELEASE.txt
    M bin/running_stats.py
    M ckan/__init__.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-1.4.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/authorization_group.py
    A ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    A ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/forms/authorization_group.py
    M ckan/forms/package.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    A ckan/i18n/lv/LC_MESSAGES/ckan.mo
    A ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    A ckan/i18n/sk/LC_MESSAGES/ckan.mo
    A ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/migration/versions/047_rename_package_group_member.py
    A ckan/migration/versions/052_update_member_capacities.py
    A ckan/migration/versions/053_add_group_logo.py
    A ckan/migration/versions/054_add_resource_created_date.py
    A ckan/migration/versions/055_update_user_and_activity_detail.py
    A ckan/migration/versions/056_add_related_table.py
    A ckan/migration/versions/057_tracking.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/package.py
    A ckan/model/related.py
    M ckan/model/resource.py
    A ckan/model/tracking.py
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    A ckan/plugins/toolkit.py
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    A ckan/public/images/dragbars.png
    A ckan/public/images/photo-placeholder.png
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    A ckan/public/img/logo_64px_wide.png
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/layers.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/marker-shadow.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/marker.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/popup-close.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-in.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-out.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.css
    A ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.ie.css
    A ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.js
    M ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph-flot.css
    A ckan/public/scripts/vendor/recline/css/graph.css
    A ckan/public/scripts/vendor/recline/css/grid.css
    A ckan/public/scripts/vendor/recline/css/map.css
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/templates/_snippet/add-related.html
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/_util.html
    R ckan/templates/_util_activity_div.html
    M ckan/templates/activity_streams/added_tag.html
    M ckan/templates/activity_streams/changed_group.html
    M ckan/templates/activity_streams/changed_package.html
    M ckan/templates/activity_streams/changed_package_extra.html
    M ckan/templates/activity_streams/changed_resource.html
    M ckan/templates/activity_streams/changed_user.html
    M ckan/templates/activity_streams/deleted_group.html
    M ckan/templates/activity_streams/deleted_package.html
    M ckan/templates/activity_streams/deleted_package_extra.html
    M ckan/templates/activity_streams/deleted_resource.html
    M ckan/templates/activity_streams/new_group.html
    M ckan/templates/activity_streams/new_package.html
    M ckan/templates/activity_streams/new_package_extra.html
    M ckan/templates/activity_streams/new_resource.html
    M ckan/templates/activity_streams/new_user.html
    M ckan/templates/activity_streams/removed_tag.html
    M ckan/templates/admin/layout.html
    M ckan/templates/authorization_group/layout.html
    M ckan/templates/facets.html
    M ckan/templates/group/history.html
    M ckan/templates/group/layout.html
    M ckan/templates/group/new_group_form.html
    M ckan/templates/group/read.html
    M ckan/templates/home/index.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/editresources.html
    M ckan/templates/package/form_fields.html
    M ckan/templates/package/history.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/package/read_core.html
    A ckan/templates/package/related_list.html
    A ckan/templates/package/resource_embedded_dataviewer.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html
    M ckan/templates/revision/layout.html
    M ckan/templates/revision/list.html
    A ckan/templates/snippets/data-viewer-embed-branded-link.html
    A ckan/templates/snippets/data-viewer-embed-dialog.html
    A ckan/templates/snippets/package_list.html
    A ckan/templates/snippets/revision_list.html
    M ckan/templates/tag/index.html
    M ckan/templates/tag/read.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/layout.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_cors.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_pagination.py
    A ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_alphabet_pagination.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/lib/test_solr_package_search.py
    A ckan/tests/logic/__init__.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_auth_profiles.py
    M ckan_deb/usr/lib/ckan/common.sh
    A ckanext/multilingual/__init__.py
    A ckanext/multilingual/plugin.py
    A ckanext/multilingual/solr/dutch_stop.txt
    A ckanext/multilingual/solr/english_stop.txt
    A ckanext/multilingual/solr/fr_elision.txt
    A ckanext/multilingual/solr/french_stop.txt
    A ckanext/multilingual/solr/german_stop.txt
    A ckanext/multilingual/solr/greek_stopwords.txt
    A ckanext/multilingual/solr/italian_stop.txt
    A ckanext/multilingual/solr/polish_stop.txt
    A ckanext/multilingual/solr/portuguese_stop.txt
    A ckanext/multilingual/solr/romanian_stop.txt
    A ckanext/multilingual/solr/schema.xml
    A ckanext/multilingual/solr/spanish_stop.txt
    A ckanext/multilingual/tests/test_multilingual_plugin.py
    A ckanext/organizations/__init__.py
    A ckanext/organizations/controllers.py
    A ckanext/organizations/forms.py
    A ckanext/organizations/templates/email/join_publisher_request.txt
    A ckanext/organizations/templates/organization_apply.html
    A ckanext/organizations/templates/organization_apply_form.html
    A ckanext/organizations/templates/organization_form.html
    A ckanext/organizations/templates/organization_history.html
    A ckanext/organizations/templates/organization_index.html
    A ckanext/organizations/templates/organization_layout.html
    A ckanext/organizations/templates/organization_new.html
    A ckanext/organizations/templates/organization_package_form.html
    A ckanext/organizations/templates/organization_read.html
    A ckanext/organizations/templates/organization_users.html
    A ckanext/organizations/templates/organization_users_form.html
    M doc/_themes/sphinx-theme-okfn
    M doc/api-v2.rst
    M doc/api.rst
    M doc/apiv3.rst
    M doc/conf.py
    M doc/configuration.rst
    A doc/contrib.rst
    M doc/datastore.rst
    M doc/forms.rst
    A doc/geospatial.rst
    M doc/i18n.rst
    M doc/index.rst
    A doc/multilingual.rst
    M doc/paster.rst
    M doc/post-installation.rst
    M doc/publisher-profile.rst
    A doc/publishing-datasets.rst
    M doc/solr-setup.rst
    A doc/using-data-api.rst
    M pip-requirements.txt
    M requires/lucid_missing.txt
    M setup.py
    M test-core.ini

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


  Commit: c373cf68f1243c582059ff12da5dbbcac3495db2
      https://github.com/okfn/ckan/commit/c373cf68f1243c582059ff12da5dbbcac3495db2
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/group.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/templates/facets.html
    M ckan/templates/home/index.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    A ckanext/multilingual/__init__.py
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py

  Log Message:
  -----------
  Merge branch 'master' into feature-2204-related-ui


  Commit: c05bf86ac8b4a3c2accd49a41a5602494ec9bd18
      https://github.com/okfn/ckan/commit/c05bf86ac8b4a3c2accd49a41a5602494ec9bd18
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  [doc] Attempt to fix autodoc on readthedocs

Lets see if this works..


  Commit: b2acf3041baa912a2d33b796bc37366e49a3e90b
      https://github.com/okfn/ckan/commit/b2acf3041baa912a2d33b796bc37366e49a3e90b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/templates/home/index.html
    M ckan/templates/layout_base.html

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


  Commit: 11927ee8e4e036b217b08394e84a4fa886ab1afe
      https://github.com/okfn/ckan/commit/11927ee8e4e036b217b08394e84a4fa886ab1afe
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

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

  Log Message:
  -----------
  [2332] Add info icon that explains related items

This is really a stop gap fix to at least explain to people what
related items are. I think much more could be done here.


  Commit: 22c5128e72874dd8631d11f73f22840e9383a6c2
      https://github.com/okfn/ckan/commit/22c5128e72874dd8631d11f73f22840e9383a6c2
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/templates/user/login.html

  Log Message:
  -----------
  Merge branch 'release-v1.6.1'


  Commit: 83e1a9aec99922f565cfdedce1ed704fd11db142
      https://github.com/okfn/ckan/commit/83e1a9aec99922f565cfdedce1ed704fd11db142
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M doc/conf.py

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


  Commit: e088cbda4e0c9ea965e721f4d82d5ed8f921977c
      https://github.com/okfn/ckan/commit/e088cbda4e0c9ea965e721f4d82d5ed8f921977c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M doc/configuration.rst

  Log Message:
  -----------
  Spelling typos.


  Commit: 94caef8e8561cf1d85259935741e792624d9bb9a
      https://github.com/okfn/ckan/commit/94caef8e8561cf1d85259935741e792624d9bb9a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/home.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch 'master' of ../ckan2


  Commit: 30b4bf75962fd4fb8a07024729b4e9839d22092a
      https://github.com/okfn/ckan/commit/30b4bf75962fd4fb8a07024729b4e9839d22092a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Revert "[doc] Attempt to fix autodoc on readthedocs"

This reverts commit c05bf86ac8b4a3c2accd49a41a5602494ec9bd18.

it didn't work, looks like the problem is pyutilib missing, requirements
file not working right on readthedocs


  Commit: 4d7f0bf39f3c800c215955bd215d205d82b87d58
      https://github.com/okfn/ckan/commit/4d7f0bf39f3c800c215955bd215d205d82b87d58
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/home.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/templates/user/login.html
    M doc/configuration.rst

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


  Commit: 93b437778e01f869b917609b6d1d4a6002e3d7e2
      https://github.com/okfn/ckan/commit/93b437778e01f869b917609b6d1d4a6002e3d7e2
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/related_list.html

  Log Message:
  -----------
  Merge branch 'feature-2204-related-ui'


  Commit: 112438ff3cc81f204488b38bcf8654c322040d61
      https://github.com/okfn/ckan/commit/112438ff3cc81f204488b38bcf8654c322040d61
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  allow unselected_facet_items() in helpers


  Commit: 06bd2fb0ab4d4f85c4f2c552420a7a1f1e0edb31
      https://github.com/okfn/ckan/commit/06bd2fb0ab4d4f85c4f2c552420a7a1f1e0edb31
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/model/group.py
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    M ckan/public/scripts/application.js
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/templates/_util.html
    M ckan/templates/home/index.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/user/login.html
    A ckanext/multilingual/__init__.py
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst

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


  Commit: ef3678d6a5bcb81550c07391a85f4b65f7909e24
      https://github.com/okfn/ckan/commit/ef3678d6a5bcb81550c07391a85f4b65f7909e24
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [xs] fix tracking js error


  Commit: bb4da157fffd1929c26e0c24e33a63f096c74871
      https://github.com/okfn/ckan/commit/bb4da157fffd1929c26e0c24e33a63f096c74871
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/model/__init__.py

  Log Message:
  -----------
  Fix logging for cli commands. Add logging to db upgrade etc.


  Commit: 37101a3d45350fae4dd219c16e320857b14634ee
      https://github.com/okfn/ckan/commit/37101a3d45350fae4dd219c16e320857b14634ee
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [2314] Fix broken parse_rfc_2822 helper function.


  Commit: 12a42c665e9fc12678d910f6aa477901e29ecd5f
      https://github.com/okfn/ckan/commit/12a42c665e9fc12678d910f6aa477901e29ecd5f
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge branch 'bug-2314-parse_rfc_2822-tests-failing-in-some-timezones'


  Commit: 20a68e64e590165603b51417d5eb82810d4689aa
      https://github.com/okfn/ckan/commit/20a68e64e590165603b51417d5eb82810d4689aa
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  [docs] Mock pyutilib in doc/conf.py

I'm hoping that this will fix autodoc on readthedocs.org


  Commit: d7aad9257891ad707285c1d295089b6c55326f47
      https://github.com/okfn/ckan/commit/d7aad9257891ad707285c1d295089b6c55326f47
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Revert "[docs] Mock pyutilib in doc/conf.py"

This reverts commit 20a68e64e590165603b51417d5eb82810d4689aa.

..that didn't work either


  Commit: 9d460be4e398ee3b9ea087688d53e942a3c410b9
      https://github.com/okfn/ckan/commit/9d460be4e398ee3b9ea087688d53e942a3c410b9
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/home.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/model/__init__.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/user/login.html
    M ckan/tests/lib/test_helpers.py
    M doc/configuration.rst

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


  Commit: 8660c03a554027bc685dd115a19552b462854760
      https://github.com/okfn/ckan/commit/8660c03a554027bc685dd115a19552b462854760
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

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

  Log Message:
  -----------
  [css][xs] Fix vertical alignment of small logos on footer


  Commit: 2f4d2f30e27f59c1d247fbac59d5f5ce54bf4503
      https://github.com/okfn/ckan/commit/2f4d2f30e27f59c1d247fbac59d5f5ce54bf4503
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

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

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


  Commit: bdb5fd54b3fdd39075bd09fda2cbec47886b7e2c
      https://github.com/okfn/ckan/commit/bdb5fd54b3fdd39075bd09fda2cbec47886b7e2c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [xs] fix minor issue with sidebar in search results


  Commit: 13f5a75ced75b953ef8b4ed08db92f781d966b57
      https://github.com/okfn/ckan/commit/13f5a75ced75b953ef8b4ed08db92f781d966b57
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [xs] Change mentions to the Open Data Manual to Handbook


  Commit: 668d4d7b4771762f78cd08ae24fd944dba70db16
      https://github.com/okfn/ckan/commit/668d4d7b4771762f78cd08ae24fd944dba70db16
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/public/css/style.css
    M ckan/templates/package/search_form.html

  Log Message:
  -----------
  Move the search button inline with input

This has restructured the HTML used in the search_form.html which may
break extensions. Particularly the spacial extension which uses this
hook.


  Commit: a2fd245719a1224ce58d3af072f7cb146bea2899
      https://github.com/okfn/ckan/commit/a2fd245719a1224ce58d3af072f7cb146bea2899
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/public/css/style.css
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html

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


  Commit: e2af388a0a91e3258f537cb6f5bce79fa4c526d5
      https://github.com/okfn/ckan/commit/e2af388a0a91e3258f537cb6f5bce79fa4c526d5
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/tests/logic/test_member.py

  Log Message:
  -----------
  [bug] Fix to extraneous fields in context for member api


  Commit: d22c05fee2e114a4c5d8a9b921d5e38e1649b5e0
      https://github.com/okfn/ckan/commit/d22c05fee2e114a4c5d8a9b921d5e38e1649b5e0
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/templates/package/read.html

  Log Message:
  -----------
  [xs] Fix the RDF alternative rep of the page, and make the atom url absolute


  Commit: c8239b42de7e4a08e946d1421e9aac2d21845e7f
      https://github.com/okfn/ckan/commit/c8239b42de7e4a08e946d1421e9aac2d21845e7f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/templates/package/read.html
    M ckan/templates/package/read.n3
    M ckan/templates/package/read.rdf
    M ckan/templates/package/resource_read.html
    M ckanext/organizations/templates/email/join_publisher_request.txt

  Log Message:
  -----------
  [xs] Adding qualified=True to urls using h.url_for instead of prepending with g.site_url


  Commit: fa0bc04210c8dadce2bc1269788b16f12f4d8f24
      https://github.com/okfn/ckan/commit/fa0bc04210c8dadce2bc1269788b16f12f4d8f24
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    A doc/data-viewer.rst
    M doc/index.rst

  Log Message:
  -----------
  [docs] A doc page for the data-viewer.

Cherry-pick of 70876ee31356a44d322d2af4afc053ad2fe13cd9 which was made on
the release-v1.7 branch.


  Commit: 336e23dd66306d4dea05e5e980201312d8a4cbc5
      https://github.com/okfn/ckan/commit/336e23dd66306d4dea05e5e980201312d8a4cbc5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [xs] Typos.


  Commit: 8b7141cd2ff619a0e35aaa31bbc1d17156647498
      https://github.com/okfn/ckan/commit/8b7141cd2ff619a0e35aaa31bbc1d17156647498
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/model/group.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  [#2373]: Fix for group autocomplete for multiple words.


  Commit: c943549cda5cf8d57a11d11565d4664805d2a4ee
      https://github.com/okfn/ckan/commit/c943549cda5cf8d57a11d11565d4664805d2a4ee
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    A doc/data-viewer.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'feature-2285-embeddable-data-viewer'


  Commit: 517945524247721b3b7e25dcbc559e2c079d16ba
      https://github.com/okfn/ckan/commit/517945524247721b3b7e25dcbc559e2c079d16ba
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/logic/action/get.py
    M ckan/tests/__init__.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  [#2374] Made tag search pageable. Moved logic tag tests into its own file. Centralised related testing fixtures.


  Commit: 8947302696498fd99ea304edbb898a56f793f998
      https://github.com/okfn/ckan/commit/8947302696498fd99ea304edbb898a56f793f998
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/base.py
    M ckan/templates/admin/authz.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html

  Log Message:
  -----------
  [#2366] Only display authz options for Authz Groups if there are some.


  Commit: 7a73126e1b0f572790483febff747ae30ae1ff59
      https://github.com/okfn/ckan/commit/7a73126e1b0f572790483febff747ae30ae1ff59
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
    M doc/filestore.rst

  Log Message:
  -----------
  [docs] Clarify where to put filestore config lines in ini file


  Commit: 5c1dc6f1f14f935f3ce8e7d4c52ec996d30cb8f3
      https://github.com/okfn/ckan/commit/5c1dc6f1f14f935f3ce8e7d4c52ec996d30cb8f3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
    M ckan/authz.py

  Log Message:
  -----------
  [xs]: More flexible args for is_sysadmin so that it can run quicker.


  Commit: d646258c2ee735a389a55cb66dca94669fb78e84
      https://github.com/okfn/ckan/commit/d646258c2ee735a389a55cb66dca94669fb78e84
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [xs] Fixing problem with 404 when requesting related items


  Commit: 20d06d6a7ca53b22e14ecb104e2f318fa2275f76
      https://github.com/okfn/ckan/commit/20d06d6a7ca53b22e14ecb104e2f318fa2275f76
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/logic/action/get.py
    M ckan/model/group.py
    M ckan/plugins/toolkit.py
    M ckan/templates/admin/authz.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_group.py
    A doc/data-viewer.rst
    M doc/filestore.rst
    M doc/index.rst

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


  Commit: 99d1f424e328fed6333a1d3eeb62796948a0a646
      https://github.com/okfn/ckan/commit/99d1f424e328fed6333a1d3eeb62796948a0a646
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    M ckan/public/scripts/application.js
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    M ckan/templates/facets.html
    M ckan/templates/group/authz.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read.n3
    M ckan/templates/package/read.rdf
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html
    M ckan/templates/user/login.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_member.py
    A ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_group.py
    A ckanext/multilingual/__init__.py
    M ckanext/organizations/forms.py
    M ckanext/organizations/templates/email/join_publisher_request.txt
    M ckanext/organizations/templates/organization_package_form.html
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    A doc/data-viewer.rst
    M doc/filestore.rst
    M doc/index.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2304-follow

Conflicts:
	ckan/templates/package/layout.html


Compare: https://github.com/okfn/ckan/compare/eaf8fdf...99d1f42


More information about the ckan-changes mailing list