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

Mon Jun 18 13:51:59 UTC 2012

  Branch: refs/heads/feature-2375-demo-theme
  Home:   https://github.com/okfn/ckan
  Commit: e5e4b95e4c90cf6a0b00358fff9a4025cace3558
      https://github.com/okfn/ckan/commit/e5e4b95e4c90cf6a0b00358fff9a4025cace3558
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    A ckan/lib/maintain.py

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

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

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

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

  Commit: c0726d693725d86de0dd77f20a91ee187a3fd728
      https://github.com/okfn/ckan/commit/c0726d693725d86de0dd77f20a91ee187a3fd728
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    R Coding_Standards.rst
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/model/tag.py
    M ckan/templates/layout_base.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    A doc/coding-standards.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M pip-requirements-docs.txt
    M requires/lucid_present.txt

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

  Commit: f115bc1423f0f8634ba06d7413175f8068c69074
      https://github.com/okfn/ckan/commit/f115bc1423f0f8634ba06d7413175f8068c69074
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py
    M doc/test.rst

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

  Commit: c20698a0cb480e6d1545a3b93cbb67bc94c7553d
      https://github.com/okfn/ckan/commit/c20698a0cb480e6d1545a3b93cbb67bc94c7553d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Failing test for 2293

Uses the WUI to edit and add a package to a group, then it renames the
group before checking how many datasets it has.  The call via sqlalchemy
shows it has the correct number of datasets, but the index page shows the
wrong number as we've changed the name without re-indexing the datasets

  Commit: dbe25d8b8d7fabfc40c5d794a920b91cec349335
      https://github.com/okfn/ckan/commit/dbe25d8b8d7fabfc40c5d794a920b91cec349335
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-14 (Thu, 14 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Updated edit in controller to reindex packages when name changed

  Commit: 14a8a59646f18335447f2171e49b2ef35cabfb1f
      https://github.com/okfn/ckan/commit/14a8a59646f18335447f2171e49b2ef35cabfb1f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckan/i18n/check_po_files.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckanext/organizations/templates/organization_read.html
    M doc/coding-standards.rst
    M doc/configuration.rst
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M pip-requirements-docs.txt
    M requires/lucid_missing.txt
    M setup.py
    M test-core.ini

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

  Commit: 0d814c52ba3806e82dde6c2b7ad14d7c5a259cb1
      https://github.com/okfn/ckan/commit/0d814c52ba3806e82dde6c2b7ad14d7c5a259cb1
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckan/i18n/check_po_files.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckanext/organizations/templates/organization_read.html
    M doc/coding-standards.rst
    M doc/configuration.rst
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M pip-requirements-docs.txt
    M requires/lucid_missing.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into defect-2293-group-rename-problem

  Commit: 4a7f4806bd22c897d29235f31880caa8809c8633
      https://github.com/okfn/ckan/commit/4a7f4806bd22c897d29235f31880caa8809c8633
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Fix for resetting the test before continuing

  Commit: f050a8498d5f50e2c51f7a0bf92b5d3e8c1570e4
      https://github.com/okfn/ckan/commit/f050a8498d5f50e2c51f7a0bf92b5d3e8c1570e4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Relax the CKAN commit guidelines

No need to repeat a lot of stuff from the Pro Git Book about whitespace
and line lengths. Also make it clear that not every commit has to
reference a trac ticket.

  Commit: ea92af3321647dd1ee56c3751db41964a8e8476f
      https://github.com/okfn/ckan/commit/ea92af3321647dd1ee56c3751db41964a8e8476f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  PEP8 cleanup

  Commit: e6a82ed0a7e2f411ea72ad90384b1e153fc96838
      https://github.com/okfn/ckan/commit/e6a82ed0a7e2f411ea72ad90384b1e153fc96838
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  PEP8 cleanup and removing "

  Commit: ef3200e4898cfca322cdea34b387b354078455ba
      https://github.com/okfn/ckan/commit/ef3200e4898cfca322cdea34b387b354078455ba
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Removing "

  Commit: cdd5f2acd0969e74e1343599edac1e843f2bada4
      https://github.com/okfn/ckan/commit/cdd5f2acd0969e74e1343599edac1e843f2bada4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Changed direct access to logic func to a call to get_action

  Commit: 4522f63da3db10035462b75829dd02b27722953e
      https://github.com/okfn/ckan/commit/4522f63da3db10035462b75829dd02b27722953e
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M doc/install-from-package.rst

  Log Message:
  -----------
  [#2505] Fixes to the package install upgrade process

  Commit: 4e580e9cb98e2aa3e6f6906e03ee295b7a4b5917
      https://github.com/okfn/ckan/commit/4e580e9cb98e2aa3e6f6906e03ee295b7a4b5917
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M doc/install-from-package.rst

  Log Message:
  -----------
  Merge branch '2505-docs-improvements-for-1.7.1'

  Commit: fb6a10d01c997d086485ce31b62f753ed302cfa6
      https://github.com/okfn/ckan/commit/fb6a10d01c997d086485ce31b62f753ed302cfa6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M doc/coding-standards.rst
    M doc/install-from-package.rst

  Log Message:
  -----------
  Merge branch 'master' into defect-2293-group-rename-problem

  Commit: e56b39a2f209743ef34093f8e28ceefe6d4e1186
      https://github.com/okfn/ckan/commit/e56b39a2f209743ef34093f8e28ceefe6d4e1186
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-18 (Mon, 18 Jun 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/tests/functional/test_group.py
    M doc/coding-standards.rst
    M doc/install-from-package.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-2375-demo-theme

Compare: https://github.com/okfn/ckan/compare/f7527c30544a...e56b39a2f209