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

GitHub noreply at github.com
Tue Apr 10 16:27:47 UTC 2012 

  Branch: refs/heads/feature-1821-multilingual-extension
  Home:   https://github.com/okfn/ckan
  Commit: f8c3b1a07b37a9cc8decb8dc87917050dcb1821e
      https://github.com/okfn/ckan/commit/f8c3b1a07b37a9cc8decb8dc87917050dcb1821e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/lib/base.py
  M ckan/lib/helpers.py
  A ckan/lib/helpers_clean.py
  M ckan/templates/authorization_group/layout.html
  M ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/revision/layout.html
  M doc/configuration.rst
  M test-core.ini

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


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

  Changed paths:
    M ckan/controllers/group.py
  M ckanext/organizations/controllers.py
  M ckanext/organizations/forms.py
  M ckanext/organizations/templates/organization_layout.html
  M doc/publisher-profile.rst

  Log Message:
  -----------
  [2255] Cleanup of application process and documentation


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

  Changed paths:
    M ckan/public/scripts/application.js
  M ckanext/organizations/templates/organization_users_form.html

  Log Message:
  -----------
  [2205] Fix for username autocomplete on user admin page


  Commit: 88a444006f78b37dbc5ee291458e372d58f229db
      https://github.com/okfn/ckan/commit/88a444006f78b37dbc5ee291458e372d58f229db
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckanext/organizations/templates/organization_layout.html

  Log Message:
  -----------
  [2255] Make sure that editors are shown the Add Dataset link on organization view


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

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckanext/organizations/templates/organization_layout.html

  Log Message:
  -----------
  [2255] Only search for public datasets on /dataset/ and only show private on /organization/ if current user is a member


  Commit: 484441c5f00fa316e3af29670ea9cb4b971a3b0e
      https://github.com/okfn/ckan/commit/484441c5f00fa316e3af29670ea9cb4b971a3b0e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/lib/base.py
  M ckan/lib/helpers.py
  A ckan/lib/helpers_clean.py
  M ckan/templates/authorization_group/layout.html
  M ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/revision/layout.html
  M doc/configuration.rst
  M test-core.ini

  Log Message:
  -----------
  [2255] Merge from master


  Commit: 7ca60303fe5698b078e8ef8b5d0227b8df54c2f0
      https://github.com/okfn/ckan/commit/7ca60303fe5698b078e8ef8b5d0227b8df54c2f0
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M doc/publisher-profile.rst

  Log Message:
  -----------
  [2255] Minor tweak to documentation


  Commit: 3600c9f2a3bf2e6907008e51945ad91948a1490f
      https://github.com/okfn/ckan/commit/3600c9f2a3bf2e6907008e51945ad91948a1490f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/logic/auth/publisher/get.py
  M ckan/model/package.py
  M ckan/tests/functional/test_authz.py

  Log Message:
  -----------
  [2255] Check the publisher auth to hide private datasets when visiting directly - note that we currently 403, but maybe a 404 might leak less info


  Commit: d28552c73db397f884d5a8e495812c8230f6d214
      https://github.com/okfn/ckan/commit/d28552c73db397f884d5a8e495812c8230f6d214
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M ckan/logic/auth/publisher/get.py
  M ckan/model/package.py

  Log Message:
  -----------
  [2255] Fixed a problem in package model and ensured that private datasets raise a 404 instead of leaking information about their existence - for non-authed users


  Commit: 4030d37b87fb11099db35234a1b1ba7e1547f997
      https://github.com/okfn/ckan/commit/4030d37b87fb11099db35234a1b1ba7e1547f997
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  Fixing uploader in IE7; refactoring ckanjs out of the equation.


  Commit: 35b7f656b2f0308e1455cef6ab272aaf70b5c07b
      https://github.com/okfn/ckan/commit/35b7f656b2f0308e1455cef6ab272aaf70b5c07b
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788][xs]: Glitchfix.


  Commit: 065b9e1a12d6729412fca1305039fa2fe21e0fda
      https://github.com/okfn/ckan/commit/065b9e1a12d6729412fca1305039fa2fe21e0fda
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788]: Avoid using HTML5 data- attributes to fix IE7.


  Commit: 4b6f271a9e767961db7df6d5555b3544010af89d
      https://github.com/okfn/ckan/commit/4b6f271a9e767961db7df6d5555b3544010af89d
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788]: Tweaking & testing on staging server.


  Commit: cf6e3cd7d8f84984d76a54dcbbc39fd9fa19f750
      https://github.com/okfn/ckan/commit/cf6e3cd7d8f84984d76a54dcbbc39fd9fa19f750
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788]: Caught JS bug which was killing IE file uploads.


  Commit: 1f3e243d2494bb9f63d69dcad7e0593ca25d5255
      https://github.com/okfn/ckan/commit/1f3e243d2494bb9f63d69dcad7e0593ca25d5255
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788]: Refactoring to centralise uploading in application.js; ckanjs.js is not used here now.


  Commit: 08da289e4e25f9cfca138a48a3db8a750d6788df
      https://github.com/okfn/ckan/commit/08da289e4e25f9cfca138a48a3db8a750d6788df
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/public/scripts/application.js
  M ckan/templates/package/edit.html
  M ckan/templates/package/editresources.html
  M ckan/templates/package/new.html

  Log Message:
  -----------
  [#1788]: Simplifying JS. Don't embed unnecessary JSON into page.


  Commit: 2ee1b48e3332a49a67e99dacc812f67a43992be5
      https://github.com/okfn/ckan/commit/2ee1b48e3332a49a67e99dacc812f67a43992be5
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  R ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1788]: Removed all dependancy on ckanjs.js.


  Commit: 60e1fff8a92fed918827a2089989b046d0a59a97
      https://github.com/okfn/ckan/commit/60e1fff8a92fed918827a2089989b046d0a59a97
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788]: Avoid overlapping input names in subform.


  Commit: ab8c55f6f72679a343d754c408e6411aca956194
      https://github.com/okfn/ckan/commit/ab8c55f6f72679a343d754c408e6411aca956194
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788]: Glitchfixing deprecated method calls.


  Commit: e1e8cc6b5911b03d4d83f7375e189c06564132ca
      https://github.com/okfn/ckan/commit/e1e8cc6b5911b03d4d83f7375e189c06564132ca
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788]: Refactored resource editor to be flattened into the page.


  Commit: c2b1089ef26f7777cfa8e7b2cf533c2c1ec2725f
      https://github.com/okfn/ckan/commit/c2b1089ef26f7777cfa8e7b2cf533c2c1ec2725f
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788]: Visually connecting elements on the editresources page.


  Commit: 25a9a44a6e7330af4886da2cc30057e0c430077e
      https://github.com/okfn/ckan/commit/25a9a44a6e7330af4886da2cc30057e0c430077e
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M bin/running_stats.py
  M ckan/config/environment.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/ckan.pot
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  A ckan/i18n/lv/LC_MESSAGES/ckan.mo
  A ckan/i18n/lv/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  A ckan/i18n/sk/LC_MESSAGES/ckan.mo
  A ckan/i18n/sk/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.po
  A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
  A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
  M ckan/lib/base.py
  M ckan/lib/cli.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/helpers.py
  A ckan/lib/helpers_clean.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/logic/action/get.py
  M ckan/templates/authorization_group/layout.html
  M ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/revision/layout.html
  M ckan/tests/lib/test_dictization.py
  M doc/apiv3.rst
  M doc/configuration.rst
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into feature-1788-browser-compatibility


  Commit: 9b5564b59c50c4ad46b09136244b4548de8f52bb
      https://github.com/okfn/ckan/commit/9b5564b59c50c4ad46b09136244b4548de8f52bb
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

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

  Log Message:
  -----------
  [#1788]: minor style fixes.


  Commit: 5900d968f55ae8e5fa8561e6da25cdc404daefbf
      https://github.com/okfn/ckan/commit/5900d968f55ae8e5fa8561e6da25cdc404daefbf
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  R ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/editresources.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  Merge branch 'feature-1788-browser-compatibility'


  Commit: 63144aa35622cabb2ef03b92e19b09835e1daea5
      https://github.com/okfn/ckan/commit/63144aa35622cabb2ef03b92e19b09835e1daea5
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-31 (Sat, 31 Mar 2012)

  Changed paths:
    M doc/index.rst
  A doc/publishing-datasets.rst

  Log Message:
  -----------
  [#2226,doc/publishing-datasets][s]: start on introduction and tutorial to publishing datasets using CKAN.


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

  Changed paths:
    M ckanext/organizations/forms.py

  Log Message:
  -----------
  [2255] Unnecessary cleanup to test jenkins :)


  Commit: b7b32820a9132811028e7ccc243b2d2339492d4d
      https://github.com/okfn/ckan/commit/b7b32820a9132811028e7ccc243b2d2339492d4d
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

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

  Log Message:
  -----------
  [#2278,master][s]: very minor tweak to new resource js code so that DataStore is enabled by default for file and file.upload resource types - fixes #2278.


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

  Changed paths:
    M ckan/lib/search/index.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_pagination.py

  Log Message:
  -----------
  [2255] Fix to index to make sure packages are indexed against capacity as public/private


  Commit: 94053fb0f7b3016cd92e83dd942d79a62948b34a
      https://github.com/okfn/ckan/commit/94053fb0f7b3016cd92e83dd942d79a62948b34a
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ckan/lib/dictization/model_save.py
  M ckan/lib/search/index.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/group.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/logic/test_member.py

  Log Message:
  -----------
  [2255] Removed last entries for capacity value of member


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

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/forms/package.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/delete.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/auth/publisher/update.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/public/scripts/application.js
  M ckan/templates/package/new_package_form.html
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/logic/test_member.py
  A ckanext/organizations/__init__.py
  A ckanext/organizations/controllers.py
  A ckanext/organizations/forms.py
  A ckanext/organizations/templates/email/join_publisher_request.txt
  A ckanext/organizations/templates/organization_apply.html
  A ckanext/organizations/templates/organization_apply_form.html
  A ckanext/organizations/templates/organization_form.html
  A ckanext/organizations/templates/organization_index.html
  A ckanext/organizations/templates/organization_layout.html
  A ckanext/organizations/templates/organization_new.html
  A ckanext/organizations/templates/organization_package_form.html
  A ckanext/organizations/templates/organization_read.html
  A ckanext/organizations/templates/organization_users.html
  A ckanext/organizations/templates/organization_users_form.html
  M doc/publisher-profile.rst
  M setup.py

  Log Message:
  -----------
  Merge branch 'feature-2255-organizations'


  Commit: dc40f254eb57395fe8be36b4bbe196c17d04e000
      https://github.com/okfn/ckan/commit/dc40f254eb57395fe8be36b4bbe196c17d04e000
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M doc/api-v2.rst

  Log Message:
  -----------
  Correct an error in the APIv2 docs


  Commit: 882fa21d142824a0608785d45d80d0363de1cd30
      https://github.com/okfn/ckan/commit/882fa21d142824a0608785d45d80d0363de1cd30
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/forms/package.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/delete.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/auth/publisher/update.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/public/scripts/application.js
  M ckan/templates/package/new_package_form.html
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/logic/test_member.py
  A ckanext/organizations/__init__.py
  A ckanext/organizations/controllers.py
  A ckanext/organizations/forms.py
  A ckanext/organizations/templates/email/join_publisher_request.txt
  A ckanext/organizations/templates/organization_apply.html
  A ckanext/organizations/templates/organization_apply_form.html
  A ckanext/organizations/templates/organization_form.html
  A ckanext/organizations/templates/organization_index.html
  A ckanext/organizations/templates/organization_layout.html
  A ckanext/organizations/templates/organization_new.html
  A ckanext/organizations/templates/organization_package_form.html
  A ckanext/organizations/templates/organization_read.html
  A ckanext/organizations/templates/organization_users.html
  A ckanext/organizations/templates/organization_users_form.html
  M doc/publisher-profile.rst
  M setup.py

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


  Commit: 767f42b3ea165a6875a2e4f7dbf26c77392f8718
      https://github.com/okfn/ckan/commit/767f42b3ea165a6875a2e4f7dbf26c77392f8718
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/lib/package_saver.py

  Log Message:
  -----------
  [i18n] Fix a couple of strings that weren't marked for translation


  Commit: 81d18e94b82c5fda78305c2231bf1b86d022177d
      https://github.com/okfn/ckan/commit/81d18e94b82c5fda78305c2231bf1b86d022177d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Remove an unused private function from controllers/package.py

The function contained user-visible strings that weren't marked for
translation anyway.


  Commit: 6e8e2e6294e4c38b11ba2f472da5de82d2684c2b
      https://github.com/okfn/ckan/commit/6e8e2e6294e4c38b11ba2f472da5de82d2684c2b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [i18n] Fix a string translation bug

_() doesn't seem to like []'s in strings, was causing errors from
compile_catalog command.


  Commit: bac55d94dc365ff7ee242c0a93cdf183f71e45ec
      https://github.com/okfn/ckan/commit/bac55d94dc365ff7ee242c0a93cdf183f71e45ec
  Author: John Glover <j at johnglover.net>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ckan/templates/_util_activity_div.html

  Log Message:
  -----------
  [xs][templates] remove excess whitespace from activity stream render templates


  Commit: 9e8d7664e95e8a1bbade318d6c37224070f5de27
      https://github.com/okfn/ckan/commit/9e8d7664e95e8a1bbade318d6c37224070f5de27
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/scripts/application.js
  M ckan/templates/js_strings.html
  M ckan/templates/user/login.html
  M ckan/templates/user/new_user_form.html

  Log Message:
  -----------
  [i18n] Mark some more strings for translation


  Commit: 15f737ed86a638ed6291cbd87cd0b2a4b4627478
      https://github.com/okfn/ckan/commit/15f737ed86a638ed6291cbd87cd0b2a4b4627478
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ckan/templates/_util_activity_div.html

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


  Commit: 7194f50bb2c79d4e90a56fd2303ecdb1b2cc2839
      https://github.com/okfn/ckan/commit/7194f50bb2c79d4e90a56fd2303ecdb1b2cc2839
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M ckan/templates/tag/index.html
  M ckan/templates/user/list.html

  Log Message:
  -----------
  [i18n] Mark some more strings for translation


  Commit: 9e502efa43f93a148c654ebcbe9b6b7b92187938
      https://github.com/okfn/ckan/commit/9e502efa43f93a148c654ebcbe9b6b7b92187938
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M ckan/forms/authorization_group.py

  Log Message:
  -----------
  [i18n] Mark some strings for translation on new/edit authz group page


  Commit: 56312fb72b0179f2285aeb4c73d41a6d1ff64612
      https://github.com/okfn/ckan/commit/56312fb72b0179f2285aeb4c73d41a6d1ff64612
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

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

  Log Message:
  -----------
  [i18n] Mark a couple of strings for translation


  Commit: 6c1748739d70b2ceee229c0fdab91696f1cc11dd
      https://github.com/okfn/ckan/commit/6c1748739d70b2ceee229c0fdab91696f1cc11dd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

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

  Log Message:
  -----------
  [i18n] Mark some strings for translation on new resource form


  Commit: 88d1e4db11f34c21a12b1400832fed697f7095e5
      https://github.com/okfn/ckan/commit/88d1e4db11f34c21a12b1400832fed697f7095e5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

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

  Log Message:
  -----------
  [i18n] Mark some more strings for translation in new resource form


  Commit: 2d90fb3d1dc7c2afdd0f0b14f62ee5621c630fa8
      https://github.com/okfn/ckan/commit/2d90fb3d1dc7c2afdd0f0b14f62ee5621c630fa8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

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

  Log Message:
  -----------
  [i18n] Mark some strings for translation on file upload form


  Commit: d73e07c6aa8af8e3b385ca9ecf6ca38e79028549
      https://github.com/okfn/ckan/commit/d73e07c6aa8af8e3b385ca9ecf6ca38e79028549
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

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

  Log Message:
  -----------
  Update API Docs links wiki -> sphinx


  Commit: 46f06bda95d79261210589abb54fed0c054d5096
      https://github.com/okfn/ckan/commit/46f06bda95d79261210589abb54fed0c054d5096
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    R MIGRATE.txt
  R RELEASE.txt

  Log Message:
  -----------
  [master,docs][xs]: remove very obsolete MIGRATE.txt and RELEASE.txt.


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

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/user.py
  M ckan/lib/helpers.py
  M ckan/public/scripts/application.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  i18n user log in/out fixes


  Commit: 521ad8605e7a54fbd1fa672d2909e8ade39e1018
      https://github.com/okfn/ckan/commit/521ad8605e7a54fbd1fa672d2909e8ade39e1018
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/templates/_util.html
  R ckan/templates/_util_activity_div.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html
  M ckan/tests/functional/test_activity.py

  Log Message:
  -----------
  Refactor activity streams templates for i18n

The strings in the activity streams templates were not i18n-friendly.
Replaced the activity_div Genshi util function with an activity_div
Python function in helpers.py, and refactored it to make the strings
able to be marked for translation.


  Commit: 7ac1b5d177d2a6f95c68ae495e0a8e98c18b7c16
      https://github.com/okfn/ckan/commit/7ac1b5d177d2a6f95c68ae495e0a8e98c18b7c16
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/user.py
  M ckan/lib/helpers.py
  M ckan/public/scripts/application.js
  M ckan/templates/layout_base.html

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


  Commit: 09b9f01f408b6b5903d481f5fa6bd4373076126d
      https://github.com/okfn/ckan/commit/09b9f01f408b6b5903d481f5fa6bd4373076126d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    R MIGRATE.txt
  R RELEASE.txt
  M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  M ckan/forms/authorization_group.py
  M ckan/forms/package.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/package_saver.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/delete.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/auth/publisher/update.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  R ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/templates/_util.html
  R ckan/templates/_util_activity_div.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/editresources.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/search.html
  M ckan/templates/tag/index.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.html
  M ckan/templates/user/new_user_form.html
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/logic/test_member.py
  A ckanext/organizations/__init__.py
  A ckanext/organizations/controllers.py
  A ckanext/organizations/forms.py
  A ckanext/organizations/templates/email/join_publisher_request.txt
  A ckanext/organizations/templates/organization_apply.html
  A ckanext/organizations/templates/organization_apply_form.html
  A ckanext/organizations/templates/organization_form.html
  A ckanext/organizations/templates/organization_index.html
  A ckanext/organizations/templates/organization_layout.html
  A ckanext/organizations/templates/organization_new.html
  A ckanext/organizations/templates/organization_package_form.html
  A ckanext/organizations/templates/organization_read.html
  A ckanext/organizations/templates/organization_users.html
  A ckanext/organizations/templates/organization_users_form.html
  M doc/api-v2.rst
  M doc/index.rst
  M doc/publisher-profile.rst
  A doc/publishing-datasets.rst
  M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1821-multilingual-extension

Conflicts:
	ckan/lib/dictization/model_dictize.py
	setup.py


Compare: https://github.com/okfn/ckan/compare/770d1c1...09b9f01

More information about the ckan-changes mailing list