[ckan-changes] [okfn/ckan] 81078a: [ux, resource-view] put main heading back above

noreply at github.com noreply at github.com
Fri Dec 2 10:34:21 UTC 2011


  Branch: refs/heads/defect-1430-mixed-docs-in-search-index
  Home:   https://github.com/okfn/ckan

  Commit: 81078af9b127597b16943b59877a823e68a73a88
      https://github.com/okfn/ckan/commit/81078af9b127597b16943b59877a823e68a73a88
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

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

  Log Message:
  -----------
  [ux, resource-view] put main heading back above 
minor navigation (use page_heading function).
Move resource actions below div.


  Commit: ba43efd0137e1f550551033ed7ad7a4d6d7f17e3
      https://github.com/okfn/ckan/commit/ba43efd0137e1f550551033ed7ad7a4d6d7f17e3
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

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

  Log Message:
  -----------
  [ux, resource-view] move last modified up to resource-main-info section


  Commit: 7cf65e6fe8261e3b01ca734df4f054c4d91224cf
      https://github.com/okfn/ckan/commit/7cf65e6fe8261e3b01ca734df4f054c4d91224cf
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [ux, resource-view] use full screen width on resource
view page (no sidebar)


  Commit: 5eb304c4aa0e821b3860af3ba5341e4440c4200b
      https://github.com/okfn/ckan/commit/5eb304c4aa0e821b3860af3ba5341e4440c4200b
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/css/style.css
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [ux, resource-view] move description to top,
show dataset description if no resource description
available


  Commit: ef66beaaf68b550d18e06c6f8ab48585ec59afb6
      https://github.com/okfn/ckan/commit/ef66beaaf68b550d18e06c6f8ab48585ec59afb6
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

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

  Log Message:
  -----------
  [ux, resource-view] add section for data explorer


  Commit: 7e3365aa3af03587a95881c0968c84c72ac9f158
      https://github.com/okfn/ckan/commit/7e3365aa3af03587a95881c0968c84c72ac9f158
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

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

  Log Message:
  -----------
  [ux, resource-view] add basic 'get' actions


  Commit: 2dcb668cf4d024dcb5c74223f937e961d1d14c9f
      https://github.com/okfn/ckan/commit/2dcb668cf4d024dcb5c74223f937e961d1d14c9f
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

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

  Log Message:
  -----------
  [ux, resource-view] hide explore section for now


  Commit: a3b4c059061322648c69c7bdc18c25fe4e38a514
      https://github.com/okfn/ckan/commit/a3b4c059061322648c69c7bdc18c25fe4e38a514
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M pip-requirements.txt

  Log Message:
  -----------
  [pip-requirements]: Updated to use github instead of bitbucket.


  Commit: ad29e3ea75a3d0f19f4b9051ffc1b4ddb8f14376
      https://github.com/okfn/ckan/commit/ad29e3ea75a3d0f19f4b9051ffc1b4ddb8f14376
  Author: amercader <amercadero at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/user.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [users] Fix and tests #1470


  Commit: 6744cc9ccded48c7b51072a451998a6587f407f4
      https://github.com/okfn/ckan/commit/6744cc9ccded48c7b51072a451998a6587f407f4
  Author: amercader <amercadero at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into defect-1470-user-name


  Commit: 322cafd8be7f9055ad61761a6374cd96a8ca9a60
      https://github.com/okfn/ckan/commit/322cafd8be7f9055ad61761a6374cd96a8ca9a60
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

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

  Log Message:
  -----------
  [ux, dataset-view] change resource list from
table to something more like search results


  Commit: ed81036a457e5d118086304c8359ffcf471f57d7
      https://github.com/okfn/ckan/commit/ed81036a457e5d118086304c8359ffcf471f57d7
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M ckan/model/package.py
  M ckan/model/types.py

  Log Message:
  -----------
  [model]: Fix tests on sqlite for datetime field, broken when sqlalchemy changed to 0.7.


  Commit: 1ce93021dcfe9843630cf2fc78f73773c174c7f5
      https://github.com/okfn/ckan/commit/1ce93021dcfe9843630cf2fc78f73773c174c7f5
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/ckan.pot
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.po
  M pip-requirements.txt

  Log Message:
  -----------
  [i18n]: Updated the latest strings from Transifex.


  Commit: 03ea24f69a2c0253b3293e63b941b6525e2779a0
      https://github.com/okfn/ckan/commit/03ea24f69a2c0253b3293e63b941b6525e2779a0
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/tests/functional/test_tag.py
  M ckan/tests/lib/test_tag_search.py

  Log Message:
  -----------
  [tag search] Removed the case-lowering of tag search terms.

Otherwise, tag names with capital letters won't be picked up in the tag
search or tag autocomplete.


  Commit: 041e7e147e974ba945dd1db3264fbac09d717f74
      https://github.com/okfn/ckan/commit/041e7e147e974ba945dd1db3264fbac09d717f74
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/tests/models/test_package.py

  Log Message:
  -----------
  [models/test_package] Fixed up a test that broke with the earlier fixture changes.


  Commit: 07cab2225753ad2308d60ffe4f3830b55ee0bd94
      https://github.com/okfn/ckan/commit/07cab2225753ad2308d60ffe4f3830b55ee0bd94
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/__init__.py
  M pip-requirements.txt

  Log Message:
  -----------
  [release]: updating version number for master.


  Commit: fd0a237904b71d64df19948d752c367d621cf322
      https://github.com/okfn/ckan/commit/fd0a237904b71d64df19948d752c367d621cf322
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [i18n]: Have not added sr at latin on this branch so took out of config.


  Commit: d747010ab844c22bf24b35b41cb731f8ce95caac
      https://github.com/okfn/ckan/commit/d747010ab844c22bf24b35b41cb731f8ce95caac
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  A ckan/i18n/sr at latin/LC_MESSAGES/ckan.mo
  A ckan/i18n/sr at latin/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  [i18n]: Added sr at latin.


  Commit: e5636f729cfe36c184d7a856e33d087609a16732
      https://github.com/okfn/ckan/commit/e5636f729cfe36c184d7a856e33d087609a16732
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M .tx/config
  M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  R ckan/i18n/sr at latin/LC_MESSAGES/ckan.mo
  R ckan/i18n/sr at latin/LC_MESSAGES/ckan.po
  A ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  A ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  [i18n]: Got sr at Latin working.


  Commit: 8e92689d8fa9160937b5c51cc61d7c372f29ad02
      https://github.com/okfn/ckan/commit/8e92689d8fa9160937b5c51cc61d7c372f29ad02
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [i18n]: One more sr at Latin change.


  Commit: aa16cb743e9174aab8417534dd676025fbdc6410
      https://github.com/okfn/ckan/commit/aa16cb743e9174aab8417534dd676025fbdc6410
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/lib/create_test_data.py
  M ckan/logic/validators.py
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_tag.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/api/test_misc.py
  M ckan/tests/functional/api/test_package_search.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_tag.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_tag_search.py

  Log Message:
  -----------
  [tagname validator] Re-strengthened definition of valid tag names.

 - Removed almost all punctuation as valid.  Now only hyphens, underscores and fullstops are the valid punctuation characters
 - Upper and lower case alphanumeric characters are valid.  Where alphanumeric characters are taken from the full unicode range.


  Commit: 588914ee70f78cd7b02872bb0788cb61546b7829
      https://github.com/okfn/ckan/commit/588914ee70f78cd7b02872bb0788cb61546b7829
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [tag validation il8n] Reverted the change to the error message


  Commit: bf727b4ee10c2c97163d55329fd0195057068d3f
      https://github.com/okfn/ckan/commit/bf727b4ee10c2c97163d55329fd0195057068d3f
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

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

  Log Message:
  -----------
  [test_package] A little bit tidier


  Commit: e47abee7e623bcd6534a7fe2bc2abf91710d89dd
      https://github.com/okfn/ckan/commit/e47abee7e623bcd6534a7fe2bc2abf91710d89dd
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  [dictization_schema test] An extra test


  Commit: c46388b945d58123564f44b138c9afc142d8773a
      https://github.com/okfn/ckan/commit/c46388b945d58123564f44b138c9afc142d8773a
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    A ckan/migration/versions/045_user_name_unique.py
  M ckan/tests/test_authz.py
  M ckan/tests/test_wsgi_ckanclient.py

  Log Message:
  -----------
  [migration,tests]: #1470


  Commit: f9fa9abfe6c3e552d397f404f3f1a5ef64aa6ce2
      https://github.com/okfn/ckan/commit/f9fa9abfe6c3e552d397f404f3f1a5ef64aa6ce2
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    A ckan/migration/versions/045_user_name_unique.py
  M ckan/tests/test_authz.py
  M ckan/tests/test_wsgi_ckanclient.py

  Log Message:
  -----------
  Merge branch 'release-v1.5.1'

Conflicts:
	ckan/config/deployment.ini_tmpl


  Commit: 28d1c62d772d034bad585b5e1a33004c7ba3d7ed
      https://github.com/okfn/ckan/commit/28d1c62d772d034bad585b5e1a33004c7ba3d7ed
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/tests/forms/test_package.py

  Log Message:
  -----------
  [test package form] Couple of extra tests for completeness.


  Commit: 8729d46331341d6156447a1b1acfceb11e7f8eb7
      https://github.com/okfn/ckan/commit/8729d46331341d6156447a1b1acfceb11e7f8eb7
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/misc.py
  M ckan/tests/misc/test_format_text.py

  Log Message:
  -----------
  [tag internal links] Fixed up the internal link RE

After having changed what the valid characters in a tagname are, this needed
re-writing.  A by-product is that it fixed up a bug where the newline character, \n,
was being matched in a tag name.


  Commit: 47b1044989c31a6565984e09c7de92a9a358b13a
      https://github.com/okfn/ckan/commit/47b1044989c31a6565984e09c7de92a9a358b13a
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [template/layout][s]: fix very minor bug whereby about page link is not inside right div.

* NB: a problem for re-theming so should be in v1.5.1.


  Commit: f20eaa22e398820b2edb4113db04c8a6bc9d4ce7
      https://github.com/okfn/ckan/commit/f20eaa22e398820b2edb4113db04c8a6bc9d4ce7
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [doc/theming][s]: (refs #1380) add docs for new template_head_end (which allows for easier css customization) and refactor theming docs somewhat at the same time.


  Commit: c62af341c863aa8bb42cf55800310e8cb8c479c6
      https://github.com/okfn/ckan/commit/c62af341c863aa8bb42cf55800310e8cb8c479c6
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-18 (Fri, 18 Nov 2011)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
  M ckan/tests/forms/test_package.py
  A ckan/tests/schema/__init__.py
  A ckan/tests/schema/test_schema.py

  Log Message:
  -----------
  [tests]: #1453 Added schema tests for tag names for new form.


  Commit: 02b20b4c9387aaa756b92407182f2670f46ee6cd
      https://github.com/okfn/ckan/commit/02b20b4c9387aaa756b92407182f2670f46ee6cd
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-18 (Fri, 18 Nov 2011)

  Changed paths:
    R .hgignore
  M .tx/config
  M CHANGELOG.txt
  A LICENSE.txt
  M MANIFEST.in
  A bin/copy-ckan-2-ckan.py
  A build.sh
  M ckan/__init__.py
  M ckan/config/celery-supervisor.conf
  M ckan/config/deployment.ini_tmpl
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/authorization_group.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/revision.py
  M ckan/controllers/tag.py
  M ckan/i18n/__init__.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
  A ckan/i18n/sr/LC_MESSAGES/ckan.mo
  A ckan/i18n/sr/LC_MESSAGES/ckan.po
  A ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  A 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/app_globals.py
  M ckan/lib/base.py
  R ckan/lib/cache.py
  M ckan/lib/captcha.py
  A ckan/lib/celery_app.py
  M ckan/lib/cli.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  A ckan/lib/i18n.py
  M ckan/lib/munge.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/query.py
  M ckan/lib/stats.py
  M ckan/logic/__init__.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/create.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  R ckan/migration/versions/043_add_task_status.py
  A ckan/migration/versions/043_drop_postgres_search.py
  A ckan/migration/versions/044_add_task_status.py
  A ckan/migration/versions/045_user_name_unique.py
  M ckan/misc.py
  M ckan/model/__init__.py
  M ckan/model/package.py
  M ckan/model/package_mapping.py
  R ckan/model/search_index.py
  M ckan/model/tag.py
  M ckan/model/task_status.py
  M ckan/model/types.py
  M ckan/model/user.py
  M ckan/public/css/blueprint/screen.css
  A 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/templates/_util.html
  M ckan/templates/group/edit.html
  M ckan/templates/group/new.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/facets.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/user/list.html
  M ckan/templates/user/login.html
  M ckan/templates/user/perform_reset.html
  M ckan/templates/user/request_reset.html
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/api/test_package_search.py
  M ckan/tests/functional/test_authorization_group.py
  R ckan/tests/functional/test_cache.py
  M ckan/tests/functional/test_group.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_user.py
  M ckan/tests/lib/test_helpers.py
  A ckan/tests/lib/test_i18n.py
  M ckan/tests/lib/test_munge.py
  M ckan/tests/misc/test_format_text.py
  M ckan/tests/pylons_controller.py
  M ckan/tests/test_authz.py
  M ckan/tests/test_wsgi_ckanclient.py
  M ckan_deb/DEBIAN/control.template
  M ckan_deb/usr/bin/ckan-create-instance
  A ckan_deb/usr/bin/ckan-setup-solr
  M ckan_deb/usr/lib/ckan/common.sh
  M doc/api.rst
  M doc/apiv3.rst
  A doc/common-error-messages.rst
  M doc/configuration.rst
  A doc/editing_the_database_ownership.rst
  M doc/i18n.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  M doc/post-installation.rst
  M doc/test.rst
  M fabfile.py
  M pip-requirements.txt
  M requires/lucid_conflict.txt
  M requires/lucid_missing.txt
  M requires/lucid_present.txt
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into ian-review

Conflicts:
	.gitignore
	ckan/tests/pylons_controller.py


  Commit: 7733eb19971ff06e568970ec713b80c3b0c5bfec
      https://github.com/okfn/ckan/commit/7733eb19971ff06e568970ec713b80c3b0c5bfec
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-18 (Fri, 18 Nov 2011)

  Changed paths:
    M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/package.py
  M ckan/tests/schema/test_schema.py

  Log Message:
  -----------
  [logic,model]: #1473 Fixed validators for length of dataset name and version.


  Commit: 093cc25187063c0c9ed008a08fa348cf8480c766
      https://github.com/okfn/ckan/commit/093cc25187063c0c9ed008a08fa348cf8480c766
  Author: rgrp <rufus.pollock at okfn.org>
  Date:   2011-11-20 (Sun, 20 Nov 2011)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [css][xs]: micro tweak to css to make user list on group page look nicer.


  Commit: 8f3d917e24390f91db577fdbd8b8c6a1d6228505
      https://github.com/okfn/ckan/commit/8f3d917e24390f91db577fdbd8b8c6a1d6228505
  Author: kindly <kindly at gmail.com>
  Date:   2011-11-20 (Sun, 20 Nov 2011)

  Changed paths:
    M ckan/tests/lib/test_navl.py

  Log Message:
  -----------
  #1474 fix navl tests


  Commit: 47216c49fcec881f4eacc7170cb02d0a443500a2
      https://github.com/okfn/ckan/commit/47216c49fcec881f4eacc7170cb02d0a443500a2
  Author: kindly <kindly at gmail.com>
  Date:   2011-11-20 (Sun, 20 Nov 2011)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [doc] #1398 add some docs about deploying celeryd


  Commit: dc9e8e054657cf026de789ef6a8777bf8ae34112
      https://github.com/okfn/ckan/commit/dc9e8e054657cf026de789ef6a8777bf8ae34112
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

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

  Log Message:
  -----------
  [functional/test_admin] Prevented test_admin classes from overwriting config with contents of test.ini.

Create the WSGI app the normal way.


  Commit: 1ed1a349961595c6092a15d10f34f70b11ec522b
      https://github.com/okfn/ckan/commit/1ed1a349961595c6092a15d10f34f70b11ec522b
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

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

  Log Message:
  -----------
  [functional/test_admin] Clean up unused imports


  Commit: f78a94528b7e6ca09441a9619a00a482a1a8c281
      https://github.com/okfn/ckan/commit/f78a94528b7e6ca09441a9619a00a482a1a8c281
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

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

  Log Message:
  -----------
  [test_home #1452] Disabled browser lang detection tests.


  Commit: d565be9d85e202681d4158892742f68e8157a139
      https://github.com/okfn/ckan/commit/d565be9d85e202681d4158892742f68e8157a139
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

  Changed paths:
    M ckan/model/meta.py
  M ckan/model/types.py

  Log Message:
  -----------
  [types][sqlite/datetime check] Check whether the engine itself is sqlite

Rather than checking the config file.


  Commit: 5a01e677dfb42eaeb88f0e0e99f2a783a4a3cb47
      https://github.com/okfn/ckan/commit/5a01e677dfb42eaeb88f0e0e99f2a783a4a3cb47
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/package.py
  M ckan/lib/helpers.py
  M ckan/model/resource.py
  M ckan/public/css/style.css
  M ckan/templates/layout_base.html
  M ckan/templates/package/read_core.html
  A ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [merge] feature-1449-resource-listing


  Commit: 52d71102d9b07693ea240d4a66e8adb43e515414
      https://github.com/okfn/ckan/commit/52d71102d9b07693ea240d4a66e8adb43e515414
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

  Changed paths:
    M ckan/templates/layout_base.html
  M ckan/templates/package/search_form.html
  M ckan/tests/functional/test_search.py

  Log Message:
  -----------
  [xs, ux] Fix bugs caused by setting map.explicit 
to True in routing.py, id=None does not need to be 
specified and url.current() does not work


  Commit: c40c5f7b312151b0dd8d13ee6cc5dbc45dcd182c
      https://github.com/okfn/ckan/commit/c40c5f7b312151b0dd8d13ee6cc5dbc45dcd182c
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [xs, ux] Add in fix for about page link that was
accidently removed during a merge.

Original commit: 47b1044989c31a6565984e09c7de92a9a358b13a


  Commit: 653493a93fbb92b2bfb1443fb5fd80c59b7b1a2f
      https://github.com/okfn/ckan/commit/653493a93fbb92b2bfb1443fb5fd80c59b7b1a2f
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

  Changed paths:
    M ckan/misc.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/misc/test_format_text.py

  Log Message:
  -----------
  [internal tag links] Ensure spaces and unicode characters in URIs are encoded.


  Commit: 924a6783810e1d4025ab98d336e68d82ec2764a0
      https://github.com/okfn/ckan/commit/924a6783810e1d4025ab98d336e68d82ec2764a0
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

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

  Log Message:
  -----------
  [test_package_search] Tidied rogue import


  Commit: cf93d6be423540373b80b62fb8443886ec042aff
      https://github.com/okfn/ckan/commit/cf93d6be423540373b80b62fb8443886ec042aff
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

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

  Log Message:
  -----------
  [test_action] Quick fix to some tests

These tests would fail if run in isolation due to a fixture leaking from test-to-test within the suite.
A better fix would be to fix the fixture from leaking.  But at least this is an improvement.


  Commit: 98f2a828d6913ea96f6b1027788da571ba82b3ea
      https://github.com/okfn/ckan/commit/98f2a828d6913ea96f6b1027788da571ba82b3ea
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

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

  Log Message:
  -----------
  [test_package_search] A couple more tests tag search tests


  Commit: 37758456b38b8d0d609d2b37ce31ed5ecf674815
      https://github.com/okfn/ckan/commit/37758456b38b8d0d609d2b37ce31ed5ecf674815
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-21 (Mon, 21 Nov 2011)

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [docs] Updated docs with a few examples of searching for tags


  Commit: 380eab620c7397eee8cb9ee8d628bbddd0ce1bbf
      https://github.com/okfn/ckan/commit/380eab620c7397eee8cb9ee8d628bbddd0ce1bbf
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-22 (Tue, 22 Nov 2011)

  Changed paths:
    M ckan/model/user.py
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [model]: #1479 Fixed working with unicode email addresses.


  Commit: d074ef2b4dd8988053b4b3c9eaf411fc331a7922
      https://github.com/okfn/ckan/commit/d074ef2b4dd8988053b4b3c9eaf411fc331a7922
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-22 (Tue, 22 Nov 2011)

  Changed paths:
    M ckan/logic/action/get.py
  A ckan/model/misc.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_tag_search.py
  M ckan/tests/models/test_misc.py

  Log Message:
  -----------
  [tagname search] Made /tag search case-insensitive.

 - This affects tagname autocomplete
 - Also fixed up a bug where '_' and '%' weren't being escaped in SQL LIKE expressions


  Commit: c740e7a346146b934511dcf82250310c19bde9ca
      https://github.com/okfn/ckan/commit/c740e7a346146b934511dcf82250310c19bde9ca
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-22 (Tue, 22 Nov 2011)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/package.py
  M ckan/lib/helpers.py
  M ckan/model/meta.py
  M ckan/model/resource.py
  M ckan/model/types.py
  M ckan/public/css/style.css
  M ckan/templates/layout_base.html
  M ckan/templates/package/read_core.html
  A ckan/templates/package/resource_read.html
  M ckan/templates/package/search_form.html
  M ckan/tests/functional/test_admin.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_search.py
  M ckan/tests/lib/test_navl.py
  M doc/extensions.rst
  M doc/theming.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-1453-flexible-tag-names


  Commit: e43009db393cb0540d1175fb1876f6cfa349ab14
      https://github.com/okfn/ckan/commit/e43009db393cb0540d1175fb1876f6cfa349ab14
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-22 (Tue, 22 Nov 2011)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/lib/munge.py
  M ckan/logic/validators.py
  M ckan/model/package.py
  M ckan/model/tag.py
  R ckan/tests/functional/api/test_ajax.py
  A ckan/tests/functional/api/test_util.py
  M ckan/tests/lib/test_munge.py
  M doc/api.rst

  Log Message:
  -----------
  [logic,lib,model,config,docs]: #1480 Munge functions now exposed in API.


  Commit: fadda1738399ab2755468d627cc30126fe95a7d9
      https://github.com/okfn/ckan/commit/fadda1738399ab2755468d627cc30126fe95a7d9
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-22 (Tue, 22 Nov 2011)

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

  Log Message:
  -----------
  [js][s]: Merge pulled files out of sync. Restoring url slug editor.


  Commit: e54b089f6e24a3d27704b1df0005b72e31da5720
      https://github.com/okfn/ckan/commit/e54b089f6e24a3d27704b1df0005b72e31da5720
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-22 (Tue, 22 Nov 2011)

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

  Log Message:
  -----------
  [js,preview][xs]: Old bug needed fixing. Don't set up preview buttons if there are no resources.


  Commit: 358b9d309e0daab8b697e8aadb5e4d3251ec1f06
      https://github.com/okfn/ckan/commit/358b9d309e0daab8b697e8aadb5e4d3251ec1f06
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-22 (Tue, 22 Nov 2011)

  Log Message:
  -----------
  Merge branch '1348'


  Commit: 88e88380f61965f58fb105095e76a78673ce3e2c
      https://github.com/okfn/ckan/commit/88e88380f61965f58fb105095e76a78673ce3e2c
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M ckan/templates/group/new_group_form.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [xs] Bug fix: fix problem with auto url generation
in new packages/groups. Templates needed to be
updated after map.explicit was changed to True in 
our routing.py file


  Commit: ddca1a70c98f6ec1dac25c1199638d2cb35e51fe
      https://github.com/okfn/ckan/commit/ddca1a70c98f6ec1dac25c1199638d2cb35e51fe
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M ckan/controllers/api.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [lib]: #1484 fix for duplicate tags in a package create. Also added tests and a little tidy up.


  Commit: fb8fc7c3873320a6cff7c39eaea2aad7090f192e
      https://github.com/okfn/ckan/commit/fb8fc7c3873320a6cff7c39eaea2aad7090f192e
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M ckan/controllers/api.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [lib]: #1484 fix for duplicate tags in a package create. Also added tests and a little tidy up.


  Commit: c0aaa31c4b7ded54d5cf97d0e8c3065856b6424b
      https://github.com/okfn/ckan/commit/c0aaa31c4b7ded54d5cf97d0e8c3065856b6424b
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M .gitignore
  M ckan/controllers/package.py
  M ckan/forms/common.py
  M ckan/forms/package.py
  M ckan/forms/package_dict.py
  M ckan/lib/create_test_data.py
  M ckan/lib/munge.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/query.py
  M ckan/logic/action/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/misc.py
  A ckan/model/misc.py
  M ckan/model/package.py
  M ckan/public/scripts/application.js
  M ckan/templates/package/new_package_form.html
  M ckan/tests/__init__.py
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_tag.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/api/test_misc.py
  M ckan/tests/functional/api/test_package_search.py
  M ckan/tests/functional/api/test_resource_search.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_tag.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_tag_search.py
  M ckan/tests/misc/test_format_text.py
  M ckan/tests/models/test_misc.py
  M ckan/tests/models/test_package.py
  M ckan/tests/pylons_controller.py
  A ckan/tests/schema/__init__.py
  A ckan/tests/schema/test_schema.py
  M ckan/tests/test_dumper.py
  M doc/api.rst

  Log Message:
  -----------
  [merge] Merge branch 'feature-1453-flexible-tag-names' into master

Conflicts:
	ckan/logic/validators.py
	ckan/model/package.py

Also updated 'ckan/tests/schema/test_schema.py:TestPackage.test_name_validation()' to include
the extra validation error messages.

Merge included renaming PACKAGE_{NAME,VERSION}_{MIN,MAX}_LENGTH constants to
{MIN,MAX}_PACKAGE_{NAME,VERSION}_LENGTH as the branch and master had slightly
different nameing conventions.  Picked one and stuck to it.


  Commit: bd3ca25acad5957dd2dc107ca8843b1a995bdf04
      https://github.com/okfn/ckan/commit/bd3ca25acad5957dd2dc107ca8843b1a995bdf04
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M ckan/lib/munge.py
  M ckan/logic/validators.py
  M ckan/model/package.py

  Log Message:
  -----------
  [model constants] Corrected a rename of some constants defined in model/package.py


  Commit: fc2dbc08edff7c58b6c38c02fdefdf7adffe1136
      https://github.com/okfn/ckan/commit/fc2dbc08edff7c58b6c38c02fdefdf7adffe1136
  Author: kindly <kindly at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/logic/action/get.py

  Log Message:
  -----------
  [home] #1487 group ordering on homepage


  Commit: 4160859c8c9786588dbf0893981b93d9621019a9
      https://github.com/okfn/ckan/commit/4160859c8c9786588dbf0893981b93d9621019a9
  Author: kindly <kindly at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/logic/action/get.py

  Log Message:
  -----------
  [home] #1487 group ordering on homepage


  Commit: 8f284e64053607e538a2e3ea2801b74f64948dda
      https://github.com/okfn/ckan/commit/8f284e64053607e538a2e3ea2801b74f64948dda
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-24 (Thu, 24 Nov 2011)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [doc][s]: Added missing config option.


  Commit: 625bb2ad7bb6c91a9de6e302a6e15f4ce5621f3b
      https://github.com/okfn/ckan/commit/625bb2ad7bb6c91a9de6e302a6e15f4ce5621f3b
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-24 (Thu, 24 Nov 2011)

  Changed paths:
    M .gitignore
  M ckan/controllers/package.py
  M ckan/forms/common.py
  M ckan/forms/package.py
  M ckan/forms/package_dict.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/query.py
  M ckan/logic/action/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/misc.py
  A ckan/model/misc.py
  M ckan/model/package.py
  M ckan/public/scripts/application.js
  M ckan/templates/package/new_package_form.html
  M ckan/tests/__init__.py
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_tag.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/api/test_misc.py
  M ckan/tests/functional/api/test_package_search.py
  M ckan/tests/functional/api/test_resource_search.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_tag.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_tag_search.py
  M ckan/tests/misc/test_format_text.py
  M ckan/tests/models/test_misc.py
  M ckan/tests/models/test_package.py
  M ckan/tests/pylons_controller.py
  A ckan/tests/schema/__init__.py
  A ckan/tests/schema/test_schema.py
  M ckan/tests/test_dumper.py
  M doc/api.rst

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


  Commit: 7a32a16f882560914ff759c49c2f44112f4fb2d7
      https://github.com/okfn/ckan/commit/7a32a16f882560914ff759c49c2f44112f4fb2d7
  Author: amercader <amercadero at gmail.com>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/logic/action/get.py
  M ckan/model/package.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [dictization] Fix for #1490. Use package_dictize

Use package_dictize when returning a package_listing, instead of
a custom method in the logic layer. The package_dictize method needed
to be modified to add the "isopen" property.


  Commit: c94b60e45a9cddf34802f5827ca701462b5e704d
      https://github.com/okfn/ckan/commit/c94b60e45a9cddf34802f5827ca701462b5e704d
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M bin/copy-ckan-2-ckan.py

  Log Message:
  -----------
  [bin]: Updated script for copying packages.


  Commit: 415d9ae3199e60348a389d68b28d205f6c4622ec
      https://github.com/okfn/ckan/commit/415d9ae3199e60348a389d68b28d205f6c4622ec
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/logic/action/get.py
  M ckan/tests/functional/api/test_util.py

  Log Message:
  -----------
  [logic,controllers]: #1488 Extensions added to the status_show. Also added /api/util/status RESTful version.


  Commit: db07290f3f8281778e28c5e7b0268b9bc66257e5
      https://github.com/okfn/ckan/commit/db07290f3f8281778e28c5e7b0268b9bc66257e5
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [doc][xs]: Provided missing reference.


  Commit: be54fbf6ff6cf8ddf3b28885dc17df3dcb58e717
      https://github.com/okfn/ckan/commit/be54fbf6ff6cf8ddf3b28885dc17df3dcb58e717
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-25 (Fri, 25 Nov 2011)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [doc][xs]: Moved stuff around to be in the correct section.


  Commit: 8d5fd4a55610ea2dabc51de9f07d424b9fd310ec
      https://github.com/okfn/ckan/commit/8d5fd4a55610ea2dabc51de9f07d424b9fd310ec
  Author: amercader <amercadero at gmail.com>
  Date:   2011-11-27 (Sun, 27 Nov 2011)

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

  Log Message:
  -----------
  [dictization] Use package_dictize on tag_show results


  Commit: e6bb6735a09595108814b7b2b326f1d735366ed5
      https://github.com/okfn/ckan/commit/e6bb6735a09595108814b7b2b326f1d735366ed5
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M bin/copy-ckan-2-ckan.py

  Log Message:
  -----------
  [bin][s]: Added filter option to package copy script.


  Commit: cdbfa799f18a6c54d7f3ce947856013230941985
      https://github.com/okfn/ckan/commit/cdbfa799f18a6c54d7f3ce947856013230941985
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/config/environment.py
  M ckan/lib/search/__init__.py

  Log Message:
  -----------
  [config]: #1493 fix - ensure ckan.site_id is setup so that SOLR index clear/rebuild work.


  Commit: db814bed54e4ef2e7e40a01ce814b2a328a3840a
      https://github.com/okfn/ckan/commit/db814bed54e4ef2e7e40a01ce814b2a328a3840a
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/config/environment.py
  M ckan/lib/search/__init__.py

  Log Message:
  -----------
  [config]: #1493 fix - ensure ckan.site_id is setup so that SOLR index clear/rebuild work.


  Commit: 2ea20fd512989b68da1f7e6c2bdebeb1c53e7b35
      https://github.com/okfn/ckan/commit/2ea20fd512989b68da1f7e6c2bdebeb1c53e7b35
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

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

  Log Message:
  -----------
  [js][s]: Merge pulled files out of sync. Restoring url slug editor.


  Commit: 9dd930e202524bd161bd1afc7e45ffdc6689cbba
      https://github.com/okfn/ckan/commit/9dd930e202524bd161bd1afc7e45ffdc6689cbba
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

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

  Log Message:
  -----------
  [js,preview][xs]: Old bug needed fixing. Don't set up preview buttons if there are no resources.


  Commit: c23821b349a59849c5ddd46db9f844ce73aa9345
      https://github.com/okfn/ckan/commit/c23821b349a59849c5ddd46db9f844ce73aa9345
  Author: amercader <amercadero at gmail.com>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/logic/action/get.py
  M ckan/model/package.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch 'feature-1490-standard-package-output-from-logic-layer'


  Commit: 05b675a4314ad269c6e6a095d57e3f2a21e771eb
      https://github.com/okfn/ckan/commit/05b675a4314ad269c6e6a095d57e3f2a21e771eb
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/config/schema.xml
  M ckan/lib/search/query.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_solr_package_search_synchronous_update.py

  Log Message:
  -----------
  [xs, search] #1455 bug fix for extras not showing
up when searching with all_fields=1.

Schema updated so that extra values will be 
returned from Solr, and added to package_dict['extras']
in the search results.


  Commit: 4e1fc44f292d04f5b263092ba7df0372ecebd769
      https://github.com/okfn/ckan/commit/4e1fc44f292d04f5b263092ba7df0372ecebd769
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [tests][xs]: #1488 Added description to test-core so that someone you has it set in their development.ini does not have a test failure.


  Commit: de971e8e892634caf7a40558b4ca78531b2e7e2f
      https://github.com/okfn/ckan/commit/de971e8e892634caf7a40558b4ca78531b2e7e2f
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/config/schema.xml
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/search/query.py
  M ckan/logic/action/get.py
  M ckan/model/package.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_solr_package_search_synchronous_update.py

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


  Commit: 7789e85c973c9e085f623486bced6be14f25678f
      https://github.com/okfn/ckan/commit/7789e85c973c9e085f623486bced6be14f25678f
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/lib/cli.py
  M ckan/lib/search/__init__.py

  Log Message:
  -----------
  [xs, #1468] allow search-index rebuild command to
take an optional package name/id, and only rebuild
that specific package if given.


  Commit: 0ffbf288aa1f2f05fc71edae686c9991bfcaa57c
      https://github.com/okfn/ckan/commit/0ffbf288aa1f2f05fc71edae686c9991bfcaa57c
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/tests/__init__.py
  M ckan/tests/functional/api/test_util.py

  Log Message:
  -----------
  [tests][xs]: #1488 Fix extension status test - on postgres the expected result is slightly different.


  Commit: b6fe6098f362129801f237a6d8ffbaef343d2c3d
      https://github.com/okfn/ckan/commit/b6fe6098f362129801f237a6d8ffbaef343d2c3d
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/lib/cli.py
  M ckan/lib/search/__init__.py

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


  Commit: fdee2ebc450a5396b025219baa817b2a1ed7fc42
      https://github.com/okfn/ckan/commit/fdee2ebc450a5396b025219baa817b2a1ed7fc42
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/config/schema.xml
  M ckan/lib/search/query.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_solr_package_search_synchronous_update.py

  Log Message:
  -----------
  [xs, search] #1455 bug fix for extras not showing
up when searching with all_fields=1.

Schema updated so that extra values will be
returned from Solr, and added to package_dict['extras']
in the search results.


  Commit: 220201029aaab5aa4335a0292ca2350006ccc852
      https://github.com/okfn/ckan/commit/220201029aaab5aa4335a0292ca2350006ccc852
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/lib/cli.py
  M ckan/lib/search/__init__.py

  Log Message:
  -----------
  [xs, #1468] allow search-index rebuild command to
take an optional package name/id, and only rebuild
that specific package if given.


  Commit: 23ef0a3b2722f041e369b594f38248a080a6773b
      https://github.com/okfn/ckan/commit/23ef0a3b2722f041e369b594f38248a080a6773b
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/tests/__init__.py

  Log Message:
  -----------
  [tests]: Fix to crucial skip logic.


  Commit: 91258a6296db71d78aa25bd183833cc6014fbe2b
      https://github.com/okfn/ckan/commit/91258a6296db71d78aa25bd183833cc6014fbe2b
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/lib/cli.py
  M ckan/lib/create_test_data.py
  M ckan/lib/package_saver.py
  A ckan/migration/versions/046_drop_changesets.py
  M ckan/model/__init__.py
  R ckan/model/changeset.py
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/model/test_licenses.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_ratings.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/functional/api/model/test_revisions.py
  M ckan/tests/functional/api/model/test_tag.py
  R ckan/tests/models/test_changeset.py
  R ckan/tests/test_changes.py
  M doc/test.rst

  Log Message:
  -----------
  [model,lib,tests]: #1002 Removed changeset code.


  Commit: 284eef68fd0d33a5d4c15dba138fe4fcf2c300a3
      https://github.com/okfn/ckan/commit/284eef68fd0d33a5d4c15dba138fe4fcf2c300a3
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/tests/__init__.py

  Log Message:
  -----------
  [merge]


  Commit: 639e5a5dbedd124fe67c90f6314067a4a13ecdc1
      https://github.com/okfn/ckan/commit/639e5a5dbedd124fe67c90f6314067a4a13ecdc1
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/model/user.py
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [merge]


  Commit: 732426d180cedd20d1d3a623f012c2a296abe824
      https://github.com/okfn/ckan/commit/732426d180cedd20d1d3a623f012c2a296abe824
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-29 (Tue, 29 Nov 2011)

  Changed paths:
    M ckan/tests/lib/__init__.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_solr_package_search_synchronous_update.py

  Log Message:
  -----------
  [tests]: Tidy up test to try and get it stop failing on buildbot.


  Commit: e1e2918e54e5872427f1e1da35e393809cd66d48
      https://github.com/okfn/ckan/commit/e1e2918e54e5872427f1e1da35e393809cd66d48
  Author: David Read <david.read at okfn.org>
  Date:   2011-11-29 (Tue, 29 Nov 2011)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [cli]: Suppress benign warning.


  Commit: aae2eb422d4cf6fc07869485d98c9b3a0c2836fd
      https://github.com/okfn/ckan/commit/aae2eb422d4cf6fc07869485d98c9b3a0c2836fd
  Author: amercader <amercadero at gmail.com>
  Date:   2011-11-29 (Tue, 29 Nov 2011)

  Changed paths:
    M .gitignore
  M .tx/config
  M bin/copy-ckan-2-ckan.py
  M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/config/schema.xml
  M ckan/controllers/api.py
  M ckan/controllers/package.py
  M ckan/forms/common.py
  M ckan/forms/package.py
  M ckan/forms/package_dict.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
  A ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  A 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/cli.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/munge.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/package_saver.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/query.py
  M ckan/logic/action/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  A ckan/migration/versions/045_user_name_unique.py
  A ckan/migration/versions/046_drop_changesets.py
  M ckan/misc.py
  M ckan/model/__init__.py
  R ckan/model/changeset.py
  M ckan/model/meta.py
  A ckan/model/misc.py
  M ckan/model/package.py
  M ckan/model/resource.py
  M ckan/model/tag.py
  M ckan/model/types.py
  M ckan/model/user.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/group/new_group_form.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  A ckan/templates/package/resource_read.html
  M ckan/templates/package/search_form.html
  M ckan/tests/__init__.py
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/model/test_licenses.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_ratings.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/functional/api/model/test_revisions.py
  M ckan/tests/functional/api/model/test_tag.py
  M ckan/tests/functional/api/test_action.py
  R ckan/tests/functional/api/test_ajax.py
  M ckan/tests/functional/api/test_misc.py
  M ckan/tests/functional/api/test_package_search.py
  M ckan/tests/functional/api/test_resource_search.py
  A ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_admin.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_user.py
  M ckan/tests/lib/__init__.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_munge.py
  M ckan/tests/lib/test_navl.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_solr_package_search_synchronous_update.py
  M ckan/tests/lib/test_tag_search.py
  M ckan/tests/misc/test_format_text.py
  R ckan/tests/models/test_changeset.py
  M ckan/tests/models/test_misc.py
  M ckan/tests/models/test_package.py
  M ckan/tests/pylons_controller.py
  A ckan/tests/schema/__init__.py
  A ckan/tests/schema/test_schema.py
  M ckan/tests/test_authz.py
  R ckan/tests/test_changes.py
  M ckan/tests/test_dumper.py
  M ckan/tests/test_wsgi_ckanclient.py
  M doc/api.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/test.rst
  M doc/theming.rst
  M pip-requirements.txt
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into defect-1430-mixed-docs-in-search-index


Compare: https://github.com/okfn/ckan/compare/68dd647...aae2eb4




More information about the ckan-changes mailing list