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

• Previous message: [ckan-changes] [okfn/ckan] e5e4b9: Merge branch 'master' of https://github.com/okfn/c...
• Next message: [ckan-changes] [okfn/ckan] e5e4b9: Merge branch 'master' of https://github.com/okfn/c...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/feature-2484-followers-as-helper
  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: ea7379a36d8af7b74e03f416de66f74bc4f0bc84
      https://github.com/okfn/ckan/commit/ea7379a36d8af7b74e03f416de66f74bc4f0bc84
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M requires/lucid_missing.txt

  Log Message:
  -----------
  [#2451] remove-flup


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

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Fix context dicts in user controller


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

  Changed paths:
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Make output of multilingual tests less verbose


  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: 118da5343e405a56519f790e3c86f26bb71d8fe8
      https://github.com/okfn/ckan/commit/118da5343e405a56519f790e3c86f26bb71d8fe8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  Make the testing docs clearer


  Commit: 1e8a35a7a3017667587e3bef267d207ef62e0681
      https://github.com/okfn/ckan/commit/1e8a35a7a3017667587e3bef267d207ef62e0681
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#2497] when we have a 401 and not logged in keep locale


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

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Revert "[#2497] when we have a 401 and not logged in keep locale"

not the correct place

This reverts commit 1e8a35a7a3017667587e3bef267d207ef62e0681.


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

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] use url_for to get correct login url


  Commit: 05fc10cc3d0f0df5741b9c1e83344f706ce9a9be
      https://github.com/okfn/ckan/commit/05fc10cc3d0f0df5741b9c1e83344f706ce9a9be
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] remove unused imports


  Commit: 288c2fdd980299cdc1f0952154c34c885be08a58
      https://github.com/okfn/ckan/commit/288c2fdd980299cdc1f0952154c34c885be08a58
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] clean whitespace


  Commit: 1f2b6e5f950c8b6fd0e1a2eb814cedce72aac9a0
      https://github.com/okfn/ckan/commit/1f2b6e5f950c8b6fd0e1a2eb814cedce72aac9a0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] making logging clearer code


  Commit: 04d6a0707edbd9bdc22bb126aaf6e552c654f4f3
      https://github.com/okfn/ckan/commit/04d6a0707edbd9bdc22bb126aaf6e552c654f4f3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] more making logging clearer code


  Commit: 2a8a70879e512d7a1b34d39ce08ace6c145a94d6
      https://github.com/okfn/ckan/commit/2a8a70879e512d7a1b34d39ce08ace6c145a94d6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  [#2497] improve copde readability


  Commit: 403aaf9d90be07dde89a0d9e64c7bb39009b79c9
      https://github.com/okfn/ckan/commit/403aaf9d90be07dde89a0d9e64c7bb39009b79c9
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  Merge branch '2497-lose-language-on-abort'


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

  Changed paths:
    M ckan/lib/repoze_patch.py

  Log Message:
  -----------
  fix logout issue


  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: d1f6b733c335e37d668f4a8fc633f7074dd1c222
      https://github.com/okfn/ckan/commit/d1f6b733c335e37d668f4a8fc633f7074dd1c222
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst

  Log Message:
  -----------
  [#2505] Intro docs for harvesting and geospatial


  Commit: e221a16c3706ab4c57f0bf45cad5dbabb91a6942
      https://github.com/okfn/ckan/commit/e221a16c3706ab4c57f0bf45cad5dbabb91a6942
  Author: John Glover <j at johnglover.net>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckanext/organizations/templates/organization_read.html

  Log Message:
  -----------
  [2509] copy changes from group read page to organization read


  Commit: 1271faf4711f9f6d5c7718dce55c2506463a926d
      https://github.com/okfn/ckan/commit/1271faf4711f9f6d5c7718dce55c2506463a926d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    A ckan/i18n/check_po_files.py

  Log Message:
  -----------
  Add a script for checking for errors in po files


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

  Changed paths:
    M ckan/lib/repoze_patch.py

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


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

  Changed paths:
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst

  Log Message:
  -----------
  [#2505] Update package install instructions

Moved VirtualBox and Amamzon EC2 to separate pages, updated introduction
and Upgrading instructions, depending on if upgrading from a major or a
minor release.


  Commit: 438e7ebc3cba9646a313284cc2e924dc9aa32776
      https://github.com/okfn/ckan/commit/438e7ebc3cba9646a313284cc2e924dc9aa32776
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M ckan/i18n/check_po_files.py
    M setup.py

  Log Message:
  -----------
  Make check-po-files script into paster command


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

  Changed paths:
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#2505] Update source install instructions

Following feedbak from markw (see #2406).


  Commit: 2a5714bdc33bf6be89265afc7642363266363cc3
      https://github.com/okfn/ckan/commit/2a5714bdc33bf6be89265afc7642363266363cc3
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

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

  Log Message:
  -----------
  [2507] Resize the search input to fill horizontal width

This solution uses JavaScript to resize the form input to fill the
horizontal width regardless of the size of the submit button. The
input is set to a smaller width by default so that the input and button
will fit on one line by default.


  Commit: 667e665f9928922cd27de6eda872267d96172709
      https://github.com/okfn/ckan/commit/667e665f9928922cd27de6eda872267d96172709
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

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

  Log Message:
  -----------
  Merge branch 'feature-2507-fix-search-input'


  Commit: 40c6e138c398525730cf0694facf57378f9f2b3f
      https://github.com/okfn/ckan/commit/40c6e138c398525730cf0694facf57378f9f2b3f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M doc/geospatial.rst

  Log Message:
  -----------
  [#2505] Minor edits to geospatial docs


  Commit: 041a3d44a67cf984ca0569b53c7ff81215aa8275
      https://github.com/okfn/ckan/commit/041a3d44a67cf984ca0569b53c7ff81215aa8275
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M doc/harvesting.rst

  Log Message:
  -----------
  [#2505] Minor edits to harvesting docs


  Commit: 466e898456155737041a46cf3e43987c5370d3ce
      https://github.com/okfn/ckan/commit/466e898456155737041a46cf3e43987c5370d3ce
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

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

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


  Commit: 3f4a125af2a8f83e72e441f39615bbf1ee3ed57c
      https://github.com/okfn/ckan/commit/3f4a125af2a8f83e72e441f39615bbf1ee3ed57c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M doc/coding-standards.rst

  Log Message:
  -----------
  Change CKAN commit guidelines

Since it doesn't look like we're going to use davglas' github-trac
plugin, revert to our old [#123] style ticket numbers in commit messages


  Commit: 82561f64eae325857be9a6fd796acb0c6439be8a
      https://github.com/okfn/ckan/commit/82561f64eae325857be9a6fd796acb0c6439be8a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M pip-requirements-docs.txt

  Log Message:
  -----------
  Revert "[#2434] Add PasteDeploy to pip-requirements-docs"

This reverts commit 97c377140a560129c79a344659c5668b7810866a.

Didn't work


  Commit: d32b117261d9beb92a889751352b008cc13be3e4
      https://github.com/okfn/ckan/commit/d32b117261d9beb92a889751352b008cc13be3e4
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M ckanext/organizations/templates/organization_read.html

  Log Message:
  -----------
  Merge branch 'defect-2509-organization-read'


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#2521] Add synchronous_search plugin to deployment.ini template

Replace build_search_index_synchronously option


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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#2521] Remove build_search_index_synchronously from docs


  Commit: 659123fcec0081272a88629e8f80b38e34b4ecdd
      https://github.com/okfn/ckan/commit/659123fcec0081272a88629e8f80b38e34b4ecdd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [#2521] Remove build_search_index_synchronously from test-core.ini


  Commit: 39943a739ffd7e0eedea4bce5cedb5e79bfa722c
      https://github.com/okfn/ckan/commit/39943a739ffd7e0eedea4bce5cedb5e79bfa722c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'feature-2451-remove-flup'


  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: d5a71cb6aa75b460d969ba3f0bb69334ade8534e
      https://github.com/okfn/ckan/commit/d5a71cb6aa75b460d969ba3f0bb69334ade8534e
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  genshi hack to allow properties in templates


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

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  example usage of a property


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

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  Revert "example usage of a property"

This reverts commit 9d38187aed90e10218fc086e6a72461234e23958.


  Commit: 2542cb3e9db16e595266e806dd85b30ca59c0126
      https://github.com/okfn/ckan/commit/2542cb3e9db16e595266e806dd85b30ca59c0126
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  add copyright notice for genshi code hack


  Commit: d37619608be4898b6aadd37120ce8f7913b76780
      https://github.com/okfn/ckan/commit/d37619608be4898b6aadd37120ce8f7913b76780
  Author: kindly <kindly at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [2571] append only resource create


  Commit: 876ea6535878eba79d3203beda9eac25d8c5fa60
      https://github.com/okfn/ckan/commit/876ea6535878eba79d3203beda9eac25d8c5fa60
  Author: kindly <kindly at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py

  Log Message:
  -----------
  [2571] add basic user auth checks to resource create


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

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  [xs] Update CHANGELOG for 1.7.1 release


  Commit: 94c648a83d1328b4050ad9e0b8e6e16f9dabc2fa
      https://github.com/okfn/ckan/commit/94c648a83d1328b4050ad9e0b8e6e16f9dabc2fa
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-2571-add-resource-create


  Commit: 2bf1d3d0f2fd2851433049c6d270468140f1f416
      https://github.com/okfn/ckan/commit/2bf1d3d0f2fd2851433049c6d270468140f1f416
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'feature-2571-add-resource-create'

merge bracnch 2571 resource_create action implemented


  Commit: 6d3b56b42c67f6837b346df41bc405ad2728c5f8
      https://github.com/okfn/ckan/commit/6d3b56b42c67f6837b346df41bc405ad2728c5f8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  Helpful SOLR hint.


  Commit: ebd836504ff2e323eb93de4dd89a3c579e724c1a
      https://github.com/okfn/ckan/commit/ebd836504ff2e323eb93de4dd89a3c579e724c1a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/lib/create_test_data.py

  Log Message:
  -----------
  Fix minor bug that caused create_users to not commit changes.


  Commit: 0ed19599772213631c627614383fe6d1d9dea2fa
      https://github.com/okfn/ckan/commit/0ed19599772213631c627614383fe6d1d9dea2fa
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/search/__init__.py

  Log Message:
  -----------
  Improve logging in useful places.


  Commit: 84d674dac775f93f50b35436c38b6d0c5d0dc2fd
      https://github.com/okfn/ckan/commit/84d674dac775f93f50b35436c38b6d0c5d0dc2fd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/lib/create_test_data.py

  Log Message:
  -----------
  Comment required, else Toby would just delete the method out of hand.


  Commit: 496ee0504907ed1f60d45cbcdfec927303adbdb7
      https://github.com/okfn/ckan/commit/496ee0504907ed1f60d45cbcdfec927303adbdb7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2484] Improve docstrings of follow helper functions


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

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    A ckan/i18n/check_po_files.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    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 doc/test.rst
    M pip-requirements-docs.txt
    M requires/lucid_missing.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2484-followers-as-helper


Compare: https://github.com/okfn/ckan/compare/7a032998ed05...b9d5051e0f07

• Previous message: [ckan-changes] [okfn/ckan] e5e4b9: Merge branch 'master' of https://github.com/okfn/c...
• Next message: [ckan-changes] [okfn/ckan] e5e4b9: Merge branch 'master' of https://github.com/okfn/c...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]