[ckan-changes] [okfn/ckan] 687c5a: Merge branch 'feature-1797-webstore-v2'

Mon Mar 5 00:58:10 UTC 2012

  Branch: refs/heads/feature-1797-webstore-v2
  Home:   https://github.com/okfn/ckan
  Commit: 687c5a1e0659caa1f999c97d7e5b8ab0b99fdb95
      https://github.com/okfn/ckan/commit/687c5a1e0659caa1f999c97d7e5b8ab0b99fdb95
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'feature-1797-webstore-v2'

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

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'master' into enhancement-1792-api-logic

  Commit: 9ecdaea16783f0e539c680517005386fe799ec56
      https://github.com/okfn/ckan/commit/9ecdaea16783f0e539c680517005386fe799ec56
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  allow old calls to api/rest/package etc

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

  Changed paths:
    M ckan/controllers/webstore.py

  Log Message:
  -----------
  [#1797,webstore,bugfix][xs]: make sure x-accel-redirect header is ascii as http protocol requires ascii (or close to ascii).

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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  fix redirect double root bug

  Commit: 5c5c297402cec7c456f45038129636dc187bda82
      https://github.com/okfn/ckan/commit/5c5c297402cec7c456f45038129636dc187bda82
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

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

  Log Message:
  -----------
  [xs] make register get correct url

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

  Changed paths:
    M ckan/controllers/webstore.py

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

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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [xs] keep urls clean

  Commit: 328f8c9bd9fbe7a0177953065b2e06d4911c1f77
      https://github.com/okfn/ckan/commit/328f8c9bd9fbe7a0177953065b2e06d4911c1f77
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/controllers/webstore.py
  M ckan/lib/helpers.py
  M ckan/templates/user/layout.html

  Log Message:
  -----------
  Merge branch 'master' into enhancement-1792-api-logic

  Commit: 52855c873e30ec7e6a00622bab35663ce05a6a99
      https://github.com/okfn/ckan/commit/52855c873e30ec7e6a00622bab35663ce05a6a99
  Author: Fulvio Sciarretta <zydio at users.sf.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/templates/_util.html
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1788] fix for IE 6/7/8 conditional comments which prevented execution of Python code in Genshi, and caused html5 support script not being loaded/executed.

This required the addition of a pure Python function, and call of that function inside layout_base.html to resolve h.url_for_static() calls.

  Commit: 1e0030e06fc3db7d7ec71110e74db02adbe368ff
      https://github.com/okfn/ckan/commit/1e0030e06fc3db7d7ec71110e74db02adbe368ff
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/lib/plugins.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  import cleanups

  Commit: 730c0ace851bfa897e448382a37706e20b9eb16e
      https://github.com/okfn/ckan/commit/730c0ace851bfa897e448382a37706e20b9eb16e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/templates/_util.html
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  Merge pull request #4 from zydio/defect-1788-ie7-compatibility-problems

[#1788][s]: Another fix for IE 6/7/8 compatibility that addresses h.url_for_static in conditional browser sections (thx to @zydio).

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

  Changed paths:
    A .gitmodules
  A doc/_templates/footer.html
  R doc/_templates/layout.html
  A doc/_themes/sphinx-theme-okfn
  M doc/conf.py

  Log Message:
  -----------
  [master,doc][s]: switch docs theme to sphinx-theme-okfn and tweak config (e.g. project title).

  Commit: 913273836b5b7a2248cf537942d222090f04c11e
      https://github.com/okfn/ckan/commit/913273836b5b7a2248cf537942d222090f04c11e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M doc/index.rst
  M doc/theming.rst

  Log Message:
  -----------
  [master,doc][xs]: micro changes to theming page title and index page text.

  Commit: 0ab99cf0f4755222bc878ec1f266a3c1e75e930a
      https://github.com/okfn/ckan/commit/0ab99cf0f4755222bc878ec1f266a3c1e75e930a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [master,bugfix][xs]: correct typo in layout template introduced in 730c0ace851bfa897e448382a37706e20b9eb16e.

See https://github.com/zydio/ckan/commit/52855c873e30ec7e6a00622bab35663ce05a6a99#commitcomment-1037301 for more detail.

  Commit: 69d7f180b02d4ad775dc8b9041dfb109cb9ac0eb
      https://github.com/okfn/ckan/commit/69d7f180b02d4ad775dc8b9041dfb109cb9ac0eb
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  [master,README][xs]: note about how to build docs with note about need to init submodule.

  Commit: cff3ae660667f58683d9727214992edf3a2e64ff
      https://github.com/okfn/ckan/commit/cff3ae660667f58683d9727214992edf3a2e64ff
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M doc/about.rst
  M doc/api.rst

  Log Message:
  -----------
  [master,doc][xs]: ckan.net removed or changed to ckan.org.

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

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

  Log Message:
  -----------
  [master,#1797,js][xs]: set format on resources from formatNormalized as this gets passed to DataProxy.

  Commit: b28ae660bd5150207c02d63a2253ef4e14de6507
      https://github.com/okfn/ckan/commit/b28ae660bd5150207c02d63a2253ef4e14de6507
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-03 (Sat, 03 Mar 2012)

  Changed paths:
    A .gitmodules
  M .tx/config
  M CHANGELOG.txt
  M README.rst
  A bin/webstore_test.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/revision.py
  M ckan/controllers/user.py
  A ckan/controllers/webstore.py
  M ckan/forms/common.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
  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/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/lib/activity.py
  M ckan/lib/base.py
  M ckan/lib/captcha.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  A ckan/lib/plugins.py
  M ckan/lib/search/query.py
  M ckan/logic/__init__.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/__init__.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/plugins/interfaces.py
  A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  A ckan/public/scripts/vendor/html5shiv/html5.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_util.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/about.html
  M ckan/templates/home/index.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/history.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.html
  A ckan/templates/user/logout_first.html
  M ckan/templates/user/read.html
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_revisions.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/api/test_authorization_group.py
  M ckan/tests/functional/api/test_user.py
  M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_search.py
  M ckan/tests/functional/test_tag.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/functional/test_user.py
  A ckan/tests/functional/test_webstore.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_i18n.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckanext/stats/__init__.py
  A ckanext/stats/public/__init__.py
  A ckanext/stats/public/ckanext/__init__.py
  A ckanext/stats/public/ckanext/stats/__init__.py
  A ckanext/stats/templates/__init__.py
  A ckanext/stats/templates/ckanext/__init__.py
  A ckanext/stats/templates/ckanext/stats/__init__.py
  M ckanext/stats/templates/ckanext/stats/index.html
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  A ckanext/test_tag_vocab_plugin.py
  A doc/_templates/footer.html
  R doc/_templates/layout.html
  A doc/_themes/sphinx-theme-okfn
  M doc/about.rst
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/conf.py
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  M doc/solr-setup.rst
  M doc/theming.rst
  A doc/webstore.rst
  M doc/writing-extensions.rst
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1807-recently-changed-datasets

Conflicts:
	ckan/controllers/home.py

  Commit: 8368024fbdf3cc07fcfe3ea30d5bcef8367781f5
      https://github.com/okfn/ckan/commit/8368024fbdf3cc07fcfe3ea30d5bcef8367781f5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-03 (Sat, 03 Mar 2012)

  Changed paths:
    M ckan/controllers/home.py
  M ckan/logic/action/get.py
  M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Merge branch 'feature-1807-recently-changed-datasets'

  Commit: 8749c3643dfe55afbb02cd4bd6b4073a2e3f8782
      https://github.com/okfn/ckan/commit/8749c3643dfe55afbb02cd4bd6b4073a2e3f8782
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-04 (Sun, 04 Mar 2012)

  Changed paths:
    M doc/conf.py
  A doc/datastore.rst
  M doc/index.rst
  R doc/webstore.rst

  Log Message:
  -----------
  [#1797,master,doc][s]: webstore -> datastore rename plus extensive reworking and improvement of datastore docs.

  Commit: 432f135a35efb7f7d7c056498090c55896cb7901
      https://github.com/okfn/ckan/commit/432f135a35efb7f7d7c056498090c55896cb7901
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-04 (Sun, 04 Mar 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  A ckan/controllers/datastore.py
  R ckan/controllers/webstore.py
  A ckan/tests/functional/test_datastore.py
  R ckan/tests/functional/test_webstore.py
  M doc/datastore.rst
  M test-core.ini

  Log Message:
  -----------
  [#1797,refactor][s]: rename webstore -> datastore throughout.

Compare: https://github.com/okfn/ckan/compare/4b45d81...432f135