[ckan-changes] [okfn/ckan] 9d460b: Merge branch 'master' of https://github.com/okfn/c...
GitHub
noreply at github.com
Tue May 8 12:22:06 UTC 2012
Branch: refs/heads/enhancement-2371-fanstatic
Home: https://github.com/okfn/ckan
Commit: 9d460be4e398ee3b9ea087688d53e942a3c410b9
https://github.com/okfn/ckan/commit/9d460be4e398ee3b9ea087688d53e942a3c410b9
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/home.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/logic/__init__.py
M ckan/model/__init__.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/templates/_util.html
M ckan/templates/layout_base.html
M ckan/templates/package/related_list.html
M ckan/templates/user/login.html
M ckan/tests/lib/test_helpers.py
M doc/configuration.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 2f4d2f30e27f59c1d247fbac59d5f5ce54bf4503
https://github.com/okfn/ckan/commit/2f4d2f30e27f59c1d247fbac59d5f5ce54bf4503
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/layout_base.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: bdb5fd54b3fdd39075bd09fda2cbec47886b7e2c
https://github.com/okfn/ckan/commit/bdb5fd54b3fdd39075bd09fda2cbec47886b7e2c
Author: Toby <toby.junk at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/templates/package/search.html
Log Message:
-----------
[xs] fix minor issue with sidebar in search results
Commit: 13f5a75ced75b953ef8b4ed08db92f781d966b57
https://github.com/okfn/ckan/commit/13f5a75ced75b953ef8b4ed08db92f781d966b57
Author: amercader <amercadero at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/templates/home/about.html
M ckan/templates/home/index.html
Log Message:
-----------
[xs] Change mentions to the Open Data Manual to Handbook
Commit: 668d4d7b4771762f78cd08ae24fd944dba70db16
https://github.com/okfn/ckan/commit/668d4d7b4771762f78cd08ae24fd944dba70db16
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/package/search_form.html
Log Message:
-----------
Move the search button inline with input
This has restructured the HTML used in the search_form.html which may
break extensions. Particularly the spacial extension which uses this
hook.
Commit: a2fd245719a1224ce58d3af072f7cb146bea2899
https://github.com/okfn/ckan/commit/a2fd245719a1224ce58d3af072f7cb146bea2899
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/public/css/style.css
M ckan/templates/home/about.html
M ckan/templates/home/index.html
M ckan/templates/package/search.html
M ckan/templates/package/search_form.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: e2af388a0a91e3258f537cb6f5bce79fa4c526d5
https://github.com/okfn/ckan/commit/e2af388a0a91e3258f537cb6f5bce79fa4c526d5
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/tests/logic/test_member.py
Log Message:
-----------
[bug] Fix to extraneous fields in context for member api
Commit: d22c05fee2e114a4c5d8a9b921d5e38e1649b5e0
https://github.com/okfn/ckan/commit/d22c05fee2e114a4c5d8a9b921d5e38e1649b5e0
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
[xs] Fix the RDF alternative rep of the page, and make the atom url absolute
Commit: c8239b42de7e4a08e946d1421e9aac2d21845e7f
https://github.com/okfn/ckan/commit/c8239b42de7e4a08e946d1421e9aac2d21845e7f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M ckan/lib/mailer.py
M ckan/templates/package/read.html
M ckan/templates/package/read.n3
M ckan/templates/package/read.rdf
M ckan/templates/package/resource_read.html
M ckanext/organizations/templates/email/join_publisher_request.txt
Log Message:
-----------
[xs] Adding qualified=True to urls using h.url_for instead of prepending with g.site_url
Commit: fa0bc04210c8dadce2bc1269788b16f12f4d8f24
https://github.com/okfn/ckan/commit/fa0bc04210c8dadce2bc1269788b16f12f4d8f24
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
A doc/data-viewer.rst
M doc/index.rst
Log Message:
-----------
[docs] A doc page for the data-viewer.
Cherry-pick of 70876ee31356a44d322d2af4afc053ad2fe13cd9 which was made on
the release-v1.7 branch.
Commit: 336e23dd66306d4dea05e5e980201312d8a4cbc5
https://github.com/okfn/ckan/commit/336e23dd66306d4dea05e5e980201312d8a4cbc5
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M ckan/plugins/toolkit.py
Log Message:
-----------
[xs] Typos.
Commit: 8b7141cd2ff619a0e35aaa31bbc1d17156647498
https://github.com/okfn/ckan/commit/8b7141cd2ff619a0e35aaa31bbc1d17156647498
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/model/group.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/models/test_group.py
Log Message:
-----------
[#2373]: Fix for group autocomplete for multiple words.
Commit: c943549cda5cf8d57a11d11565d4664805d2a4ee
https://github.com/okfn/ckan/commit/c943549cda5cf8d57a11d11565d4664805d2a4ee
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
A doc/data-viewer.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'feature-2285-embeddable-data-viewer'
Commit: 517945524247721b3b7e25dcbc559e2c079d16ba
https://github.com/okfn/ckan/commit/517945524247721b3b7e25dcbc559e2c079d16ba
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/logic/action/get.py
M ckan/tests/__init__.py
M ckan/tests/logic/test_action.py
A ckan/tests/logic/test_tag.py
Log Message:
-----------
[#2374] Made tag search pageable. Moved logic tag tests into its own file. Centralised related testing fixtures.
Commit: 8947302696498fd99ea304edbb898a56f793f998
https://github.com/okfn/ckan/commit/8947302696498fd99ea304edbb898a56f793f998
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-05-07 (Mon, 07 May 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/base.py
M ckan/templates/admin/authz.html
M ckan/templates/group/authz.html
M ckan/templates/package/authz.html
Log Message:
-----------
[#2366] Only display authz options for Authz Groups if there are some.
Commit: 7a73126e1b0f572790483febff747ae30ae1ff59
https://github.com/okfn/ckan/commit/7a73126e1b0f572790483febff747ae30ae1ff59
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-07 (Mon, 07 May 2012)
Changed paths:
M doc/filestore.rst
Log Message:
-----------
[docs] Clarify where to put filestore config lines in ini file
Commit: 5c1dc6f1f14f935f3ce8e7d4c52ec996d30cb8f3
https://github.com/okfn/ckan/commit/5c1dc6f1f14f935f3ce8e7d4c52ec996d30cb8f3
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-05-07 (Mon, 07 May 2012)
Changed paths:
M ckan/authz.py
Log Message:
-----------
[xs]: More flexible args for is_sysadmin so that it can run quicker.
Commit: d646258c2ee735a389a55cb66dca94669fb78e84
https://github.com/okfn/ckan/commit/d646258c2ee735a389a55cb66dca94669fb78e84
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
[xs] Fixing problem with 404 when requesting related items
Commit: 20d06d6a7ca53b22e14ecb104e2f318fa2275f76
https://github.com/okfn/ckan/commit/20d06d6a7ca53b22e14ecb104e2f318fa2275f76
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
Changed paths:
M ckan/authz.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/lib/base.py
M ckan/lib/create_test_data.py
M ckan/logic/action/get.py
M ckan/model/group.py
M ckan/plugins/toolkit.py
M ckan/templates/admin/authz.html
M ckan/templates/group/authz.html
M ckan/templates/package/authz.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/logic/test_action.py
A ckan/tests/logic/test_tag.py
M ckan/tests/models/test_group.py
A doc/data-viewer.rst
M doc/filestore.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: f8be5328139e336d788d9df92e722a503b735088
https://github.com/okfn/ckan/commit/f8be5328139e336d788d9df92e722a503b735088
Author: Toby <toby.junk at gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
Changed paths:
M ckan/authz.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/related.py
M ckan/lib/base.py
M ckan/lib/create_test_data.py
M ckan/lib/mailer.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/model/group.py
M ckan/plugins/toolkit.py
M ckan/public/css/style.css
M ckan/templates/admin/authz.html
M ckan/templates/group/authz.html
M ckan/templates/home/about.html
M ckan/templates/home/index.html
M ckan/templates/package/authz.html
M ckan/templates/package/read.html
M ckan/templates/package/read.n3
M ckan/templates/package/read.rdf
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/search_form.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_member.py
A ckan/tests/logic/test_tag.py
M ckan/tests/models/test_group.py
M ckanext/organizations/templates/email/join_publisher_request.txt
A doc/data-viewer.rst
M doc/filestore.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'master' into enhancement-2371-fanstatic
Compare: https://github.com/okfn/ckan/compare/de258ae...f8be532
More information about the ckan-changes
mailing list