[ckan-changes] [okfn/ckan] 339479: Fanstatic fixes for resource upload

Fri Sep 28 08:45:53 UTC 2012

  Branch: refs/heads/dataviewer-iframe
  Home:   https://github.com/okfn/ckan
  Commit: 339479089e15cb451f8d1431fc1f31e9b90b35b6
      https://github.com/okfn/ckan/commit/339479089e15cb451f8d1431fc1f31e9b90b35b6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/vendor/resource.config
    M ckan/templates/package/new_resource.html

  Log Message:
  -----------
  Fanstatic fixes for resource upload

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

  Changed paths:
    M ckan/templates/package/resource_read.html
    R ckan/templates/snippets/recline-extra-footer.html
    R ckan/templates/snippets/recline-extra-header.html

  Log Message:
  -----------
  Fanstatic fixes remove commented out scripts

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

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  Fanstatic fixes add extra comment re script tag abuse

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

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  Fanstatic fixes fix case in comment

  Commit: 122cf345101e25ac660b724788d40a27b1c02ced
      https://github.com/okfn/ckan/commit/122cf345101e25ac660b724788d40a27b1c02ced
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/templates_legacy/snippets/internal-tracking.html

  Log Message:
  -----------
  Fix html for internal tracking

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

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

  Log Message:
  -----------
  Added some small CSS helper classes for layout

  Commit: 95e76829864724a5227aeba75edf717891c7e6a2
      https://github.com/okfn/ckan/commit/95e76829864724a5227aeba75edf717891c7e6a2
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/templates/admin/authz.html
    M ckan/templates/admin/index.html
    A ckan/templates/admin/snippets/header.html

  Log Message:
  -----------
  Added tabs into the /ckan-admin header (also small tweaks to thecss of the page

  Commit: 568dafb851d83f1cff804960a30c30553f59fd13
      https://github.com/okfn/ckan/commit/568dafb851d83f1cff804960a30c30553f59fd13
  Author: John Martin <me at johnmart.in>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/templates/admin/config.html
    M ckan/templates/admin/snippets/header.html

  Log Message:
  -----------
  Added config tab to ckan-admin page

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

  Changed paths:
    M ckan/templates/admin/authz.html

  Log Message:
  -----------
  Minor formatting

  Commit: a087cf88114c733264c228936ffc8268b2cc9fb7
      https://github.com/okfn/ckan/commit/a087cf88114c733264c228936ffc8268b2cc9fb7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/forms.less
    M ckan/templates/admin/authz.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    A ckan/templates/admin/snippets/header.html

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

  Commit: e38468ef655c0edf07700cecedffc65e6e1d6064
      https://github.com/okfn/ckan/commit/e38468ef655c0edf07700cecedffc65e6e1d6064
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  format paster command

  Commit: 6ea18bb3d6a6dfa76d91fe665457f0c431b6e940
      https://github.com/okfn/ckan/commit/6ea18bb3d6a6dfa76d91fe665457f0c431b6e940
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  enable datastore to run without ckan

  Commit: 295410fa9afc3a2f802b9566be9aa83c233c8a48
      https://github.com/okfn/ckan/commit/295410fa9afc3a2f802b9566be9aa83c233c8a48
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  Fix problems with % in column names and table names.

  Commit: a61c497c0484b47f7d205d0cbbfb811b2eb99c98
      https://github.com/okfn/ckan/commit/a61c497c0484b47f7d205d0cbbfb811b2eb99c98
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  test % in records

  Commit: 4b252aba55ac9bea2232d8f36b2094b53b7ad334
      https://github.com/okfn/ckan/commit/4b252aba55ac9bea2232d8f36b2094b53b7ad334
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  from .. import .. -> import .. as ..

  Commit: 94c27f9352e1de450e9249ddde18e457da7b1828
      https://github.com/okfn/ckan/commit/94c27f9352e1de450e9249ddde18e457da7b1828
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  Fix index creation on nested fields in postgres 9.2.

  Commit: a586adf856c947a96fdadfe225270d82e3bc0d3d
      https://github.com/okfn/ckan/commit/a586adf856c947a96fdadfe225270d82e3bc0d3d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datastore/commands.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M doc/datastore.rst

  Log Message:
  -----------
  renamed datastore urls and removed ckan.datastore.enabled = 1

  Commit: e97b5c70e9325a1095778fef8e0d27c84e881b30
      https://github.com/okfn/ckan/commit/e97b5c70e9325a1095778fef8e0d27c84e881b30
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2937] Add extras_as_string to group history()

  Commit: bc389d35ecd741cb880486301e1e64124935f5aa
      https://github.com/okfn/ckan/commit/bc389d35ecd741cb880486301e1e64124935f5aa
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  Updated documentation on query languages

  Commit: 21bb46eced223692f4159e0ffe052f3697045e0a
      https://github.com/okfn/ckan/commit/21bb46eced223692f4159e0ffe052f3697045e0a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Log Message:
  -----------
  Merge branch '2733-feature-datastore' of github.com:okfn/ckan into 2733-feature-datastore

  Commit: f842804e814b817977b18070a05791e0b7ed6bc1
      https://github.com/okfn/ckan/commit/f842804e814b817977b18070a05791e0b7ed6bc1
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  Set the password for the read only user

  Commit: aafed9c7d078aed3a04bbb06071e81084de48be9
      https://github.com/okfn/ckan/commit/aafed9c7d078aed3a04bbb06071e81084de48be9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  enable create user without password (empty = none)

  Commit: cad3ec089e73db162728c6498fe5536e7e9d2019
      https://github.com/okfn/ckan/commit/cad3ec089e73db162728c6498fe5536e7e9d2019
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  Change quoting and use more descriptive names

  Commit: ab6e970475b39a9eef88dc3031cc822c391973c4
      https://github.com/okfn/ckan/commit/ab6e970475b39a9eef88dc3031cc822c391973c4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  Check passwords for '

  Commit: ca014d3fed7fa5bae15bd14bd7b4331cd3f6ae3b
      https://github.com/okfn/ckan/commit/ca014d3fed7fa5bae15bd14bd7b4331cd3f6ae3b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  pipe sql into psql instead of passing it as parameter, refactor parsing of database urls

  Commit: ef98309e86301f5875ab4da940927f0490c4e525
      https://github.com/okfn/ckan/commit/ef98309e86301f5875ab4da940927f0490c4e525
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  made pluck function more readable

  Commit: a1d07930c3d5e3c139e10541902558cee9c66c11
      https://github.com/okfn/ckan/commit/a1d07930c3d5e3c139e10541902558cee9c66c11
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  updated documentation on datastore

  Commit: 3748cacc7e609c15049da1f1505bd9bbf3bf9d7d
      https://github.com/okfn/ckan/commit/3748cacc7e609c15049da1f1505bd9bbf3bf9d7d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M doc/using-data-api.rst

  Log Message:
  -----------
  started updating docs on using the data api

  Commit: 069cbc0425011a500d8263784ccb04e20cea998f
      https://github.com/okfn/ckan/commit/069cbc0425011a500d8263784ccb04e20cea998f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  fix paster command docs

  Commit: 040e25095552323d8a6acef35e9a43a28c15b3ef
      https://github.com/okfn/ckan/commit/040e25095552323d8a6acef35e9a43a28c15b3ef
  Author: amercader <amercadero at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M doc/apiv3.rst

  Log Message:
  -----------
  Remove warning about action api

  Commit: 82cd9f08a5c233f4f214c0bd03bf678bb87bdad9
      https://github.com/okfn/ckan/commit/82cd9f08a5c233f4f214c0bd03bf678bb87bdad9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  allow database names with -

  Commit: 52e21aaf7c7bea199c648a451b4499c8feb50f9c
      https://github.com/okfn/ckan/commit/52e21aaf7c7bea199c648a451b4499c8feb50f9c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Fix an actual bug that prevented aliases from getting deleted when alias: [] has been provided

  Commit: b09de16bade5f5be7eb73318800d5180972f216c
      https://github.com/okfn/ckan/commit/b09de16bade5f5be7eb73318800d5180972f216c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  Fix tests in DatastoreCreate to run on separate dbs

  Commit: 4a2e6c7eaa340370deac8991ff9e08d96fa8febe
      https://github.com/okfn/ckan/commit/4a2e6c7eaa340370deac8991ff9e08d96fa8febe
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Timeout for upsert

  Commit: a414ac0954041dae844dae7433b39579e216dfbb
      https://github.com/okfn/ckan/commit/a414ac0954041dae844dae7433b39579e216dfbb
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Transaction rollback in create

  Commit: c3eb3597ec324cfd1756d5b5708e79c1bf895b5c
      https://github.com/okfn/ckan/commit/c3eb3597ec324cfd1756d5b5708e79c1bf895b5c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckanext/datastore/tests/test_datastore.py

  Log Message:
  -----------
  Make all tests passing in setup with one or with two separate dbs.

  Commit: 075d65c4a3620bbffce1705ad1caca6f4983c983
      https://github.com/okfn/ckan/commit/075d65c4a3620bbffce1705ad1caca6f4983c983
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M doc/using-data-api.rst

  Log Message:
  -----------
  Updated, extended and unified documentation of api usage

  Commit: a88d042162132ee5499233654eeeee06c7855148
      https://github.com/okfn/ckan/commit/a88d042162132ee5499233654eeeee06c7855148
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Make limit and offset integers

  Commit: ad4edd6c3f762f937a357e216c1558887426ad04
      https://github.com/okfn/ckan/commit/ad4edd6c3f762f937a357e216c1558887426ad04
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/vendor/resource.config
    M ckan/templates/base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_read.html
    R ckan/templates/snippets/recline-extra-footer.html
    R ckan/templates/snippets/recline-extra-header.html

  Log Message:
  -----------
  Merge branch 'fanstatic-fixes'

  Commit: f307a359b7e3fdf6e6921c753717164ca0868b83
      https://github.com/okfn/ckan/commit/f307a359b7e3fdf6e6921c753717164ca0868b83
  Author: amercader <amercadero at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/cli.py
    A ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
    A ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_datastore.py
    M doc/datastore.rst
    M doc/using-data-api.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '2733-feature-datastore'

Conflicts:
	setup.py

  Commit: 0e9ff2d7b1b29f48382e71b35e1af8792f0b1267
      https://github.com/okfn/ckan/commit/0e9ff2d7b1b29f48382e71b35e1af8792f0b1267
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckan/tests/wsgi_ckanclient.py

  Log Message:
  -----------
  Fix broken print statements in wsgi_ckanclient.py

These were causing some tests to fail for me. I don't understand why
they aren't failing for anyone else, or for me in the past, but this fix
seems harmless.

  Commit: a50f9998da0534d1458db16f9d5140d396ea2750
      https://github.com/okfn/ckan/commit/a50f9998da0534d1458db16f9d5140d396ea2750
  Author: amercader <amercadero at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/cli.py
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/authz.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    A ckan/templates/admin/snippets/header.html
    M ckan/templates/base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_read.html
    R ckan/templates/snippets/recline-extra-footer.html
    R ckan/templates/snippets/recline-extra-header.html
    M ckan/templates_legacy/snippets/internal-tracking.html
    M ckan/tests/wsgi_ckanclient.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py
    M doc/apiv3.rst
    M doc/datastore.rst
    M doc/using-data-api.rst

  Log Message:
  -----------
  Merge branch 'master' into dataviewer-iframe

Conflicts:
	ckan/public/base/javascript/resource.config
	ckan/templates/package/resource_read.html

Compare: https://github.com/okfn/ckan/compare/0aa35ea77471...a50f9998da05