[ckan-changes] [okfn/ckan] 77076e: api and wui use shared code for groups

• Previous message: [ckan-changes] [okfn/ckan] 227326: [2211] Added a check to test_storage to create pai...
• Next message: [ckan-changes] [okfn/ckan] 1ea3b5: [1742] fix route clashes by disallowing some names
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/feature-1831-login-by-email
  Home:   https://github.com/okfn/ckan
  Commit: 77076e5b1dcd82d0408b7dadfdd6a305b445a319
      https://github.com/okfn/ckan/commit/77076e5b1dcd82d0408b7dadfdd6a305b445a319
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  api and wui use shared code for groups


  Commit: 430a0a99b6a90508a32c9d2e4d06e07c22bc77a2
      https://github.com/okfn/ckan/commit/430a0a99b6a90508a32c9d2e4d06e07c22bc77a2
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  fix tests so they are treated as api calls


  Commit: 6cf810d4c1a7cd38369b281cb53676b87d53fc71
      https://github.com/okfn/ckan/commit/6cf810d4c1a7cd38369b281cb53676b87d53fc71
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  [#1506][editresources][s]: Formatting hint.


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

  Changed paths:
    M ckan/controllers/api.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  clean up imports in action.update


  Commit: 60ed66aaceca1580ae936877c7ee27b060f392c7
      https://github.com/okfn/ckan/commit/60ed66aaceca1580ae936877c7ee27b060f392c7
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  clean up imports in action.create


  Commit: 38371116246ec2a230b29159d11ec914c55a7a1a
      https://github.com/okfn/ckan/commit/38371116246ec2a230b29159d11ec914c55a7a1a
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  minor import fixes


  Commit: 36b2cb652035199e4ad268b294e75cea743c2052
      https://github.com/okfn/ckan/commit/36b2cb652035199e4ad268b294e75cea743c2052
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  clean up imports in actions.delete


  Commit: 17429d0ea3ed9215eb211eafc47cb2cc32a5ecd8
      https://github.com/okfn/ckan/commit/17429d0ea3ed9215eb211eafc47cb2cc32a5ecd8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py

  Log Message:
  -----------
  better imports in package and group controllers


  Commit: 45d84f04a9036619e101f8de11afba7401c27d95
      https://github.com/okfn/ckan/commit/45d84f04a9036619e101f8de11afba7401c27d95
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  get fn via get_action


  Commit: 09401c927d3a41a37a4f406d7e950c92ccee8746
      https://github.com/okfn/ckan/commit/09401c927d3a41a37a4f406d7e950c92ccee8746
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

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


  Commit: a41cd0c9b04c757f5fa37acaba6be71e345a9c1f
      https://github.com/okfn/ckan/commit/a41cd0c9b04c757f5fa37acaba6be71e345a9c1f
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  [#978 in #1506][editresources][l]: Add and edit resource extras in WUI.


  Commit: a205cd20078d15c53c33b509a31f89a68e54604b
      https://github.com/okfn/ckan/commit/a205cd20078d15c53c33b509a31f89a68e54604b
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.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
  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/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/test_user.py

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


  Commit: 9ab8b0283bb086eb4cd663ff73c27066bdd3c79a
      https://github.com/okfn/ckan/commit/9ab8b0283bb086eb4cd663ff73c27066bdd3c79a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  [#1797,js][xs]: switch to elasticsearch for viewing datasets with associated webstore db.


  Commit: eeb8b30829c2165c742bfcd7a1ef79218edeb90e
      https://github.com/okfn/ckan/commit/eeb8b30829c2165c742bfcd7a1ef79218edeb90e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#1797,js/recline][xs]: latest version of recline (minor improvements).


  Commit: 4b45d819c3478b2ea29a4e4196e413807cb46622
      https://github.com/okfn/ckan/commit/4b45d819c3478b2ea29a4e4196e413807cb46622
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  [#1797,css][xs]: tidy up css for recline data viewer.


  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: 44c1315e1372d29afd3def7f02b837ec0fb95068
      https://github.com/okfn/ckan/commit/44c1315e1372d29afd3def7f02b837ec0fb95068
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M doc/configuration.rst
  M doc/publisher_auth_profile.rst

  Log Message:
  -----------
  [1670] Correcting the name of the configuration property


  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: f4301b09193723acdcb38626dd66f8ee72cca69c
      https://github.com/okfn/ckan/commit/f4301b09193723acdcb38626dd66f8ee72cca69c
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

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

  Log Message:
  -----------
  [#1506][editresources][m]: Markdown editor in resource edit pane.


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

  Changed paths:
    M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [#1506][settings][m]: Groups & Tags integrated into Basic Information page of settings.


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

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

  Log Message:
  -----------
  [#1506][xl]: Refactoring js.


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

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

  Log Message:
  -----------
  [#1506][js][l]: UrlEditor is a backbone model; various ux tweaks


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

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

  Log Message:
  -----------
  [#1506][js][s]: Warn on very long URL slugs.


  Commit: 385ffcd85c1f95c855ec73db94eb40c10404cbf0
      https://github.com/okfn/ckan/commit/385ffcd85c1f95c855ec73db94eb40c10404cbf0
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [#1648 in #1506][settings][s]: Clarified terminology on dataset extra fields.


  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: f3fbd7075fb208c143867f8ab1be86c00ea206b0
      https://github.com/okfn/ckan/commit/f3fbd7075fb208c143867f8ab1be86c00ea206b0
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

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

  Log Message:
  -----------
  [#1506][js][s]: Fixed animation glitch.


  Commit: 68d00508c81ed2738fcb1ccade888dbf2879a4b1
      https://github.com/okfn/ckan/commit/68d00508c81ed2738fcb1ccade888dbf2879a4b1
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

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

  Log Message:
  -----------
  [#1506][s]: Remove redundant/outdated code


  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: ea189735e8f4d0affcd81a3a8b1c47a66b30d118
      https://github.com/okfn/ckan/commit/ea189735e8f4d0affcd81a3a8b1c47a66b30d118
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

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

  Log Message:
  -----------
  [#1506][resources][m]: Refactoring look-and-feel.


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

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

  Log Message:
  -----------
  [#1506][m]: Various aesthetics. Log message field restored.


  Commit: 954d4e61a8b6805a9a049522709fae3ae1a07964
      https://github.com/okfn/ckan/commit/954d4e61a8b6805a9a049522709fae3ae1a07964
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M .tx/config
  M CHANGELOG.txt
  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/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/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/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/user/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_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
  M doc/common-error-messages.rst
  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
  A doc/webstore.rst
  M doc/writing-extensions.rst
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  [#1506][merge,from-master]:


  Commit: 215a5d7b164f8756aeb0f86e31aa91d09a38a1ab
      https://github.com/okfn/ckan/commit/215a5d7b164f8756aeb0f86e31aa91d09a38a1ab
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

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

  Log Message:
  -----------
  [#1506][dataset/create][m]: Create a dataset with errors; resources will be preserved.


  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: e6943e430585fdc94b527cdadd2c57ec4853a4a9
      https://github.com/okfn/ckan/commit/e6943e430585fdc94b527cdadd2c57ec4853a4a9
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-03 (Sat, 03 Mar 2012)

  Changed paths:
    A .gitmodules
  M README.rst
  M ckan/public/scripts/application.js
  M ckan/templates/_util.html
  M ckan/templates/layout_base.html
  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/conf.py
  M doc/index.rst
  M doc/theming.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-1506-ux-superticket


  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.


  Commit: bc31e278cd4072d4872e803510aa2f3f236274cd
      https://github.com/okfn/ckan/commit/bc31e278cd4072d4872e803510aa2f3f236274cd
  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:
  -----------
  Merge branch 'feature-1797-webstore-v2'


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

  Changed paths:
    A .gitmodules
  M README.rst
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/api.py
  A ckan/controllers/datastore.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  R ckan/controllers/webstore.py
  M ckan/lib/helpers.py
  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
  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/_util.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/layout.html
  M ckan/tests/functional/api/test_activity.py
  A ckan/tests/functional/test_datastore.py
  R ckan/tests/functional/test_webstore.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/conf.py
  A doc/datastore.rst
  M doc/index.rst
  M doc/theming.rst
  R doc/webstore.rst
  M test-core.ini

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


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

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [xs][bugfix] no need to decode CKAN_CURRENT_URL


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

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [xs][bugfix] url encodings now fixed in I18nMiddleware


  Commit: 6a2577f88a93dd95499f60b770e2d1ae5926386b
      https://github.com/okfn/ckan/commit/6a2577f88a93dd95499f60b770e2d1ae5926386b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

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

  Log Message:
  -----------
  [xs] Mislabelled link says Publisher instead of Group


  Commit: 5bb1b181e553bfc96a064a8ecafd16cf71c839d1
      https://github.com/okfn/ckan/commit/5bb1b181e553bfc96a064a8ecafd16cf71c839d1
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

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

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


  Commit: 8c19d9588183d011910953b18c72e401c1e8e079
      https://github.com/okfn/ckan/commit/8c19d9588183d011910953b18c72e401c1e8e079
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [xs] make lang cookie a session one


  Commit: 0db27b134823c495a92356857b8d2e48d32ce423
      https://github.com/okfn/ckan/commit/0db27b134823c495a92356857b8d2e48d32ce423
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M ckan/logic/auth/publisher/create.py
  M ckanext/publisher_form/forms.py
  M ckanext/publisher_form/templates/publisher_form.html

  Log Message:
  -----------
  Add proper support for chosing a parent group and also for adding users to publishers


  Commit: 6ef3618e92452ea9c4946955a781280ff9ff8386
      https://github.com/okfn/ckan/commit/6ef3618e92452ea9c4946955a781280ff9ff8386
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M ckanext/publisher_form/forms.py
  M ckanext/publisher_form/templates/dataset_form.html

  Log Message:
  -----------
  [2211] Fixing publisher_dataset_form to show viable groups on the edit form


  Commit: 3c7c875e99f82bbb445453285b3a1975bd577c62
      https://github.com/okfn/ckan/commit/3c7c875e99f82bbb445453285b3a1975bd577c62
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1607][validators] Added a group validator that checks for existence of a group by id or name


  Commit: 1627d6cd4650c19574dbf0bca1fbcb4c012284a6
      https://github.com/okfn/ckan/commit/1627d6cd4650c19574dbf0bca1fbcb4c012284a6
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M ckanext/publisher_form/forms.py
  M ckanext/publisher_form/templates/dataset_form.html

  Log Message:
  -----------
  [2211] Added groups to schema so that it gets saved


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

  Changed paths:
    M ckan/config/routing.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/logic/action/create.py
  M ckan/logic/auth/create.py
  M ckan/new_authz.py
  M ckan/templates/_util.html
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckanext/publisher_form/forms.py

  Log Message:
  -----------
  [2211] Removed unnecessary (and non-working) auth reset which was intended to allow testing to switch auth funcs and..

- Implemented config option to allow for overriding of /group/* urls to use the named routes.
- Fixed some templates to use named group routes
- Added helper function to get the default group name.


  Commit: a6aca286ce0e65b46a6beed19a7c4cc977c3c623
      https://github.com/okfn/ckan/commit/a6aca286ce0e65b46a6beed19a7c4cc977c3c623
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [xs] tidy up: remove unnecessary code


  Commit: d2cb952ef0e6954cdc8024c791d17963bf7edce3
      https://github.com/okfn/ckan/commit/d2cb952ef0e6954cdc8024c791d17963bf7edce3
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/logic/auth/publisher/get.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js

  Log Message:
  -----------
  Merge branch 'feature-1607-dgu-maintentance-refactor' of ssh://github.com/okfn/ckan into feature-1607-dgu-maintentance-refactor


  Commit: e41ae7893653af888a1f2c8ca71bc8f14cde147b
      https://github.com/okfn/ckan/commit/e41ae7893653af888a1f2c8ca71bc8f14cde147b
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [logic]: Now when you print exceptions, the error message(s) show. This was hiding a problem with the DGU form api.


  Commit: c28df8d694f78a512ec311e4884edb3c1047d359
      https://github.com/okfn/ckan/commit/c28df8d694f78a512ec311e4884edb3c1047d359
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

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

  Log Message:
  -----------
  [#1711][helpers] Added function to parse rfc 2822 date strings


  Commit: 81e5fe717a070db41a2f3660e6ff499c053843e2
      https://github.com/okfn/ckan/commit/81e5fe717a070db41a2f3660e6ff499c053843e2
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

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

  Log Message:
  -----------
  [#1711] Integrate resource validation into application.js


  Commit: 234b746df285a474062d9d2453a6e2ff5499811b
      https://github.com/okfn/ckan/commit/234b746df285a474062d9d2453a6e2ff5499811b
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/css/forms.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge branch 'feature-1711-resource-validation' into feature-1607-dgu-maintentance-refactor


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

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/lib/helpers.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/templates/_util.html
  M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  [2211] First pass at logic functions for interacting with members


  Commit: 26513fa097b06bd482038623e08f4b1472ad4496
      https://github.com/okfn/ckan/commit/26513fa097b06bd482038623e08f4b1472ad4496
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/logic/__init__.py
  M ckan/logic/auth/publisher/get.py
  M ckan/model/group.py
  M ckan/public/css/forms.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/user/edit_user_form.html
  M ckan/tests/lib/test_helpers.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'feature-1607-dgu-maintentance-refactor' of https://github.com/okfn/ckan into feature-1607-dgu-maintentance-refactor


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

  Changed paths:
    M ckan/logic/schema.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  [1607] Fixing the schema so that tests work again


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

  Changed paths:
    M ckan/lib/create_test_data.py
  M ckan/logic/schema.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M test-core.ini

  Log Message:
  -----------
  [1607] Fixes to tests that were failing because of schema changes


  Commit: 0632a8b0756890c91ab69838f98f5bbe7fd3604e
      https://github.com/okfn/ckan/commit/0632a8b0756890c91ab69838f98f5bbe7fd3604e
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-08 (Thu, 08 Mar 2012)

  Changed paths:
    M ckan/tests/__init__.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [tests]: Fix assert_in and assert_not_in imports - they needs Python 2.7, so have a fallback for Python 2.5 and 2.6.


  Commit: d1ba07ffb1ed7d9d4e5f57a1f88e4298578ddb72
      https://github.com/okfn/ckan/commit/d1ba07ffb1ed7d9d4e5f57a1f88e4298578ddb72
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-08 (Thu, 08 Mar 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/authenticator.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/group.py
  M ckan/model/user.py
  M ckan/public/css/forms.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/facets.html
  M ckan/templates/package/edit.html
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_helpers.py
  M ckanext/publisher_form/forms.py
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'feature-1607-dgu-maintentance-refactor'

Conflicts:
	ckan/controllers/group.py
	ckan/controllers/package.py
	ckan/controllers/user.py
	ckan/lib/alphabet_paginate.py
	ckan/lib/create_test_data.py
	ckan/lib/dictization/model_dictize.py
	ckan/lib/dictization/model_save.py
	ckan/templates/package/edit.html
	ckan/tests/functional/test_group.py
	ckan/tests/lib/test_dictization.py

The source of much conflict was the moving of much code from the
controllers/{package, group}.py modules into lib/plugins.py.  It
turns out there wasn't too much to do there, but it required a
fair bit of checking.


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

  Changed paths:
    M ckan/lib/i18n.py
  M ckan/logic/validators.py

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


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

  Changed paths:
    M doc/authorization.rst
  M doc/configuration.rst
  A doc/publisher_auth_profile.rst

  Log Message:
  -----------
  Merge branch 'feature-1670-publisher-profile-docs'


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

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

  Log Message:
  -----------
  [2211] Logic layer functions for member and associated tests


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

  Changed paths:
    M README.rst

  Log Message:
  -----------
  [xs] Fixing minor flaw with RST that was affecting rendering on github


  Commit: 8de3723539d4cd06c8782f03346dd1b16106075e
      https://github.com/okfn/ckan/commit/8de3723539d4cd06c8782f03346dd1b16106075e
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M README.rst
  M doc/authorization.rst
  M doc/configuration.rst
  A doc/publisher_auth_profile.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


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

  Changed paths:
    M ckan/tests/functional/api/test_resource.py
  M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  [tests]: Small test fixes to keep pace with WUI updates.


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

  Changed paths:
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [nosetests]: Another fix.


  Commit: cd373300cc31a451b25f4b6c651c350c71431ff1
      https://github.com/okfn/ckan/commit/cd373300cc31a451b25f4b6c651c350c71431ff1
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckan/tests/functional/api/model/test_package.py

  Log Message:
  -----------
  [test]: I did not mean to commit this new test in the last commit.


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

  Changed paths:
    M README.rst
  M ckan/config/deployment.ini_tmpl
  M ckan/config/middleware.py
  M ckan/config/routing.py
  A ckan/controllers/datastore.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  R ckan/controllers/webstore.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/authenticator.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/group.py
  M ckan/model/user.py
  M ckan/public/css/forms.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/test_authz.py
  A ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_group.py
  R ckan/tests/functional/test_webstore.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_helpers.py
  M ckanext/publisher_form/forms.py
  M doc/authorization.rst
  M doc/conf.py
  M doc/configuration.rst
  A doc/datastore.rst
  M doc/index.rst
  A doc/publisher_auth_profile.rst
  R doc/webstore.rst
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  [merge conflicts]: DGU refactor touched a lot of frontend code. Hopefully this preserved it.


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

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/package.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/logic/action/get.py
  M ckan/public/css/style.css
  A ckan/public/images/chevron-down.png
  A ckan/public/images/chevron-up.png
  A ckan/public/images/icons/package_add.png
  A ckan/public/images/icons/page_white.png
  A ckan/public/images/icons/page_white_add.png
  A ckan/public/images/icons/page_white_code.png
  A ckan/public/images/icons/page_white_compressed.png
  A ckan/public/images/icons/page_white_cup.png
  A ckan/public/images/icons/page_white_database.png
  A ckan/public/images/icons/page_white_error.png
  A ckan/public/images/icons/page_white_excel.png
  A ckan/public/images/icons/page_white_gear.png
  A ckan/public/images/icons/page_white_link.png
  A ckan/public/images/icons/page_white_text.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/_util.html
  M ckan/templates/facets.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  A ckan/templates/package/editresources.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/api/test_resource.py
  M ckan/tests/functional/test_package.py
  M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  Merge branch 'feature-1506-ux-superticket'


  Commit: 2d469c8be720f955c2f569a4eaa464792a5fa7da
      https://github.com/okfn/ckan/commit/2d469c8be720f955c2f569a4eaa464792a5fa7da
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckan/tests/__init__.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch 'feature-1607-dgu-maintentance-refactor'


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

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

  Log Message:
  -----------
  [1506/merging][s]: Merge tidied & tested. Looks good to me.


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

  Changed paths:
    M ckan/tests/__init__.py
  M ckan/tests/lib/test_dictization.py

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


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

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

  Log Message:
  -----------
  [#1506,js,bugfix][xs]: remove minor piece of JS that is no longer needed due to @zephod's changes and is causing JS exception.

* @zephod accidentally merged this back in while doing his merge -- see 6ebb538d9e69e8f330ba67fdb00fd84c5bc723b6. In fact, this code was obsolete as form_errors got removed from resource edit page as part of zephod's refactor.


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

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

  Log Message:
  -----------
  [#1797,resource][s]: minor tweaks to layout of resource read (not related to #1797 really).


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

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

  Log Message:
  -----------
  [#1797,resource/view][s]: small tweaks to existing download button and new Data API button.


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

  Changed paths:
    R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
  A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [vendor/jquery][xs]: upgrade to v1.7.1 of jquery in preparation for using bootstrap.


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

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

  Log Message:
  -----------
  [#1797,#2223,css][m]: introduce full bootstrap v2.0.

* As far as I can tell most stuff still just works with some very minor tweaking (though I have put boostrap before blueprint)
* This is needed for use of bootstrap js for modals etc
* TODO: remove blueprint


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

  Changed paths:
    A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [vendor/bootstrap][s]: add bootstrap.js.


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

  Changed paths:
    M ckan/controllers/package.py
  M ckan/public/scripts/application.js
  A ckan/templates/_snippet/data-api-help.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1797,resource/view][m]: data API help in modal dialog on resource view page.


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

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

  Log Message:
  -----------
  [#1797,js][xs]: add visualization to resource type list and add placeholder to format field (not really part of #1797).


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

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

  Log Message:
  -----------
  [#1797,resource/edit][s]: checkbox for datastore enabled in resource form (uses webstore_url field).


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

  Changed paths:
    M ckan/controllers/datastore.py
  M ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  [#1797,datastore/api][s]: check whether datastore is enabled for a given resource (whether webstore_url is set) and if not return error json.


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

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  [#1797,doc/datastore][xs]: correct link for ckanext-datastorer.


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

  Changed paths:
    M ckan/controllers/datastore.py
  M ckan/controllers/package.py
  M ckan/public/css/bootstrap.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
  A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
  A ckan/templates/_snippet/data-api-help.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/test_datastore.py
  M doc/datastore.rst

  Log Message:
  -----------
  [#1797,merge][m]: Merge branch 'feature-1797-webstore-v2' thereby fixes #1797.


  Commit: 227326b063d221b54e137c1b9666c43dcd3d73e1
      https://github.com/okfn/ckan/commit/227326b063d221b54e137c1b9666c43dcd3d73e1
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M ckan/controllers/storage.py
  M ckan/tests/functional/test_storage.py

  Log Message:
  -----------
  [2211] Added a check to test_storage to create pairtree marker if necessary until we can replace it in ofs


  Commit: 4ff47f98bd0e6686da506e15ed6622ae5b0428d7
      https://github.com/okfn/ckan/commit/4ff47f98bd0e6686da506e15ed6622ae5b0428d7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M README.rst
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/datastore.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/authenticator.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/group.py
  M ckan/model/user.py
  M ckan/public/css/bootstrap.css
  M ckan/public/css/forms.css
  M ckan/public/css/style.css
  A ckan/public/images/chevron-down.png
  A ckan/public/images/chevron-up.png
  A ckan/public/images/icons/package_add.png
  A ckan/public/images/icons/page_white.png
  A ckan/public/images/icons/page_white_add.png
  A ckan/public/images/icons/page_white_code.png
  A ckan/public/images/icons/page_white_compressed.png
  A ckan/public/images/icons/page_white_cup.png
  A ckan/public/images/icons/page_white_database.png
  A ckan/public/images/icons/page_white_error.png
  A ckan/public/images/icons/page_white_excel.png
  A ckan/public/images/icons/page_white_gear.png
  A ckan/public/images/icons/page_white_link.png
  A ckan/public/images/icons/page_white_text.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
  A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
  A ckan/templates/_snippet/data-api-help.html
  M ckan/templates/_util.html
  M ckan/templates/facets.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  A ckan/templates/package/editresources.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/test_resource.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_helpers.py
  M ckanext/publisher_form/forms.py
  M ckanext/test_tag_vocab_plugin.py
  M doc/datastore.rst
  M setup.py
  M test-core.ini

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


  Commit: 83e0eddca6cdd8f84e0adb87335a9c18df93229b
      https://github.com/okfn/ckan/commit/83e0eddca6cdd8f84e0adb87335a9c18df93229b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/storage.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/helpers.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/publisher/create.py
  M ckan/new_authz.py
  M ckan/templates/_util.html
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_storage.py
  A ckan/tests/logic/test_member.py
  M ckanext/publisher_form/forms.py
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html

  Log Message:
  -----------
  [2211] Merge of feature-2211-publisher includes publisher form and dataset form for publisher


  Commit: 5862be2c750c0c357315b9bd09543d4fb1295d38
      https://github.com/okfn/ckan/commit/5862be2c750c0c357315b9bd09543d4fb1295d38
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-12 (Mon, 12 Mar 2012)

  Changed paths:
    A .gitmodules
  M README.rst
  M ckan/config/deployment.ini_tmpl
  M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  A ckan/controllers/datastore.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/controllers/user.py
  R ckan/controllers/webstore.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/authenticator.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/group.py
  M ckan/model/user.py
  M ckan/new_authz.py
  M ckan/public/css/bootstrap.css
  M ckan/public/css/forms.css
  M ckan/public/css/style.css
  A ckan/public/images/chevron-down.png
  A ckan/public/images/chevron-up.png
  A ckan/public/images/icons/package_add.png
  A ckan/public/images/icons/page_white.png
  A ckan/public/images/icons/page_white_add.png
  A ckan/public/images/icons/page_white_code.png
  A ckan/public/images/icons/page_white_compressed.png
  A ckan/public/images/icons/page_white_cup.png
  A ckan/public/images/icons/page_white_database.png
  A ckan/public/images/icons/page_white_error.png
  A ckan/public/images/icons/page_white_excel.png
  A ckan/public/images/icons/page_white_gear.png
  A ckan/public/images/icons/page_white_link.png
  A ckan/public/images/icons/page_white_text.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
  A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  A ckan/templates/_snippet/data-api-help.html
  M ckan/templates/_util.html
  M ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  A ckan/templates/package/editresources.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/layout.html
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/api/test_resource.py
  M ckan/tests/functional/test_authz.py
  A ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_storage.py
  R ckan/tests/functional/test_webstore.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_helpers.py
  A ckan/tests/logic/test_member.py
  M ckanext/publisher_form/forms.py
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  M 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/authorization.rst
  M doc/conf.py
  M doc/configuration.rst
  A doc/datastore.rst
  M doc/index.rst
  A doc/publisher_auth_profile.rst
  M doc/theming.rst
  R doc/webstore.rst
  M setup.py
  M test-core.ini

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


Compare: https://github.com/okfn/ckan/compare/9a67ac5...5862be2

• Previous message: [ckan-changes] [okfn/ckan] 227326: [2211] Added a check to test_storage to create pai...
• Next message: [ckan-changes] [okfn/ckan] 1ea3b5: [1742] fix route clashes by disallowing some names
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]