[ckan-changes] [okfn/ckan] 7172a9: Merge branch 'master' of https://github.com/okfn/c...

GitHub noreply at github.com
Tue Sep 4 16:34:25 UTC 2012


  Branch: refs/heads/2618-nested-resources
  Home:   https://github.com/okfn/ckan
  Commit: 7172a9ec277d41c5c73b23e8276decd449e21140
      https://github.com/okfn/ckan/commit/7172a9ec277d41c5c73b23e8276decd449e21140
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/controllers/group.py

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


  Commit: ba4faad89725ae33aefb1dfcf71609668ceeacfd
      https://github.com/okfn/ckan/commit/ba4faad89725ae33aefb1dfcf71609668ceeacfd
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/public/scripts/application.js
    A ckan/public/scripts/vendor/moment/1.6.2/moment.js
    A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph.css
    R ckan/public/scripts/vendor/recline/css/grid.css
    R ckan/public/scripts/vendor/recline/css/images/edit-map.png
    R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
    R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
    R ckan/public/scripts/vendor/recline/css/map.css
    A ckan/public/scripts/vendor/recline/css/recline.css
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/slickgrid/images/actions.gif
    R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
    R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
    R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
    R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
    R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
    R ckan/public/scripts/vendor/slickgrid/images/down.gif
    R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
    R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/expand.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/help.png
    R ckan/public/scripts/vendor/slickgrid/images/info.gif
    R ckan/public/scripts/vendor/slickgrid/images/listview.gif
    R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
    R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
    R ckan/public/scripts/vendor/slickgrid/images/stripes.png
    R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
    R ckan/public/scripts/vendor/slickgrid/images/tick.png
    R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
    R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
    R ckan/public/scripts/vendor/slickgrid/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/slick.grid.js
    M ckan/templates/package/resource_embedded_dataviewer.html
    M ckan/templates/snippets/recline-extra-footer.html
    M ckan/templates/snippets/recline-extra-header.html

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


  Commit: a88f79add4767700b633567c50db5280de11b0bb
      https://github.com/okfn/ckan/commit/a88f79add4767700b633567c50db5280de11b0bb
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number for release 1.8 beta


  Commit: fb8abd4d5d9e545dd7a22999b404c8d08bea0cdb
      https://github.com/okfn/ckan/commit/fb8abd4d5d9e545dd7a22999b404c8d08bea0cdb
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M ckan/__init__.py

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


  Commit: 71a3d203efb0777f55ad48ceb11c21ef9c6dd227
      https://github.com/okfn/ckan/commit/71a3d203efb0777f55ad48ceb11c21ef9c6dd227
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch '2757-source-install-upgrade-docs' into release-v1.8


  Commit: cc79d77f6ded1f10cfe6bec9012c190743703e97
      https://github.com/okfn/ckan/commit/cc79d77f6ded1f10cfe6bec9012c190743703e97
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M ckan/templates/related/add-related.html

  Log Message:
  -----------
  [#2770] Mark strings for translation on add related item form


  Commit: 6fc2a136a2d5382649a3367cbf7b0253ee3a887e
      https://github.com/okfn/ckan/commit/6fc2a136a2d5382649a3367cbf7b0253ee3a887e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

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

  Log Message:
  -----------
  [i18n] Mark 2 resource form strings for i18n


  Commit: e8a1467965a3d3fa852eb49b84917992d10a1cf5
      https://github.com/okfn/ckan/commit/e8a1467965a3d3fa852eb49b84917992d10a1cf5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M .tx/config
    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
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Update i18n for CKAN 1.8

Downloaded the latest strings from the CKAN 1.7 resource on Transifex
into the po files

Locked the CKAN 1.7 resource on Transifex

Updated the version number in .tx/config from 1.7 to 1.8

Extracted the latest strings from the CKAN source code into the pot and
po files

Recompiled the mo files

Created the new CKAN 1.8 resource on Transifex from the pot and po files
in this commit


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

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#2777] Use user_list_dictize


  Commit: 85097d9e881f9f0dfe1870fe59e681f099b3623d
      https://github.com/okfn/ckan/commit/85097d9e881f9f0dfe1870fe59e681f099b3623d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Some pep8 fixes for lib.helpers


  Commit: 3c0df274329d4b234863803f31dd0276c13b3ed4
      https://github.com/okfn/ckan/commit/3c0df274329d4b234863803f31dd0276c13b3ed4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Fix for relative url being used when doing file upload to local storage


  Commit: b7f7a80cf895f37ac01ae24299662838484c939e
      https://github.com/okfn/ckan/commit/b7f7a80cf895f37ac01ae24299662838484c939e
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Be more careful when prepending site_url


  Commit: 6640521baf54432c247b4cff568ae1bd61f69b20
      https://github.com/okfn/ckan/commit/6640521baf54432c247b4cff568ae1bd61f69b20
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/storage.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/public/scripts/templates.js
    M ckan/templates/js_strings.html
    M ckan/templates/related/add-related.html
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

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


  Commit: a12973769c6320c6ff78201e83231ab4f5ebd4c1
      https://github.com/okfn/ckan/commit/a12973769c6320c6ff78201e83231ab4f5ebd4c1
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch '2784-model-dictize-sensitive-data' into release-v1.8

Conflicts:
	ckan/__init__.py
	ckan/controllers/storage.py


  Commit: a26d88cf4ef59980683b594958abe52e1a42c5e5
      https://github.com/okfn/ckan/commit/a26d88cf4ef59980683b594958abe52e1a42c5e5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#2755] Don't call user_show twice


  Commit: 388063f2003e275aea6ffa2227478319db80335f
      https://github.com/okfn/ckan/commit/388063f2003e275aea6ffa2227478319db80335f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py

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


  Commit: 9966615969fa2aa4823fc6d3455528b194136255
      https://github.com/okfn/ckan/commit/9966615969fa2aa4823fc6d3455528b194136255
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/domain_object.py

  Log Message:
  -----------
  [#2816] Re-add some items to model.__init__


  Commit: c1ee1e995ef7481cd40b9fb3221db1b681293f92
      https://github.com/okfn/ckan/commit/c1ee1e995ef7481cd40b9fb3221db1b681293f92
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2750] Fix group controller using wrong schema

Fix group controller calling form_to_db_schema() from IGroupForm plugin
when it should be using db_to_form_schema()


  Commit: 5d80f7fc5d41225c79625a8dcadd64148d8adc76
      https://github.com/okfn/ckan/commit/5d80f7fc5d41225c79625a8dcadd64148d8adc76
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Refactor DefaultGroupForm's form_to_db_schema_options()

The form_to_db_schema() methods of IGroupForm plugins were not being
called if those plugins inherited from DefaultGroupForm. Refactor it in
the same way as DefaultDatasetForm's form_to_db_schema_options() method
was recently refactored.  Make it call self.form_to_db_schema so that
the form_to_db_schema() methods of IGroupForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.


  Commit: 8938352c1add570f5dabe67167907edb1167392e
      https://github.com/okfn/ckan/commit/8938352c1add570f5dabe67167907edb1167392e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#2570] Fix IGroupForm check_data_dict not being called

Make group_create() and group_update() call the check_data_dict()
methods of IGroupForm plugins, like package_create() and
package_update() do with IDatasetForm plugins.


  Commit: 5d30fdbc718e2d423b53fdaee1fdf9d22aaa8524
      https://github.com/okfn/ckan/commit/5d30fdbc718e2d423b53fdaee1fdf9d22aaa8524
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  Fix a db_to_form_package_schema() crash

When db_to_form_package_schema() was in use (e.g. when an IDatasetForm
plugin with a db_to_form_schema() method based on
db_to_form_package_schema() was active) then try to edit a package that
has some resources would crash with a 400 Bad Request.

Extremely difficult to debug.

This seems to fix it.


  Commit: 34e8730496ff9eef0b65c1e7f64476700181fba6
      https://github.com/okfn/ckan/commit/34e8730496ff9eef0b65c1e7f64476700181fba6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2722] fix group dataset sort


  Commit: a89c8d6dd4764b859fec3a41089a6e9547898072
      https://github.com/okfn/ckan/commit/a89c8d6dd4764b859fec3a41089a6e9547898072
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2722] Add c.sort_by_selected to group read template


  Commit: fa3ca5bef30b17c2da74653748934407d538c3fb
      https://github.com/okfn/ckan/commit/fa3ca5bef30b17c2da74653748934407d538c3fb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Make relevance the default sort order on group pages

If not sort order is specified, group controller passes None to
package_search, same as the package controller does, then package_search
defaults to 'score desc, name asc'


  Commit: deedb787786e74888d56e6515bdeb6c7bb37f504
      https://github.com/okfn/ckan/commit/deedb787786e74888d56e6515bdeb6c7bb37f504
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Add group read sort ordering to changelog


  Commit: db6ab9e188c091ea894cce3766f029cc0e101535
      https://github.com/okfn/ckan/commit/db6ab9e188c091ea894cce3766f029cc0e101535
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch 'allow-group-read-sort' into release-v1.8


  Commit: 0d0e5a09eddf54544a1737fa45b248532ac7c875
      https://github.com/okfn/ckan/commit/0d0e5a09eddf54544a1737fa45b248532ac7c875
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/controllers/group.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
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge branch 'allow-group-read-sort'


  Commit: 873f03dc9bf41a1a763698032db9eb281dd7e084
      https://github.com/okfn/ckan/commit/873f03dc9bf41a1a763698032db9eb281dd7e084
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/search/__init__.py

  Log Message:
  -----------
  [#2844] actually use simple-search config option


  Commit: 419e8395d8708389566c37b4bbf47dd628c07947
      https://github.com/okfn/ckan/commit/419e8395d8708389566c37b4bbf47dd628c07947
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

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

  Log Message:
  -----------
  [#2844] Fix error in simple search


  Commit: 3d33445a6b5eebe41a3f1f87c8d692a921baa3bd
      https://github.com/okfn/ckan/commit/3d33445a6b5eebe41a3f1f87c8d692a921baa3bd
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  [#2844] fix test


  Commit: a2fe71dd5d885b085a95cf71b0de0cd42dd432f0
      https://github.com/okfn/ckan/commit/a2fe71dd5d885b085a95cf71b0de0cd42dd432f0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/search/__init__.py

  Log Message:
  -----------
  [#2844] actually use simple-search config option


  Commit: fbd347c4b3f26bcbbdf20be310181f7d56d68df5
      https://github.com/okfn/ckan/commit/fbd347c4b3f26bcbbdf20be310181f7d56d68df5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

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

  Log Message:
  -----------
  [#2844] Fix error in simple search


  Commit: 7a0cff82d358a0c9b6e29d793c3e5294c644bc5c
      https://github.com/okfn/ckan/commit/7a0cff82d358a0c9b6e29d793c3e5294c644bc5c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  [#2844] fix test


  Commit: ef5e4a0693254984e52ea052524d523b28123f55
      https://github.com/okfn/ckan/commit/ef5e4a0693254984e52ea052524d523b28123f55
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

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

  Log Message:
  -----------
  [doc/theme][xs]: update to latest version of sphinx okfn theme with fixes for first heading and support for localtoc.


  Commit: f314d00b338182c6e058374576f4473907ff7577
      https://github.com/okfn/ckan/commit/f314d00b338182c6e058374576f4473907ff7577
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/sql.py
    M ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  Merge branch '2844-re-enable-simple-search'


  Commit: 7830d19e4282d0cca8038bf7c4a6e78b8bb0b3c5
      https://github.com/okfn/ckan/commit/7830d19e4282d0cca8038bf7c4a6e78b8bb0b3c5
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  Fix typo in datastore docs


  Commit: 1eb959b172c1aef0038f940f89056979cb5524ed
      https://github.com/okfn/ckan/commit/1eb959b172c1aef0038f940f89056979cb5524ed
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  Fix typo in datastore docs


  Commit: 59440982da8e6665a88a6097ed79aebe3a21a81b
      https://github.com/okfn/ckan/commit/59440982da8e6665a88a6097ed79aebe3a21a81b
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/sql.py
    M ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  Merge branch '2844-re-enable-simple-search-for-1.8' into release-v1.8


  Commit: 72b0e9fcab4f99c5f20102981496ed18b31ae787
      https://github.com/okfn/ckan/commit/72b0e9fcab4f99c5f20102981496ed18b31ae787
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/domain_object.py

  Log Message:
  -----------
  Merge branch '2816-re-add-model-bits' into release-v1.8


  Commit: c81ce4b6816e0669cf878603b1046558644b258f
      https://github.com/okfn/ckan/commit/c81ce4b6816e0669cf878603b1046558644b258f
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

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

  Log Message:
  -----------
  Avoid unnecessary commit request

The commit can be sent on the same request with the dict to index


  Commit: 7b65a54088db9f8ed0511aa200a6409ebe223392
      https://github.com/okfn/ckan/commit/7b65a54088db9f8ed0511aa200a6409ebe223392
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/tests/lib/test_cli.py

  Log Message:
  -----------
  Commit only once at the end of a search index rebuild

Commiting changes in the Solr search index is a heavy task that takes
significant time. We are currently commiting changes after each update,
which is probably fine for individual updated (ie users editing or
creating a dataset), but when rebuilding the whole index it is
unnecessary. A single commit at the end of the process is needed, and
that speeds the reindexing about a 85%.

A flag has been added (`-e` or `--commit-each`) to allow the old
behaviour (commiting after each edit).


  Commit: 8473cd8bcb15d88805a309470129ed10fe8ba522
      https://github.com/okfn/ckan/commit/8473cd8bcb15d88805a309470129ed10fe8ba522
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Allow not returning the package dict when creating or updating

This avoids calling package_show


  Commit: 74f12575b32922c92b0f607c809692911ef641e1
      https://github.com/okfn/ckan/commit/74f12575b32922c92b0f607c809692911ef641e1
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Return dataset id if 'return_pacakge_dict' is False


  Commit: 4006757ba6a6ead21c3deb17427fd6176b481ec2
      https://github.com/okfn/ckan/commit/4006757ba6a6ead21c3deb17427fd6176b481ec2
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Use return_id_only instead of return_package_dict

Suggested by @tobes, as it is more backwards compatible


  Commit: 088c170c114f2ada971d4db3f0e9c39d298b81b9
      https://github.com/okfn/ckan/commit/088c170c114f2ada971d4db3f0e9c39d298b81b9
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Quick fix for deprecated


  Commit: fa0601bbf67f9571a4cc18622dd2251f203682a8
      https://github.com/okfn/ckan/commit/fa0601bbf67f9571a4cc18622dd2251f203682a8
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Proper fix of deprecated_context_item


  Commit: 489717f0d20d22455d9fb6d701f8b1280bf614d2
      https://github.com/okfn/ckan/commit/489717f0d20d22455d9fb6d701f8b1280bf614d2
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  some documentation


  Commit: b28adbfcae582fcc1687c1421cd1ebe77c622202
      https://github.com/okfn/ckan/commit/b28adbfcae582fcc1687c1421cd1ebe77c622202
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Add the warning again


  Commit: f908c6b8643b4e3ad14cd8e04084737fec0db014
      https://github.com/okfn/ckan/commit/f908c6b8643b4e3ad14cd8e04084737fec0db014
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Store the message plus better names


  Commit: 6fe8c57ffc24504d453a2f90f15ce59074426ce6
      https://github.com/okfn/ckan/commit/6fe8c57ffc24504d453a2f90f15ce59074426ce6
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Fix the original deprecate_context_item function.


  Commit: 46ea2590653e0a9d4cc714ecd429532e4753360e
      https://github.com/okfn/ckan/commit/46ea2590653e0a9d4cc714ecd429532e4753360e
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Revert "Fix the original deprecate_context_item function."

This reverts commit 3ae477bfa84e62a6bdb5fa4f99e9800c007fb681.

thread unsafe


  Commit: 35168a5a3bcb710cb633c7fb1f3f7003312839b0
      https://github.com/okfn/ckan/commit/35168a5a3bcb710cb633c7fb1f3f7003312839b0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Fix up as suggested by kindly


  Commit: 227d8e5bb409fcfb68e94408eb7ac57aa61af334
      https://github.com/okfn/ckan/commit/227d8e5bb409fcfb68e94408eb7ac57aa61af334
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/tests/lib/test_cli.py

  Log Message:
  -----------
  Merge branch 'release-v1.8' of github.com:okfn/ckan into release-v1.8


  Commit: 9e348cdc7e30689fd7ee83952270a4608b8f83c6
      https://github.com/okfn/ckan/commit/9e348cdc7e30689fd7ee83952270a4608b8f83c6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    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/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/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Pull final translations for CKAN 1.8 from Transifex

Pulled the po files from Transifex, checked them, and compiled them to
create the mo files.


  Commit: efad575c6e76b18afac4463c541039bb330aa37f
      https://github.com/okfn/ckan/commit/efad575c6e76b18afac4463c541039bb330aa37f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Remove zh_TW translation from CKAN 1.8

It has 0% translations


  Commit: 1de3d7c0048d57bc6239e8dc2f895803fc0316ef
      https://github.com/okfn/ckan/commit/1de3d7c0048d57bc6239e8dc2f895803fc0316ef
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

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

  Log Message:
  -----------
  Avoid unnecessary commit request

The commit can be sent on the same request with the dict to index


  Commit: 302042a46a8a7e0e9d907180b9a9702ef7c68981
      https://github.com/okfn/ckan/commit/302042a46a8a7e0e9d907180b9a9702ef7c68981
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/tests/lib/test_cli.py

  Log Message:
  -----------
  Commit only once at the end of a search index rebuild

Commiting changes in the Solr search index is a heavy task that takes
significant time. We are currently commiting changes after each update,
which is probably fine for individual updated (ie users editing or
creating a dataset), but when rebuilding the whole index it is
unnecessary. A single commit at the end of the process is needed, and
that speeds the reindexing about a 85%.

A flag has been added (`-e` or `--commit-each`) to allow the old
behaviour (commiting after each edit).


  Commit: 6e43373acc4cdfb98bf12048f6df6f527b3d9847
      https://github.com/okfn/ckan/commit/6e43373acc4cdfb98bf12048f6df6f527b3d9847
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Allow not returning the package dict when creating or updating

This avoids calling package_show


  Commit: 5ec22a75e63cf416ab6c1124958e632ab531d468
      https://github.com/okfn/ckan/commit/5ec22a75e63cf416ab6c1124958e632ab531d468
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Return dataset id if 'return_pacakge_dict' is False


  Commit: 8f7baad5636c4352d7626ccbfb90c1d91e25262a
      https://github.com/okfn/ckan/commit/8f7baad5636c4352d7626ccbfb90c1d91e25262a
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Use return_id_only instead of return_package_dict

Suggested by @tobes, as it is more backwards compatible


  Commit: 63b92ce7e779b77fa0d8ee56184f927f680d278a
      https://github.com/okfn/ckan/commit/63b92ce7e779b77fa0d8ee56184f927f680d278a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Merge branch 'release-v1.8' of github.com:okfn/ckan into release-v1.8


  Commit: 2f7a60dbbf937cc1a5787b1d6988bcd7d4ccdc70
      https://github.com/okfn/ckan/commit/2f7a60dbbf937cc1a5787b1d6988bcd7d4ccdc70
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Update CKAN's default list of language options


  Commit: ad08763e03177cc3bf253de078e1899c08355fa5
      https://github.com/okfn/ckan/commit/ad08763e03177cc3bf253de078e1899c08355fa5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html

  Log Message:
  -----------
  [#2843] Remove 'Add Existing Datasets' option from organization edit

The link wasn't working, and this option doesn't make any sense when
organizations is enabled, because every dataset must belong to one and
only one organization anyway.

This commit simply removes the link from the organization edit page,
making it consistent with the other organization pages (read etc.)

It was necessary to add the ability to override the group/edit.html
template to the IGroupForm plugin to do this.


  Commit: ec53e974a40b4255f844c3f4d773f937c8c98784
      https://github.com/okfn/ckan/commit/ec53e974a40b4255f844c3f4d773f937c8c98784
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.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
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/meta.py
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/added_tag.html
    R ckan/templates/activity_streams/changed_group.html
    R ckan/templates/activity_streams/changed_package.html
    R ckan/templates/activity_streams/changed_package_extra.html
    R ckan/templates/activity_streams/changed_resource.html
    R ckan/templates/activity_streams/changed_user.html
    R ckan/templates/activity_streams/deleted_group.html
    R ckan/templates/activity_streams/deleted_package.html
    R ckan/templates/activity_streams/deleted_package_extra.html
    R ckan/templates/activity_streams/deleted_related_item.html
    R ckan/templates/activity_streams/deleted_resource.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_group.html
    R ckan/templates/activity_streams/new_package.html
    R ckan/templates/activity_streams/new_package_extra.html
    R ckan/templates/activity_streams/new_related_item.html
    R ckan/templates/activity_streams/new_resource.html
    R ckan/templates/activity_streams/new_user.html
    R ckan/templates/activity_streams/removed_tag.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_simple_search.py
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' into pep8-lib-helpers

Conflicts:
	ckan/lib/helpers.py

    trivial merge


  Commit: 7fe68d24ff22945b2dbf6fbaf0a5cde653d6f03f
      https://github.com/okfn/ckan/commit/7fe68d24ff22945b2dbf6fbaf0a5cde653d6f03f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/environment.py
    M ckan/controllers/group.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
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/validators.py
    M ckan/model/meta.py
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/added_tag.html
    R ckan/templates/activity_streams/changed_group.html
    R ckan/templates/activity_streams/changed_package.html
    R ckan/templates/activity_streams/changed_package_extra.html
    R ckan/templates/activity_streams/changed_resource.html
    R ckan/templates/activity_streams/changed_user.html
    R ckan/templates/activity_streams/deleted_group.html
    R ckan/templates/activity_streams/deleted_package.html
    R ckan/templates/activity_streams/deleted_package_extra.html
    R ckan/templates/activity_streams/deleted_related_item.html
    R ckan/templates/activity_streams/deleted_resource.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_group.html
    R ckan/templates/activity_streams/new_package.html
    R ckan/templates/activity_streams/new_package_extra.html
    R ckan/templates/activity_streams/new_related_item.html
    R ckan/templates/activity_streams/new_resource.html
    R ckan/templates/activity_streams/new_user.html
    R ckan/templates/activity_streams/removed_tag.html
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_simple_search.py
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/datastore.rst

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


  Commit: 18f95bfb26c1d71a4bc790224d4bd543a56fa39b
      https://github.com/okfn/ckan/commit/18f95bfb26c1d71a4bc790224d4bd543a56fa39b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch 'pep8-lib-helpers'


  Commit: 483c9402e75f5b10317cbe5180c733ed921644b0
      https://github.com/okfn/ckan/commit/483c9402e75f5b10317cbe5180c733ed921644b0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [#2856] Fix 500 error in related controller


  Commit: 84c4cbf74e4cb4bd450c082595e4edb8480656df
      https://github.com/okfn/ckan/commit/84c4cbf74e4cb4bd450c082595e4edb8480656df
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Remove 'Other (Open)' from multilingual test data

This fixes a multilingual extension test that was failing. Seems this
string is getting translated by normal gettext interface translation now


  Commit: 32ceeaedb50b74a008116ec728658438e27fb573
      https://github.com/okfn/ckan/commit/32ceeaedb50b74a008116ec728658438e27fb573
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  2869 Fixes problem with invalid data being passed to solr.

The feeds take a page number from the query string and use it to determine the
start position in the list.  Occassionally this is 0 and code around line 441
then decrement and then multiply this number, generating a start number less than
0 which solr chokes on.


  Commit: 0425e9caf785dd17fbc0b6af1092d4115cfab076
      https://github.com/okfn/ckan/commit/0425e9caf785dd17fbc0b6af1092d4115cfab076
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

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

  Log Message:
  -----------
  Test for 2868


  Commit: 0ae66717eda4249500a227db32b7fd302bb75fd6
      https://github.com/okfn/ckan/commit/0ae66717eda4249500a227db32b7fd302bb75fd6
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Merge branch '2868-feed-search-error'


  Commit: 5e338d9aba56eb4685b015392ed084fc01c80633
      https://github.com/okfn/ckan/commit/5e338d9aba56eb4685b015392ed084fc01c80633
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  2866 Missing key results in strip() being called on None

When no reset key is present then None is used to verify the key
and it is strip()ed first, resulting in an error.


  Commit: c73b6f00c16f526015a903642618806a4c642d72
      https://github.com/okfn/ckan/commit/c73b6f00c16f526015a903642618806a4c642d72
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  2867 Fixes a problem with passing unicode to url_for

Forces the file_url to be ascii as it appears that for some reason, and only
occassionally OFS returns unicode instead of str.  We don't want to fix OFS
as it is scheduled for removal and we can fix routes as it is already out of
date.


  Commit: aa710e43529f1f12b4d8c993e2e18409f3199c60
      https://github.com/okfn/ckan/commit/aa710e43529f1f12b4d8c993e2e18409f3199c60
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  Fix for non-open licenses appearing open

The 'This dataset is openly licensed' icon was appearing next to
non-open datasets as well. The problem was that DefaultLicense was
returning u"False" (a string) for boolean attributes such as
is_okd_compliant. Change the class so it no longer turns non-string
attributes into unicode strings when you access them.


  Commit: f314b5eaba185ea43feda87c08054a4cd812c525
      https://github.com/okfn/ckan/commit/f314b5eaba185ea43feda87c08054a4cd812c525
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  Merge branch '2866-missing-reset-key'


  Commit: f0da258544d090b76d6205e3b29b38c1e5793ed1
      https://github.com/okfn/ckan/commit/f0da258544d090b76d6205e3b29b38c1e5793ed1
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/model/license.py

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


  Commit: 85df0117cc85416f134084b3a2a1f5e8b51aec92
      https://github.com/okfn/ckan/commit/85df0117cc85416f134084b3a2a1f5e8b51aec92
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Merge branch '2867-unicode-error-url-for'


  Commit: 9af067196ef12830a82a5b011eaf43d0f5313d37
      https://github.com/okfn/ckan/commit/9af067196ef12830a82a5b011eaf43d0f5313d37
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#2639,js/recline][xs]: re-insert support for serializing all dataset info into state (and vice-versa) which means format is preserved for dataproxy.


  Commit: fd1abd9d5701b4addf7e709c1766d6ffed1bb8bf
      https://github.com/okfn/ckan/commit/fd1abd9d5701b4addf7e709c1766d6ffed1bb8bf
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2639,bugfix][xs]: bugfix for minor issue with backwards compatibility in embed urls.

* Bug: previous recline setup used elasticsearch_url in recline 'state' (dataset part) when generating embed_url for dataset. But recline no longer supports this. Fixed by moving elasticsearch_urlmoving to url attribute of dataset attribute of state.


  Commit: 48530a360b4b73cdbf4ecf29b84e9a9de017a8b6
      https://github.com/okfn/ckan/commit/48530a360b4b73cdbf4ecf29b84e9a9de017a8b6
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

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

  Log Message:
  -----------
  [#2639,bugfix][xs]: remove reference to recline.Model.Dataset.restore (has been removed from recline) and do the dataset restore by hand (trivial).


  Commit: eae560d4bbf3ad0972a52b8cd19ac4893a9e4352
      https://github.com/okfn/ckan/commit/eae560d4bbf3ad0972a52b8cd19ac4893a9e4352
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/public/scripts/application.js
    M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  Merge branch '2639-update-recline-for-1.8-release'


  Commit: 23b5039085ab9e528f5c340249cffec98a9a72fa
      https://github.com/okfn/ckan/commit/23b5039085ab9e528f5c340249cffec98a9a72fa
  Author: James McKinney <james at slashpoundbang.com>
  Date:   2012-08-18 (Sat, 18 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Add FileStore configuration settings to deployment.ini_tmpl


  Commit: a84d5fe6d4f8239c65df5e708f475b6c0d5c0145
      https://github.com/okfn/ckan/commit/a84d5fe6d4f8239c65df5e708f475b6c0d5c0145
  Author: James McKinney <james at slashpoundbang.com>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/filestore.rst

  Log Message:
  -----------
  Add note about setting ckan.site_url when using local file storage


  Commit: 20858553ab168eb19e8cad56d81dc99e41aebfed
      https://github.com/okfn/ckan/commit/20858553ab168eb19e8cad56d81dc99e41aebfed
  Author: James McKinney <james at slashpoundbang.com>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Fix e2073a37 which caused double slashes to occur


  Commit: 3cdc23921f6f25d2c60655a52c56462a0fec0718
      https://github.com/okfn/ckan/commit/3cdc23921f6f25d2c60655a52c56462a0fec0718
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Fix to documentation of file upload parameters


  Commit: 0d316e506e833f3d02e48ad52b3c5e8f07acd4a1
      https://github.com/okfn/ckan/commit/0d316e506e833f3d02e48ad52b3c5e8f07acd4a1
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/lib/create_test_data.py
    M ckan/lib/mailer.py
    M ckan/model/license.py
    M ckan/public/scripts/application.js
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

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


  Commit: c465dd525b12a688013c45d72a8d7b32cdce436f
      https://github.com/okfn/ckan/commit/c465dd525b12a688013c45d72a8d7b32cdce436f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Merge pull request #105 from okfn/file-upload-doc-file

[doc] File upload doc fix.


  Commit: d8a2b5f53c76649abde1f1dc12d3538b76daff72
      https://github.com/okfn/ckan/commit/d8a2b5f53c76649abde1f1dc12d3538b76daff72
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M doc/configuration.rst

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


  Commit: c2c70802dbefdaa9f73c61aa50c989621fc78c66
      https://github.com/okfn/ckan/commit/c2c70802dbefdaa9f73c61aa50c989621fc78c66
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

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

  Log Message:
  -----------
  [xs] Fixing the RDF template


  Commit: 5d81435267ac2510c2b947d18f97c2a74dc8477e
      https://github.com/okfn/ckan/commit/5d81435267ac2510c2b947d18f97c2a74dc8477e
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

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

  Log Message:
  -----------
  Merge branch 'rdf-template-fix'


  Commit: 2be2b62bd68a6920ffbccebe6d2ed6a39629ddc2
      https://github.com/okfn/ckan/commit/2be2b62bd68a6920ffbccebe6d2ed6a39629ddc2
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

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

  Log Message:
  -----------
  [#2844] fix simple search for db clean


  Commit: 5f414d0de77148fe73e8004e898fecbabf6ef562
      https://github.com/okfn/ckan/commit/5f414d0de77148fe73e8004e898fecbabf6ef562
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Merge pull request #104 from jpmckinney/no_double_slashes

Fix e2073a37 which caused double slashes to occur


  Commit: c7cdab4b2b8d81a48dd3d37e5bf0f1709cf45346
      https://github.com/okfn/ckan/commit/c7cdab4b2b8d81a48dd3d37e5bf0f1709cf45346
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/filestore.rst

  Log Message:
  -----------
  Merge pull request #102 from jpmckinney/master

Add FileStore configuration settings to deployment.ini_tmpl


  Commit: 58d276987e159b2da113f666b20d3f9643d16409
      https://github.com/okfn/ckan/commit/58d276987e159b2da113f666b20d3f9643d16409
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/storage.py
    M ckan/lib/search/__init__.py
    M ckan/templates/package/read.rdf
    M doc/filestore.rst

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


  Commit: 00037246c7cf1615aec377fbcf2f83530f56e2c6
      https://github.com/okfn/ckan/commit/00037246c7cf1615aec377fbcf2f83530f56e2c6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  Enable allow_partial_update for group update

Listen to allow_partial_update in the context when saving a group, and
use it in the group controller. This fixes issue #2854 where all an
organizations datasets were being removed on updating an organization
(with the organizations plugins enabled)


  Commit: e432ac566eb5dac8ea2cf39b3235be72e204e827
      https://github.com/okfn/ckan/commit/e432ac566eb5dac8ea2cf39b3235be72e204e827
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  Apply allow_partial_update to all group fields

Make 'allow_partial_update': True in the context apply to multiple group
fields: packages, users, groups, tags and extras, when updating a group,
so you can pass a group dict with e.g. no 'packages' key and this will
update the group but will not change the group's packages.  Previously
allow_partial_update only affected packages and extras.


  Commit: 99a7aef666ff2fc387b5aa73a2fe4e8d73fabbe5
      https://github.com/okfn/ckan/commit/99a7aef666ff2fc387b5aa73a2fe4e8d73fabbe5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  Allow passing empty lists to group_update

If, for example, a group dict with a 'packages' key with an empty list
as the value is passed to group_update, then set the group's packages to
an empty list (i.e. remove any packages from the group), even if
'allow_partial_update': True was specified in the context (previously
such an empty list would be ignored and the group's packages would not
change). Also applies to other group fields e.g. tags, users, groups, etc.


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_save.py

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


  Commit: 7041f22239f654dd0ee52be643e55cb367f797ab
      https://github.com/okfn/ckan/commit/7041f22239f654dd0ee52be643e55cb367f797ab
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/group.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/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/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M 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
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/model/__init__.py
    M ckan/model/domain_object.py
    M ckan/plugins/interfaces.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html

  Log Message:
  -----------
  Merge branch '2843-cannot-add-existing-datasets-to-organizations'


  Commit: c8ee3e142972229477272754dd7291a00c730f06
      https://github.com/okfn/ckan/commit/c8ee3e142972229477272754dd7291a00c730f06
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/i18n/check_po_files.py
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Fix unicode formatting bug


  Commit: fbb9160f879519d96a8852f8ac55544664f98a6a
      https://github.com/okfn/ckan/commit/fbb9160f879519d96a8852f8ac55544664f98a6a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Fix error on unicode related title


  Commit: 45c31815ea3282d185bde284788baf5da1b1749d
      https://github.com/okfn/ckan/commit/45c31815ea3282d185bde284788baf5da1b1749d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/__init__.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/publisher/create.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/plugins/interfaces.py
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    R ckan/templates/authorization_group/__init__.py
    R ckan/templates/authorization_group/authz.html
    R ckan/templates/authorization_group/edit.html
    R ckan/templates/authorization_group/edit_form.html
    R ckan/templates/authorization_group/index.html
    R ckan/templates/authorization_group/layout.html
    R ckan/templates/authorization_group/new.html
    R ckan/templates/authorization_group/read.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py

  Log Message:
  -----------
  Removed auth groups from tests, controller, model and logic


  Commit: 2b59d11ad63eab0e2c251ac3b08bfe87a7771451
      https://github.com/okfn/ckan/commit/2b59d11ad63eab0e2c251ac3b08bfe87a7771451
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [xs] Minor fix for accept header handling on package


  Commit: 940c726af832765f1665e81ea13a2a836cca22ad
      https://github.com/okfn/ckan/commit/940c726af832765f1665e81ea13a2a836cca22ad
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/templates/admin/config.html
    A ckan/templates/admin/confirm_reset.html
    M ckan/templates/snippets/debug.html

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of https://github.com/okfn/ckan into 2375-demo-theme-development


  Commit: f5d3ac2d66f7239535c0c609162e7e59bf289b91
      https://github.com/okfn/ckan/commit/f5d3ac2d66f7239535c0c609162e7e59bf289b91
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 2366-remove-authorization-groups


  Commit: 8996a68ed85b96507e7ec25432d62d3b5934d3a2
      https://github.com/okfn/ckan/commit/8996a68ed85b96507e7ec25432d62d3b5934d3a2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/__init__.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/publisher/create.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/plugins/interfaces.py
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    R ckan/templates/authorization_group/__init__.py
    R ckan/templates/authorization_group/authz.html
    R ckan/templates/authorization_group/edit.html
    R ckan/templates/authorization_group/edit_form.html
    R ckan/templates/authorization_group/index.html
    R ckan/templates/authorization_group/layout.html
    R ckan/templates/authorization_group/new.html
    R ckan/templates/authorization_group/read.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py

  Log Message:
  -----------
  Merge branch '2366-remove-authorization-groups'


  Commit: db28796b61f4eef590d979435521c39bd867668e
      https://github.com/okfn/ckan/commit/db28796b61f4eef590d979435521c39bd867668e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckanext/organizations/controllers.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organizations/form.html
    A ckanext/organizations/templates/organizations/index.html
    A ckanext/organizations/templates/organizations/new.html
    A ckanext/organizations/templates/organizations/read.html
    A ckanext/organizations/templates/organizations/users.html
    A ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organization_apply.html
    R ckanext/organizations/templates_legacy/organization_apply_form.html
    R ckanext/organizations/templates_legacy/organization_form.html
    R ckanext/organizations/templates_legacy/organization_history.html
    R ckanext/organizations/templates_legacy/organization_index.html
    R ckanext/organizations/templates_legacy/organization_layout.html
    R ckanext/organizations/templates_legacy/organization_new.html
    R ckanext/organizations/templates_legacy/organization_package_form.html
    R ckanext/organizations/templates_legacy/organization_read.html
    R ckanext/organizations/templates_legacy/organization_users.html
    R ckanext/organizations/templates_legacy/organization_users_form.html
    A ckanext/organizations/templates_legacy/organizations/apply.html
    A ckanext/organizations/templates_legacy/organizations/apply_form.html
    A ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    A ckanext/organizations/templates_legacy/organizations/form.html
    A ckanext/organizations/templates_legacy/organizations/history.html
    A ckanext/organizations/templates_legacy/organizations/index.html
    A ckanext/organizations/templates_legacy/organizations/layout.html
    A ckanext/organizations/templates_legacy/organizations/new.html
    A ckanext/organizations/templates_legacy/organizations/package_form.html
    A ckanext/organizations/templates_legacy/organizations/read.html
    A ckanext/organizations/templates_legacy/organizations/users.html
    A ckanext/organizations/templates_legacy/organizations/users_form.html

  Log Message:
  -----------
  Tidying up the legacy organization templates, and create skeletons for new templates.

Currently requires user management templates, applying for membership and a plan for how
to integrate the organisation IDatasetForm into the dataset form for auto-adding to group.


  Commit: 62e31ccf45257caf98f2cd8d490e3ad4dc305189
      https://github.com/okfn/ckan/commit/62e31ccf45257caf98f2cd8d490e3ad4dc305189
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.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/check_po_files.py
    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
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M 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
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/datapreview/vendor/recline/recline.js
    M ckan/public/scripts/application.js
    M ckan/templates_legacy/package/read.rdf
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_simple_search.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/filestore.rst

  Log Message:
  -----------
  Merge branch 'master' into 2375-demo-theme-development

Conflicts:
	ckan/__init__.py

version -> 2.0a in head

	ckan/controllers/group.py

sort order change went with master head is commented out name asc

	ckan/i18n/ckan.pot
	ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
	ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

removed branch changes

	ckan/lib/helpers.py

various new functions in head kept

	ckan/lib/maintain.py

new functions in head kept

	ckan/model/__init__.py

new model kept


  Commit: d43aa85ffb38998af81c1ff122b45bd5739b3378
      https://github.com/okfn/ckan/commit/d43aa85ffb38998af81c1ff122b45bd5739b3378
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2375] Remove debugging print statment


  Commit: 754dfd8345484a7049a0df1fcc7f205400133208
      https://github.com/okfn/ckan/commit/754dfd8345484a7049a0df1fcc7f205400133208
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2375] Fix linked_user helper function


  Commit: 592d85db672c47fa986e3537724893c1ed0d66d5
      https://github.com/okfn/ckan/commit/592d85db672c47fa986e3537724893c1ed0d66d5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckan/model/resource.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#2578] Fix some dictization tests due to unified format


  Commit: d1ae6e5dfa577ef454e3cfc76d3d68238bf88ebe
      https://github.com/okfn/ckan/commit/d1ae6e5dfa577ef454e3cfc76d3d68238bf88ebe
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2578] Fix tag_vocab tests in demo


  Commit: e947a252ac3d8d566a443fc7d1936b4162aeaf8f
      https://github.com/okfn/ckan/commit/e947a252ac3d8d566a443fc7d1936b4162aeaf8f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckan/controllers/package.py
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  [#2578] Fix package tests


  Commit: f183ff38d0d97b9274983394806106e12e967456
      https://github.com/okfn/ckan/commit/f183ff38d0d97b9274983394806106e12e967456
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckanext/organizations/controllers.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organizations/form.html
    A ckanext/organizations/templates/organizations/index.html
    A ckanext/organizations/templates/organizations/new.html
    A ckanext/organizations/templates/organizations/read.html
    A ckanext/organizations/templates/organizations/users.html
    A ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organization_apply.html
    R ckanext/organizations/templates_legacy/organization_apply_form.html
    R ckanext/organizations/templates_legacy/organization_form.html
    R ckanext/organizations/templates_legacy/organization_history.html
    R ckanext/organizations/templates_legacy/organization_index.html
    R ckanext/organizations/templates_legacy/organization_layout.html
    R ckanext/organizations/templates_legacy/organization_new.html
    R ckanext/organizations/templates_legacy/organization_package_form.html
    R ckanext/organizations/templates_legacy/organization_read.html
    R ckanext/organizations/templates_legacy/organization_users.html
    R ckanext/organizations/templates_legacy/organization_users_form.html
    A ckanext/organizations/templates_legacy/organizations/apply.html
    A ckanext/organizations/templates_legacy/organizations/apply_form.html
    A ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    A ckanext/organizations/templates_legacy/organizations/form.html
    A ckanext/organizations/templates_legacy/organizations/history.html
    A ckanext/organizations/templates_legacy/organizations/index.html
    A ckanext/organizations/templates_legacy/organizations/layout.html
    A ckanext/organizations/templates_legacy/organizations/new.html
    A ckanext/organizations/templates_legacy/organizations/package_form.html
    A ckanext/organizations/templates_legacy/organizations/read.html
    A ckanext/organizations/templates_legacy/organizations/users.html
    A ckanext/organizations/templates_legacy/organizations/users_form.html

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of github.com:okfn/ckan into 2375-demo-theme-development


  Commit: 672264c4cd9d48a7bc69ecd38dc13d874e20ef8e
      https://github.com/okfn/ckan/commit/672264c4cd9d48a7bc69ecd38dc13d874e20ef8e
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    R ckan/templates_legacy/_snippet/add-related.html
    M ckan/templates_legacy/_util.html
    M ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/authorization_group/__init__.py
    R ckan/templates_legacy/authorization_group/authz.html
    R ckan/templates_legacy/authorization_group/edit.html
    R ckan/templates_legacy/authorization_group/edit_form.html
    R ckan/templates_legacy/authorization_group/index.html
    R ckan/templates_legacy/authorization_group/layout.html
    R ckan/templates_legacy/authorization_group/new.html
    R ckan/templates_legacy/authorization_group/read.html
    M ckan/templates_legacy/group/authz.html
    M ckan/templates_legacy/package/authz.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/related_list.html
    M ckan/templates_legacy/user/layout.html

  Log Message:
  -----------
  [#2375] Update legacy templates


  Commit: 050020ebd40bc24abe385f4503634d957a5b24ec
      https://github.com/okfn/ckan/commit/050020ebd40bc24abe385f4503634d957a5b24ec
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/tests/functional/test_related.py
    M test-core.ini

  Log Message:
  -----------
  [#2578] Fix related tests for demo


  Commit: ea8925d2253ce98b9c78debbec7f4424c8d565fc
      https://github.com/okfn/ckan/commit/ea8925d2253ce98b9c78debbec7f4424c8d565fc
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2578] Actually add templates properly for tests


  Commit: 1f213ceb08ee995971ba55e45a34896e4e9da584
      https://github.com/okfn/ckan/commit/1f213ceb08ee995971ba55e45a34896e4e9da584
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#2578] Allow genshi snippets to access template context


  Commit: 9d72f041f1acc4718fcc7cdac8a922dae5ae3209
      https://github.com/okfn/ckan/commit/9d72f041f1acc4718fcc7cdac8a922dae5ae3209
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  [#2578] Fix for dictization schema


  Commit: 38510b2ec4a82597a272f22a0e970a3f1f2ebf12
      https://github.com/okfn/ckan/commit/38510b2ec4a82597a272f22a0e970a3f1f2ebf12
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#2578] Fix for test action


  Commit: 402663227a4526ae5ec48e659706b4db3d8a1f2a
      https://github.com/okfn/ckan/commit/402663227a4526ae5ec48e659706b4db3d8a1f2a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/tests/misc/test_auth_profiles.py

  Log Message:
  -----------
  [#2578] Fix for auth profile tests


  Commit: 208e979b7ca39501e0db1750d8c2f5a410033b46
      https://github.com/okfn/ckan/commit/208e979b7ca39501e0db1750d8c2f5a410033b46
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#2578] Fix for user dashboard test


  Commit: 08c1efd0b03dc453899045399933723066376f2a
      https://github.com/okfn/ckan/commit/08c1efd0b03dc453899045399933723066376f2a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2375] Allow plural translations in template {% trans %} tags


  Commit: 2d5485fddd284f5261135e1b36b36edb5d320bdf
      https://github.com/okfn/ckan/commit/2d5485fddd284f5261135e1b36b36edb5d320bdf
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2375] Don\'t mangle html


  Commit: acb1204cfea3157fbbf399295c5d9f6214368057
      https://github.com/okfn/ckan/commit/acb1204cfea3157fbbf399295c5d9f6214368057
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M ckan/lib/jinja_extensions.py

  Log Message:
  -----------
  [#2375] Allow message extraction with ckan_extends tag


  Commit: 6197d7b2f009bb41793231e24a67dd41cad35b0c
      https://github.com/okfn/ckan/commit/6197d7b2f009bb41793231e24a67dd41cad35b0c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M ckan/lib/jinja_extensions.py

  Log Message:
  -----------
  [#2375] Custom ckan trans tag


  Commit: 315acfc76b1780841330c563270caf48d26fb420
      https://github.com/okfn/ckan/commit/315acfc76b1780841330c563270caf48d26fb420
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2375] Switch to use ckan trans tag


  Commit: 8ec6e8a236549f7fb53371ceaa023c6bcadb8e1f
      https://github.com/okfn/ckan/commit/8ec6e8a236549f7fb53371ceaa023c6bcadb8e1f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M ckan/lib/extract.py

  Log Message:
  -----------
  [#2375] Extract messages in format for ckan trans tag


  Commit: 74fc91b81b15d6f0b749b8da2eb24defd13ed0ea
      https://github.com/okfn/ckan/commit/74fc91b81b15d6f0b749b8da2eb24defd13ed0ea
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.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/check_po_files.py
    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
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M 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
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/resource.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/datapreview/vendor/recline/recline.js
    M ckan/public/scripts/application.js
    R ckan/templates_legacy/_snippet/add-related.html
    M ckan/templates_legacy/_util.html
    M ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/authorization_group/__init__.py
    R ckan/templates_legacy/authorization_group/authz.html
    R ckan/templates_legacy/authorization_group/edit.html
    R ckan/templates_legacy/authorization_group/edit_form.html
    R ckan/templates_legacy/authorization_group/index.html
    R ckan/templates_legacy/authorization_group/layout.html
    R ckan/templates_legacy/authorization_group/new.html
    R ckan/templates_legacy/authorization_group/read.html
    M ckan/templates_legacy/group/authz.html
    M ckan/templates_legacy/package/authz.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/related_list.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_simple_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_auth_profiles.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/filestore.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of https://github.com/okfn/ckan into 2375-demo-theme-development


  Commit: 93980c341202caf455ae32679793fbe395ee9c16
      https://github.com/okfn/ckan/commit/93980c341202caf455ae32679793fbe395ee9c16
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/extract.py
    M ckan/lib/jinja_extensions.py

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of https://github.com/okfn/ckan into 2375-demo-theme-development


  Commit: d2db416964e5cfa2f78353f9146f21313b9482e6
      https://github.com/okfn/ckan/commit/d2db416964e5cfa2f78353f9146f21313b9482e6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  [#2578] Temp fix for resource dictization based tests (format)


  Commit: 17f0094aef8405902cc748963f66ef43b38a7a34
      https://github.com/okfn/ckan/commit/17f0094aef8405902cc748963f66ef43b38a7a34
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/__init__.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/publisher/create.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/plugins/interfaces.py
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/admin/authz.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py

  Log Message:
  -----------
  Merge branch 'master' into 2375-demo-theme-development

Conflicts:
	ckan/controllers/admin.py
	ckan/lib/helpers.py
	ckan/templates/admin/authz.html
	ckan/templates/package/new_package_form.html

removal of authz related bits


  Commit: 33cd96478d129b24735abe1d4e2f0a1ce59b8572
      https://github.com/okfn/ckan/commit/33cd96478d129b24735abe1d4e2f0a1ce59b8572
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/__init__.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/publisher/create.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/plugins/interfaces.py
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/admin/authz.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of https://github.com/okfn/ckan into 2375-demo-theme-development


  Commit: 4711f5f4ff34ec26051098babd9c644946cee0b7
      https://github.com/okfn/ckan/commit/4711f5f4ff34ec26051098babd9c644946cee0b7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/tests/lib/test_resource_search.py

  Log Message:
  -----------
  Temporary fix to resolve problem with resource format botching.


  Commit: 58cf43fe74e2d2db7e357eb65a09db696902adba
      https://github.com/okfn/ckan/commit/58cf43fe74e2d2db7e357eb65a09db696902adba
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/select-switch.js

  Log Message:
  -----------
  Removed trailing comma which was breaking within Internet Explorer


  Commit: 46c93f509e4af54f3836e43c008ad5895d7f14bf
      https://github.com/okfn/ckan/commit/46c93f509e4af54f3836e43c008ad5895d7f14bf
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M bin/less

  Log Message:
  -----------
  Changed usage of fs.watch to nodewatch (npm install nodewatch) as it's a more reliable API than fs.watch


  Commit: 7ea8fe49db6911f767284ec6e398f9e7d839f7a6
      https://github.com/okfn/ckan/commit/7ea8fe49db6911f767284ec6e398f9e7d839f7a6
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  Header logo now shows in IE7


  Commit: 4bc9cf640803f5254ffaf286fcb8e5e5716a0065
      https://github.com/okfn/ckan/commit/4bc9cf640803f5254ffaf286fcb8e5e5716a0065
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/layout.less

  Log Message:
  -----------
  Tags on demo homepage now render nicely in IE7


  Commit: a10d30ad6ed248c6a96c1575f0e6995a520f149d
      https://github.com/okfn/ckan/commit/a10d30ad6ed248c6a96c1575f0e6995a520f149d
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/module.less

  Log Message:
  -----------
  Homepage now is completely styled for IE7


  Commit: b1683adadc313c0dec928a81032c78570f364658
      https://github.com/okfn/ckan/commit/b1683adadc313c0dec928a81032c78570f364658
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/footer.less

  Log Message:
  -----------
  Fixes to make footer work in Internet Explorer 7


  Commit: 8708e9908e7b85a9812e38e696e889aaefaa4143
      https://github.com/okfn/ckan/commit/8708e9908e7b85a9812e38e696e889aaefaa4143
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  Couple of minor tweaks to input widths


  Commit: 755aee43d703e56ece64d9302a272f5af4e96cd2
      https://github.com/okfn/ckan/commit/755aee43d703e56ece64d9302a272f5af4e96cd2
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/layout.less

  Log Message:
  -----------
  Made tags fix a site wide fix (and not just homepage) and removed uneeded whitespace


  Commit: 6773f30528ae1c39f842d270c41267492a9e5079
      https://github.com/okfn/ckan/commit/6773f30528ae1c39f842d270c41267492a9e5079
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/variables.less

  Log Message:
  -----------
  Change Typography stack so that the site looks much nicer on devices that have better fonts


  Commit: d0d585df5872dcced34e2541cb9afdc1c07b55ed
      https://github.com/okfn/ckan/commit/d0d585df5872dcced34e2541cb9afdc1c07b55ed
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/module.js

  Log Message:
  -----------
  JavaScript Fix for ckan modules

This fixes a lot of JavaScript issues with ckan modules in Internet Explorer 7. Essentially IE7 doesn't have the subtype window.SyntaxError and the majority of times this is falling through the if statement and still throwing the error (because the error type in IE7 is window.Error). This fix makes a lot of modules work, however since I don't have much visibility on the codebase yet I'm not sure what the implications on changing such a re-used bit of code would be.


  Commit: 9939013682abb91f88b50e62fc43a3cbf92d232b
      https://github.com/okfn/ckan/commit/9939013682abb91f88b50e62fc43a3cbf92d232b
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  Fix for license info on add dataset page for IE7


  Commit: b2ae13555a406a3f08316bd97d81a3c86db7c302
      https://github.com/okfn/ckan/commit/b2ae13555a406a3f08316bd97d81a3c86db7c302
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

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

  Log Message:
  -----------
  Removed uneeded colon


  Commit: 15ad56ccd9aeee24eb6bf65281a31e60040ca654
      https://github.com/okfn/ckan/commit/15ad56ccd9aeee24eb6bf65281a31e60040ca654
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  Fix for header selected state in IE7


  Commit: dfccc7dbfcde69d21534a343fb912cd1ad75b6e2
      https://github.com/okfn/ckan/commit/dfccc7dbfcde69d21534a343fb912cd1ad75b6e2
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Fixed unclosed button tag for 'Update Profile' button


  Commit: 073ede97df388a49a7f65aeb71970f246cab3730
      https://github.com/okfn/ckan/commit/073ede97df388a49a7f65aeb71970f246cab3730
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/profile.less

  Log Message:
  -----------
  Removed margin bottom on nav-tabs on user profile


  Commit: 3b6eac501eabc1f9deda2bc5f254e6db49898174
      https://github.com/okfn/ckan/commit/3b6eac501eabc1f9deda2bc5f254e6db49898174
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  Positioned the close button on alerts in a nicer place for IE7


  Commit: 667187b54fc54b11e76c359d359d0e34e6a6e148
      https://github.com/okfn/ckan/commit/667187b54fc54b11e76c359d359d0e34e6a6e148
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/media.less

  Log Message:
  -----------
  IE7 fix for columns as media-items


  Commit: f9d9ea4ad16560ca878ad23e96987f8c7015f544
      https://github.com/okfn/ckan/commit/f9d9ea4ad16560ca878ad23e96987f8c7015f544
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/templates/group/snippets/group_form.html

  Log Message:
  -----------
  Added type submit to html


  Commit: a25503c2cfb5793ed59a4da7762a879258f838e7
      https://github.com/okfn/ckan/commit/a25503c2cfb5793ed59a4da7762a879258f838e7
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    A ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/nav.less
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/search_form.html

  Log Message:
  -----------
  Fixes for close buttons in IE7


  Commit: b0340a28972265ff0eda51c3e869b9b5c863762b
      https://github.com/okfn/ckan/commit/b0340a28972265ff0eda51c3e869b9b5c863762b
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  Fix to make steps have nice widths on add dataset form


  Commit: fdaef9c5be6c558f72fea0294bf0c489266801e1
      https://github.com/okfn/ckan/commit/fdaef9c5be6c558f72fea0294bf0c489266801e1
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  oops, shouldn't have removed that


  Commit: 65d120e3dbbd3d883ec8509a948522f746033168
      https://github.com/okfn/ckan/commit/65d120e3dbbd3d883ec8509a948522f746033168
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/custom-fields.js

  Log Message:
  -----------
  Removed custom JavaScript for changing custom fields remove checkbox into a button for IE7

It's basically because IE7 doesn't like calling the change event on input that are not visible. It's not an ideal fix... but it does make the form usable.


  Commit: 8468d78954521bc5d391addcf98af4cb52ac5ee4
      https://github.com/okfn/ckan/commit/8468d78954521bc5d391addcf98af4cb52ac5ee4
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    A ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/less/toolbar.less

  Log Message:
  -----------
  Added fix for breadcrumbs in IE7


  Commit: f66b3c17e19b6323fb58e164c9770f14d88047f8
      https://github.com/okfn/ckan/commit/f66b3c17e19b6323fb58e164c9770f14d88047f8
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/slug-preview.js

  Log Message:
  -----------
  IE7 box model fixes (this is a little hacky)


  Commit: 6c451dca51c7e56f05d05b946e9efb031ed4a2c7
      https://github.com/okfn/ckan/commit/6c451dca51c7e56f05d05b946e9efb031ed4a2c7
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/toolbar.less

  Log Message:
  -----------
  Moved all Internet explorer hacks into one file


  Commit: 1e8175f8c7de75b11171c402a6c65f66a57ade33
      https://github.com/okfn/ckan/commit/1e8175f8c7de75b11171c402a6c65f66a57ade33
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

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

  Log Message:
  -----------
  Added language support for remove tooltip


  Commit: 1ccd6962653283c8bfd85fcd0a81433ad0188d01
      https://github.com/okfn/ckan/commit/1ccd6962653283c8bfd85fcd0a81433ad0188d01
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/iehacks.less

  Log Message:
  -----------
  Fix for too many closed brackets in iehacks document


  Commit: 2bdcb8ed7937bc8df5e2baae4e3db2b27f26ef55
      https://github.com/okfn/ckan/commit/2bdcb8ed7937bc8df5e2baae4e3db2b27f26ef55
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/iehacks.less

  Log Message:
  -----------
  Fix for broken IE7 style (bug introduced due to refactor)


  Commit: 869ffb04541adcc11f097de9bb46977013b68942
      https://github.com/okfn/ckan/commit/869ffb04541adcc11f097de9bb46977013b68942
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/mixins.less
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/search_form.html

  Log Message:
  -----------
  Removed × and replaced with icon-remove as it makes more semantic sense


  Commit: 60be5af078f620439794361e7d252dce6ce30020
      https://github.com/okfn/ckan/commit/60be5af078f620439794361e7d252dce6ce30020
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/iehacks.less

  Log Message:
  -----------
  Fix for title input on add dataset page for within IE7


  Commit: 4251c94512a949bae2963f34e38cc013a170cf15
      https://github.com/okfn/ckan/commit/4251c94512a949bae2963f34e38cc013a170cf15
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M doc/frontend-development.rst

  Log Message:
  -----------
  install nodewatch


  Commit: a769f4bdd3c24f92d13341654e6f90555a205711
      https://github.com/okfn/ckan/commit/a769f4bdd3c24f92d13341654e6f90555a205711
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/variables.less

  Log Message:
  -----------
  Fixes to color variables less from @tobes comments


  Commit: 899ca965f1014284be3ac708c2da5e8610bd92fe
      https://github.com/okfn/ckan/commit/899ca965f1014284be3ac708c2da5e8610bd92fe
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/variables.less

  Log Message:
  -----------
  Added extra less variable for language dropdown in footer


  Commit: 9a51e6de7f52bf78becd6dda3ebfa307c4eef184
      https://github.com/okfn/ckan/commit/9a51e6de7f52bf78becd6dda3ebfa307c4eef184
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css

  Log Message:
  -----------
  [#2375] Css Updates


  Commit: 82940e3e95fbdb296e594b4d00e2a1aa07b0e16c
      https://github.com/okfn/ckan/commit/82940e3e95fbdb296e594b4d00e2a1aa07b0e16c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#2375] Minor change to cli color


  Commit: d388d4b531ea98719f5ed53c7bbce3704c7e33ae
      https://github.com/okfn/ckan/commit/d388d4b531ea98719f5ed53c7bbce3704c7e33ae
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M bin/less
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.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/check_po_files.py
    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
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M 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
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/extract.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.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/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/model/license.py
    M ckan/model/resource.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/datapreview/vendor/recline/recline.js
    A ckan/public/base/images/background-tag-ie7.png
    A ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/select-switch.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/iehacks.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/admin/authz.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read.html
    R ckan/templates_legacy/_snippet/add-related.html
    M ckan/templates_legacy/_util.html
    M ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/authorization_group/__init__.py
    R ckan/templates_legacy/authorization_group/authz.html
    R ckan/templates_legacy/authorization_group/edit.html
    R ckan/templates_legacy/authorization_group/edit_form.html
    R ckan/templates_legacy/authorization_group/index.html
    R ckan/templates_legacy/authorization_group/layout.html
    R ckan/templates_legacy/authorization_group/new.html
    R ckan/templates_legacy/authorization_group/read.html
    M ckan/templates_legacy/group/authz.html
    M ckan/templates_legacy/package/authz.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/related_list.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_cli.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_simple_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_auth_profiles.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/controllers.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html
    A ckanext/organizations/templates/organizations/form.html
    A ckanext/organizations/templates/organizations/index.html
    A ckanext/organizations/templates/organizations/new.html
    A ckanext/organizations/templates/organizations/read.html
    A ckanext/organizations/templates/organizations/users.html
    A ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organization_apply.html
    R ckanext/organizations/templates_legacy/organization_apply_form.html
    R ckanext/organizations/templates_legacy/organization_form.html
    R ckanext/organizations/templates_legacy/organization_history.html
    R ckanext/organizations/templates_legacy/organization_index.html
    R ckanext/organizations/templates_legacy/organization_layout.html
    R ckanext/organizations/templates_legacy/organization_new.html
    R ckanext/organizations/templates_legacy/organization_package_form.html
    R ckanext/organizations/templates_legacy/organization_read.html
    R ckanext/organizations/templates_legacy/organization_users.html
    R ckanext/organizations/templates_legacy/organization_users_form.html
    A ckanext/organizations/templates_legacy/organizations/apply.html
    A ckanext/organizations/templates_legacy/organizations/apply_form.html
    A ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    A ckanext/organizations/templates_legacy/organizations/form.html
    A ckanext/organizations/templates_legacy/organizations/history.html
    A ckanext/organizations/templates_legacy/organizations/index.html
    A ckanext/organizations/templates_legacy/organizations/layout.html
    A ckanext/organizations/templates_legacy/organizations/new.html
    A ckanext/organizations/templates_legacy/organizations/package_form.html
    A ckanext/organizations/templates_legacy/organizations/read.html
    A ckanext/organizations/templates_legacy/organizations/users.html
    A ckanext/organizations/templates_legacy/organizations/users_form.html
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2618-nested-resources


  Commit: ed356363a7f9ea594ab093cfde3b76302b43e5a1
      https://github.com/okfn/ckan/commit/ed356363a7f9ea594ab093cfde3b76302b43e5a1
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2375] Fix test when db not built


Compare: https://github.com/okfn/ckan/compare/fe9758c2eb3a...ed356363a7f9


More information about the ckan-changes mailing list