[ckan-changes] [okfn/ckan] a205cd: Merge branch 'master' into feature-1797-webstore-v...

• Previous message: [ckan-changes] [okfn/ckan] 328f8c: Merge branch 'master' into enhancement-1792-api-lo...
• Next message: [ckan-changes] [okfn/ckan] 730c0a: Merge pull request #4 from zydio/defect-1788-ie7-c...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/feature-1506-ux-superticket
  Home:   https://github.com/okfn/ckan
  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: 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: 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.


Compare: https://github.com/okfn/ckan/compare/a41cd0c...215a5d7

• Previous message: [ckan-changes] [okfn/ckan] 328f8c: Merge branch 'master' into enhancement-1792-api-lo...
• Next message: [ckan-changes] [okfn/ckan] 730c0a: Merge pull request #4 from zydio/defect-1788-ie7-c...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]