[ckan-changes] [okfn/ckan] e5e4b9: Merge branch 'master' of https://github.com/okfn/c...
GitHub
noreply at github.com
Fri Jun 29 17:40:50 UTC 2012
Branch: refs/heads/feature-2389-better-dataexplorer-error-handling
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: 97c377140a560129c79a344659c5668b7810866a
https://github.com/okfn/ckan/commit/97c377140a560129c79a344659c5668b7810866a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M pip-requirements-docs.txt
Log Message:
-----------
[#2434] Add PasteDeploy to pip-requirements-docs
Hoping this might get rid of a traceback we're getting on readthedocs
Commit: 7816dfff6913dc47da676e67709a4a776e0f013f
https://github.com/okfn/ckan/commit/7816dfff6913dc47da676e67709a4a776e0f013f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M ckanext/multilingual/plugin.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: bd37658061bd1fac548bd210430cd9548169a562
https://github.com/okfn/ckan/commit/bd37658061bd1fac548bd210430cd9548169a562
Author: Toby <toby.junk at gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/related.py
Log Message:
-----------
fix 500 error on dataset related page plus followers count
Commit: f46ee123e1aeb1acbb2fe6fd5b6ee0d90d88ae16
https://github.com/okfn/ckan/commit/f46ee123e1aeb1acbb2fe6fd5b6ee0d90d88ae16
Author: Toby <toby.junk at gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
2482 use follower_count logic call
Commit: 33d44faea38b1514fade9214852762eae69d4d8c
https://github.com/okfn/ckan/commit/33d44faea38b1514fade9214852762eae69d4d8c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/related.py
Log Message:
-----------
Merge branch '2482-related-items-500-error-followers'
Commit: 026d332edaa61d4b6a71be865e49652f4c494f4a
https://github.com/okfn/ckan/commit/026d332edaa61d4b6a71be865e49652f4c494f4a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M ckan/model/tag.py
Log Message:
-----------
Fix up docstrings in ckan/model/tag.py
Make them conform to our new docstring standards, so I can use them as
an example.
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: 16848e3166ebff8d8596ab074d7149f37342d6a8
https://github.com/okfn/ckan/commit/16848e3166ebff8d8596ab074d7149f37342d6a8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
R Coding_Standards.rst
A doc/coding-standards.rst
M doc/index.rst
Log Message:
-----------
[#2481] Move Coding_Standards.rst into Sphinx docs
Commit: 2b708ac3d610d771c2d7737db24d8bb599f49b09
https://github.com/okfn/ckan/commit/2b708ac3d610d771c2d7737db24d8bb599f49b09
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add commit message guidelines to coding standards
Commit: 7a032998ed052c6f8c3795bc1cb10f7b904f650d
https://github.com/okfn/ckan/commit/7a032998ed052c6f8c3795bc1cb10f7b904f650d
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-01 (Fri, 01 Jun 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
M ckan/templates/user/layout.html
Log Message:
-----------
[#2484] move follower functionality into helpers
This stops the need for repeating code in the controllers
and helps de-couple the follower functionality
It also fixes the translation of the updated buttons
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: d1c82313143b77249223d6da56823c51d1255137
https://github.com/okfn/ckan/commit/d1c82313143b77249223d6da56823c51d1255137
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/user.py
Log Message:
-----------
Added route 'user/dashboard' and action 'dashboard' to user controller.
Commit: b26daa5cc74f9914de317012edd58d1d17283147
https://github.com/okfn/ckan/commit/b26daa5cc74f9914de317012edd58d1d17283147
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M ckan/controllers/user.py
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
Log Message:
-----------
New template 'dashboard.html', modified layout
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: 958d00408712c4a3c6b8bd535323ef7c140288de
https://github.com/okfn/ckan/commit/958d00408712c4a3c6b8bd535323ef7c140288de
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/logic/action/get.py
M ckan/model/follower.py
M ckan/templates/user/dashboard.html
Log Message:
-----------
UserFollowingUser and UserFollowingDataset classes extended to discover followed users and datasets; inlcuded in user controller and template; contains bug: no datasets are displayed
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: 9b64dd9975ba30a3fdc0826801e7ea79a183bf1b
https://github.com/okfn/ckan/commit/9b64dd9975ba30a3fdc0826801e7ea79a183bf1b
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/templates/user/dashboard.html
Log Message:
-----------
Unified activity stream implemented
unified means activities of the user, of the users being followed by the user and of the datasets being followed by the user
Commit: 7fa53634b8163bc99f66d3c9ff4f2ecd0cae9899
https://github.com/okfn/ckan/commit/7fa53634b8163bc99f66d3c9ff4f2ecd0cae9899
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/style.css
M ckan/templates/user/dashboard.html
Log Message:
-----------
Bug fixing, UI refinement
Commit: 7aef1cd36df8dcd10a093f533dbdd5781cf35261
https://github.com/okfn/ckan/commit/7aef1cd36df8dcd10a093f533dbdd5781cf35261
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/templates/layout_base.html
Log Message:
-----------
Click on User tile redirects to dashboard
Commit: 495f7e1ecf3347f22135f4c4bc0dae8202a1db4b
https://github.com/okfn/ckan/commit/495f7e1ecf3347f22135f4c4bc0dae8202a1db4b
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/templates/layout_base.html
Log Message:
-----------
user/me redirects to dashboard
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: 96383a63a77e73a3f2c12a12c04e16337955fa5f
https://github.com/okfn/ckan/commit/96383a63a77e73a3f2c12a12c04e16337955fa5f
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/config/routing.py
M ckan/templates/user/layout.html
Log Message:
-----------
added route /user/read
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: fa81fcab7302e6c6e75f220df592e20f826e8d4f
https://github.com/okfn/ckan/commit/fa81fcab7302e6c6e75f220df592e20f826e8d4f
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M ckan/model/follower.py
Log Message:
-----------
Update comments
Commit: fb86d64cb1484291eb4b1c0634b8ea8c27abac32
https://github.com/okfn/ckan/commit/fb86d64cb1484291eb4b1c0634b8ea8c27abac32
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/logic/action/create.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/tests/functional/test_group.py
M ckan/tests/logic/test_action.py
M doc/coding-standards.rst
M doc/install-from-package.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
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
Commit: 1d4f02a3aa886c012937e681fb48e66ca5e8e854
https://github.com/okfn/ckan/commit/1d4f02a3aa886c012937e681fb48e66ca5e8e854
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
M ckan/templates/user/layout.html
Log Message:
-----------
Merge branch 'feature-2484-followers-as-helper'
Commit: c7cd7a1e0740ed8983d868804989779b29a740a4
https://github.com/okfn/ckan/commit/c7cd7a1e0740ed8983d868804989779b29a740a4
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/logic/__init__.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[2500] get_action now raises an exception on missing action
Previously get_action returned None for missing actions, but this led
to opaque errors in templates whereas now it raises an exception which is
clear in describing the problem.
Also lots of PEP8 cleanup of the non-test code.
Commit: 62e4d53230a1069a1fd5c988d23998dcdeb434ec
https://github.com/okfn/ckan/commit/62e4d53230a1069a1fd5c988d23998dcdeb434ec
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/logic/__init__.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Merge branch 'defect-2500-get-action-missing'
Commit: 7c38889103c0b88a7a5bc4b3fb23131cc4f5ed00
https://github.com/okfn/ckan/commit/7c38889103c0b88a7a5bc4b3fb23131cc4f5ed00
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
Log Message:
-----------
PEP8ification of controllers module
Commit: c00f61024e07f2a9af639431f755cd93f31e9da7
https://github.com/okfn/ckan/commit/c00f61024e07f2a9af639431f755cd93f31e9da7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M ckan/lib/accept.py
Log Message:
-----------
PEP8ified
Commit: d434cc35dd4544ae72e147ca683e23eab003570e
https://github.com/okfn/ckan/commit/d434cc35dd4544ae72e147ca683e23eab003570e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M ckan/lib/celery_app.py
Log Message:
-----------
PEP8ified
Commit: df89f946a1d50b4bf8af0ccb1ac2c68bece529cb
https://github.com/okfn/ckan/commit/df89f946a1d50b4bf8af0ccb1ac2c68bece529cb
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M ckan/lib/search/__init__.py
Log Message:
-----------
PEP8ified
Commit: 69ddf00a6bb57d4752dff06335ea30ce58003777
https://github.com/okfn/ckan/commit/69ddf00a6bb57d4752dff06335ea30ce58003777
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M ckan/lib/search/common.py
Log Message:
-----------
PEP8ified
Commit: e759ef98adf6de7f25ebcd925d16d4ab4359e192
https://github.com/okfn/ckan/commit/e759ef98adf6de7f25ebcd925d16d4ab4359e192
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/create_test_data.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/logic/__init__.py
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
M ckan/templates/user/layout.html
M ckan/tests/logic/test_action.py
M doc/solr-setup.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 3b7ff6c2e9eaa2bb21567525fd9df0fcde330816
https://github.com/okfn/ckan/commit/3b7ff6c2e9eaa2bb21567525fd9df0fcde330816
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
Fix a test that was broken with sqlite
If you do CreateTestData.create() and then do setup_test_search_index()
in a setup_class() method then setup_test_search_index() causes the
entire test class to be skipped when tests are run with sqlite, and the
teardown_class() method is not run, so you have created test data but
not deleted it, and the next test classes will crash when they try to
create the test data. Instead call setup_test_search_index() before you
create test data.
Commit: a68431aa331c361e55905ec461cbc1028279ec36
https://github.com/okfn/ckan/commit/a68431aa331c361e55905ec461cbc1028279ec36
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M ckan/tests/test_versions.py
Log Message:
-----------
Workaround for broken Pylons version test
test_pylons() was failing when the right version of Pylons is installed
into a virtualenv with pip rather than installed system-wide. Looks like
a bug in the Pylons code when it reports its version number. Changed
the test to get the version from pip freeze instead.
Commit: db7481921ba37e7b044ea59360d90cc934149b74
https://github.com/okfn/ckan/commit/db7481921ba37e7b044ea59360d90cc934149b74
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
M doc/install-from-source.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Update and simplify install instructions
Update the install instructions so that they work with both Ubuntu 12.04 and
Ubuntu 10.04 without modification (and should work on other systems with little
modification). Also shorten and simplify the instructions.
- Add pip to the required packages that are apt-get installed, instead of
installing it with easy_install.
- Add --no-site-packages to the virtualenv command, the previous command made
a virtualenv with site packages on Ubuntu 10.04 and a virtualenv without site
packages on Ubuntu 12.04, because the default behaviour of virtualenv has
changed. Without site packages is better as it means virtualenvs will be the
same on different people's systems.
- Remove the part about apt-get installing some Python modules on Ubuntu 10.04,
this only works on Ubuntu 10.04 and not even on other versions of Ubuntu, and
it requires site packages which complicates things, just tell everyone to pip
install all the Python modules into their virtualenvs instead.
- Merge the three pip requirements files into one
- Remove pastescript==1.7.3 from the requirements file, a newer version of
pastescript already gets installed as a dependency of one of the earlier
packages, then trying to install this older version makes pip crash.
- Remove the --ignore-installed option from pip install commands, not needed
now that we're using --no-site-packages.
- There's no need to deacticate and reactivate your virtualenv
- Generally edit the instructions, aim to make them shorter and easier to
follow quickly without having to read it all carefully
- I also tried to make the language a little friendlier and less formal in a
few places, e.g. You're done! instead of You are finished, etc.
Commit: 896e2a9e8918e46e75affcc9cf738acb361862a5
https://github.com/okfn/ckan/commit/896e2a9e8918e46e75affcc9cf738acb361862a5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
Add i386 JAVA_HOME example to solr install instructions
Commit: 1864c7f2fad71e81a6c69e84f808149b2850f6f6
https://github.com/okfn/ckan/commit/1864c7f2fad71e81a6c69e84f808149b2850f6f6
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[#2591] fix postgresql 9.1.4 unicode issue
sqlalchemy gets confused over unicode encoding in postgresql v9.1.4
we get utf-8 data but we can think that we are getting SQL_ASCII
this patch forces sqlalchemy to use utf-8 which will make things easier
as all ckan data should be treated as utf-8
Commit: 2d73bafa3aaa2bfa3c11662a8287ca12dd62185f
https://github.com/okfn/ckan/commit/2d73bafa3aaa2bfa3c11662a8287ca12dd62185f
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[#2591] only enforce unicode for postgresql
sqlite databases do not want to be affected
Commit: 3d239c55a980c33b8404c8e762d86e1e9b53ab8b
https://github.com/okfn/ckan/commit/3d239c55a980c33b8404c8e762d86e1e9b53ab8b
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/create_test_data.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/logic/__init__.py
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
M ckan/templates/user/layout.html
M ckan/tests/functional/test_group.py
M ckan/tests/logic/test_action.py
M ckan/tests/test_versions.py
M doc/solr-setup.rst
Log Message:
-----------
merge with master branch
Commit: a78c8275413bba31891cf74bce610053e51847ca
https://github.com/okfn/ckan/commit/a78c8275413bba31891cf74bce610053e51847ca
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/celery_app.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
Log Message:
-----------
Merge branch 'enhancement-pep8-controllers'
Conflicts:
ckan/controllers/package.py
ckan/controllers/related.py
ckan/lib/search/__init__.py
minor merge conflicts
Commit: 75283f65d644d928e2b5c636d16d3fe06bbf600f
https://github.com/okfn/ckan/commit/75283f65d644d928e2b5c636d16d3fe06bbf600f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch 'defect-2591-postgresql-unicode'
Commit: fa9dc06e1e560946a7840fe6507017524dd1bbe9
https://github.com/okfn/ckan/commit/fa9dc06e1e560946a7840fe6507017524dd1bbe9
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 2bf11bb1b18ce0190c007d1604f485d8c50a9073
https://github.com/okfn/ckan/commit/2bf11bb1b18ce0190c007d1604f485d8c50a9073
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/admin.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/celery_app.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/tests/functional/test_group.py
M ckan/tests/test_versions.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: bd65dea8fd781eb725c7e7b4797e19baa9001a0e
https://github.com/okfn/ckan/commit/bd65dea8fd781eb725c7e7b4797e19baa9001a0e
Author: John Glover <j at johnglover.net>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[2518] Allow custom i18n directory.
Custom i18n directory can be set via the config
option ckan.i18n_directory.
Commit: c191cacedd9bf502435f77ce97e2924aea5ae837
https://github.com/okfn/ckan/commit/c191cacedd9bf502435f77ce97e2924aea5ae837
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/lib/i18n.py
Log Message:
-----------
[#2524] Add functionality for none supplied locale
Commit: c9435c4296fa5de58cbe96f9bdc0be5744a5f731
https://github.com/okfn/ckan/commit/c9435c4296fa5de58cbe96f9bdc0be5744a5f731
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/admin.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/celery_app.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
Log Message:
-----------
Merge branch 'master' into defect-2289-i18n-flash
Commit: c632dbb383e1397b620f069ed68eb9d1a8bb5c32
https://github.com/okfn/ckan/commit/c632dbb383e1397b620f069ed68eb9d1a8bb5c32
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2289] flash messages now translated for logging in
Commit: 3b5cac80b612a6f5597b9faa931ef737cca95708
https://github.com/okfn/ckan/commit/3b5cac80b612a6f5597b9faa931ef737cca95708
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
[#2428] Install PyUtilib from PyPI not svn
Commit: d8a31186372b1609bd1274187d350f13731e1997
https://github.com/okfn/ckan/commit/d8a31186372b1609bd1274187d350f13731e1997
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2289] minor bugfix
Commit: 3eea09976742d1f3021d49a7613fb6338c195f48
https://github.com/okfn/ckan/commit/3eea09976742d1f3021d49a7613fb6338c195f48
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Fix up descriptions of required packages
and remove subversion from the list, no longer needed
Commit: 64d4887d05dd367ac031c765e62c50408c121160
https://github.com/okfn/ckan/commit/64d4887d05dd367ac031c765e62c50408c121160
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
[#2592] Add comment to pip requirements file
Commit: e4b0dd2b94da1c893a17f8db98d03e2376cdda2b
https://github.com/okfn/ckan/commit/e4b0dd2b94da1c893a17f8db98d03e2376cdda2b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Remove subversion from apt-get install command
Commit: 8fe263dd67b1c37ff2672b8a986d4d544bb5ea10
https://github.com/okfn/ckan/commit/8fe263dd67b1c37ff2672b8a986d4d544bb5ea10
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Put ~ back on cd command
Commit: 099164e1455a7958bd61bcc371a96fb82ca72ca1
https://github.com/okfn/ckan/commit/099164e1455a7958bd61bcc371a96fb82ca72ca1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/admin.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/celery_app.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
Log Message:
-----------
Merge branch 'master', remote-tracking branch 'origin' into 2592-update-source-install-docs
Commit: edd8ac6893d1f2b788b73a89bf345076ad68e960
https://github.com/okfn/ckan/commit/edd8ac6893d1f2b788b73a89bf345076ad68e960
Author: kindly <kindly at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
[#2508] add in url validation again
Commit: dc91a384fa6af505fbe33dd6b07756feb22c8cdb
https://github.com/okfn/ckan/commit/dc91a384fa6af505fbe33dd6b07756feb22c8cdb
Author: kindly <kindly at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
Revert "[#2508] add in url validation again"
This reverts commit edd8ac6893d1f2b788b73a89bf345076ad68e960.
Commit: 0b2c228eecdf0928c05dd013014c78beb4d362a9
https://github.com/okfn/ckan/commit/0b2c228eecdf0928c05dd013014c78beb4d362a9
Author: kindly <kindly at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
[#2508] add in url validation again
Commit: 5d0780f563b0920c475176d0142d79989a5d76ed
https://github.com/okfn/ckan/commit/5d0780f563b0920c475176d0142d79989a5d76ed
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/tests/test_plugins.py
Log Message:
-----------
[#2428] Fix some tests that were failing
due to pyutilib upgrade
Commit: cb283b1bd116992c4b49604c92decb82967f31a5
https://github.com/okfn/ckan/commit/cb283b1bd116992c4b49604c92decb82967f31a5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[#2592] Fix broken path in solr setup instructions
Commit: 5f010600f6d4c837ca79c245f3c4b4ce1a54f8c9
https://github.com/okfn/ckan/commit/5f010600f6d4c837ca79c245f3c4b4ce1a54f8c9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/test.rst
Log Message:
-----------
Minor fixes to test instructions
Commit: 33f85396ca978dd3f3b85602f266ea6da93b0c10
https://github.com/okfn/ckan/commit/33f85396ca978dd3f3b85602f266ea6da93b0c10
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 2592-update-source-install-docs
Commit: 8e7f6b7d061c2a08148a15d78e31e0cc7fedd9ec
https://github.com/okfn/ckan/commit/8e7f6b7d061c2a08148a15d78e31e0cc7fedd9ec
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/tests/test_plugins.py
Log Message:
-----------
[#2592] allow old and new pyutillib behaviour for tests
Commit: 5cee5021f2bd482ee304b71c863c55aad38bd7c0
https://github.com/okfn/ckan/commit/5cee5021f2bd482ee304b71c863c55aad38bd7c0
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/tests/test_plugins.py
Log Message:
-----------
Revert "[#2592] allow old and new pyutillib behaviour for tests"
This reverts commit 8e7f6b7d061c2a08148a15d78e31e0cc7fedd9ec.
Commit: dccd6ea80e375955a5f2cc7305d6b1d57bd583dd
https://github.com/okfn/ckan/commit/dccd6ea80e375955a5f2cc7305d6b1d57bd583dd
Author: John Glover <glover.john at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
Merge pull request #35 from okfn/feature-2580-resource-url-validation
[#2508] add in url validation again
Commit: bb4b36e575a6a5575b6c22ca641982d2309f06cf
https://github.com/okfn/ckan/commit/bb4b36e575a6a5575b6c22ca641982d2309f06cf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
Fix a broken path in solr setup instructions
Commit: 8550c0cd5de62fe52a2b6d862f9891e0650a412e
https://github.com/okfn/ckan/commit/8550c0cd5de62fe52a2b6d862f9891e0650a412e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
[#2428] Upgrade routes requirement to 1.12
Commit: 2e426d7b885ab8c33e0d1343cce6006dd42dc13c
https://github.com/okfn/ckan/commit/2e426d7b885ab8c33e0d1343cce6006dd42dc13c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Remove more requirements from install
Remove mercurial, libxml2, libxslt, wget and build-essential
requirements from install instructions
Commit: 507c5a6ae636aac7d26d2f3755b77f42da896918
https://github.com/okfn/ckan/commit/507c5a6ae636aac7d26d2f3755b77f42da896918
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Log Message:
-----------
Merge branch '2592-update-source-install-docs' of github.com:okfn/ckan into 2592-update-source-install-docs
Commit: c2bae5740ea210af201082e2cc45f5deba28fa32
https://github.com/okfn/ckan/commit/c2bae5740ea210af201082e2cc45f5deba28fa32
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Make location of virtualenv optional
Commit: a160c34d0fd6f39b5fd3910d34b718227ef19d06
https://github.com/okfn/ckan/commit/a160c34d0fd6f39b5fd3910d34b718227ef19d06
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 2592-update-source-install-docs
Commit: a136ff5e9a1c9f6dc27b698ffd698d3c6521238e
https://github.com/okfn/ckan/commit/a136ff5e9a1c9f6dc27b698ffd698d3c6521238e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Tweak install from source intro
Commit: a341d7675b176b88a753016d7c1491c7a3df4779
https://github.com/okfn/ckan/commit/a341d7675b176b88a753016d7c1491c7a3df4779
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/environment.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/create_test_data.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
M ckan/templates/user/layout.html
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_action.py
M ckan/tests/test_versions.py
M doc/solr-setup.rst
Log Message:
-----------
Merge commit
Commit: 03a00570d2b17234b316ac48020690a0467b3371
https://github.com/okfn/ckan/commit/03a00570d2b17234b316ac48020690a0467b3371
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/follower.py
M ckan/templates/user/dashboard.html
M ckan/tests/functional/test_user.py
Log Message:
-----------
Pulled controller functionality into helper function
Commit: e955ec7b30cd85c77da06c85488522415ffa4f8e
https://github.com/okfn/ckan/commit/e955ec7b30cd85c77da06c85488522415ffa4f8e
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/model/follower.py
Log Message:
-----------
Merge branch 'feature-2305-dashboard-activity-stream' of https://github.com/kunsv/ckan into feature-2305-dashboard-activity-stream
Conflicts:
ckan/model/follower.py
Commit: bbfd131b42bccf9ea976e1802ecf66550f1a5c24
https://github.com/okfn/ckan/commit/bbfd131b42bccf9ea976e1802ecf66550f1a5c24
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
Some tests added
Commit: 30f663496a4a83c64a50d2668df90b1d860efe53
https://github.com/okfn/ckan/commit/30f663496a4a83c64a50d2668df90b1d860efe53
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M pip-requirements-test.txt
Log Message:
-----------
[#2604] Add requests as requirement for tests
Commit: d28ba93b17644ffac618d5ff438981c38b452511
https://github.com/okfn/ckan/commit/d28ba93b17644ffac618d5ff438981c38b452511
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
M ckanext/organizations/templates/organization_layout.html
Log Message:
-----------
[#2600] Fix Login to add Organization button
Just don't show any button if not authorised to add organisations, same
as with e.g. add dataset etc.
Also fix broken group_create auth function
Commit: 6b84539322644c522e5ce82d5e362941a5f4376e
https://github.com/okfn/ckan/commit/6b84539322644c522e5ce82d5e362941a5f4376e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
M ckanext/organizations/templates/organization_layout.html
Log Message:
-----------
Merge pull request #38 from okfn/2600-bug-replace-broken-login-to-add-organization-button
[#2600] Fix Login to add Organization button
Commit: eba1856526076ddaa5e0ac6667ba0e0a6f8f2b5d
https://github.com/okfn/ckan/commit/eba1856526076ddaa5e0ac6667ba0e0a6f8f2b5d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M doc/install-from-source.rst
M doc/test.rst
Log Message:
-----------
[#2592] Replace pyenv with ~/pyenv in docs
Commit: f485f2e944acf2382aca8867c3a89d26016e49cf
https://github.com/okfn/ckan/commit/f485f2e944acf2382aca8867c3a89d26016e49cf
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] stop tip being quoted
Commit: 42a65080d886d1575f54615d1a4f2440a7f10e4c
https://github.com/okfn/ckan/commit/42a65080d886d1575f54615d1a4f2440a7f10e4c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
M ckanext/organizations/templates/organization_layout.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 9da63242265940de1ddff6ad727be0a450ac6107
https://github.com/okfn/ckan/commit/9da63242265940de1ddff6ad727be0a450ac6107
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
M ckanext/organizations/templates/organization_layout.html
Log Message:
-----------
Merge branch 'master' into 2592-update-source-install-docs
Commit: f34883f0c6789d4f4ad2c5b524b6377bce0c1535
https://github.com/okfn/ckan/commit/f34883f0c6789d4f4ad2c5b524b6377bce0c1535
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/logic/auth/publisher/create.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: de5c8549995dd178ea910757750876c677a2ff04
https://github.com/okfn/ckan/commit/de5c8549995dd178ea910757750876c677a2ff04
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2592] add changelog comment
Commit: be7112e70b2242f4eae7876cdf14e0d9fb4a9a53
https://github.com/okfn/ckan/commit/be7112e70b2242f4eae7876cdf14e0d9fb4a9a53
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/tests/test_plugins.py
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch '2592-update-source-install-docs'
Commit: 152cf537ca09ebad8e8d9fcb6bdf37f8b36feae1
https://github.com/okfn/ckan/commit/152cf537ca09ebad8e8d9fcb6bdf37f8b36feae1
Author: John Glover <j at johnglover.net>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/lib/search/index.py
M ckan/tests/logic/test_tag_vocab.py
Log Message:
-----------
[1732] Fix tag facet list when using vocab tags.
Removes vocab tags from tag list when indexing.
Adds vocab tags to their own dynamic field called
vocab_<vocab name>.
Commit: a03c9605ab7d7ecbae90b1d40f0f052a73b0f410
https://github.com/okfn/ckan/commit/a03c9605ab7d7ecbae90b1d40f0f052a73b0f410
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Dashboard now available through API; API tests modified
Commit: e2e5041940bee1d661723cedb3127ae98e65c8eb
https://github.com/okfn/ckan/commit/e2e5041940bee1d661723cedb3127ae98e65c8eb
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' into defect-2289-i18n-flash
Commit: 8aaaf0bfcbd0817be82efe5de0307450c620c5d8
https://github.com/okfn/ckan/commit/8aaaf0bfcbd0817be82efe5de0307450c620c5d8
Author: John Glover <j at johnglover.net>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/logic/auth/publisher/create.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into 1732-feature-facet-by-vocabs
Commit: 1c3361322b6be982615ac793db2b2fc1a456585a
https://github.com/okfn/ckan/commit/1c3361322b6be982615ac793db2b2fc1a456585a
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
brief test for dashboard activtities
Commit: bad89a82900b154a86606b13d219d81e6893fbe0
https://github.com/okfn/ckan/commit/bad89a82900b154a86606b13d219d81e6893fbe0
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/templates/user/dashboard.html
Log Message:
-----------
user encouragement added
Commit: 392e9be79d2104d3e71f2305e742c82d39761941
https://github.com/okfn/ckan/commit/392e9be79d2104d3e71f2305e742c82d39761941
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/logic/auth/publisher/create.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' of git://github.com/okfn/ckan into feature-2305-dashboard-activity-stream
Commit: 57edefe385abf276c6874e6f7ce30b7621eca122
https://github.com/okfn/ckan/commit/57edefe385abf276c6874e6f7ce30b7621eca122
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/tests/functional/test_user.py
Log Message:
-----------
Remove print statements from test_user.py
Commit: 3cc2f81745260c3569991758452adf32b5fb0289
https://github.com/okfn/ckan/commit/3cc2f81745260c3569991758452adf32b5fb0289
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
[#2347] Don't add foreign keys to activity model
Don't want to have to do a db migrate for this branch
Commit: 59b3297bae4461b47037071db26ec80e18eef81a
https://github.com/okfn/ckan/commit/59b3297bae4461b47037071db26ec80e18eef81a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/config/routing.py
M ckan/templates/user/layout.html
Log Message:
-----------
[#2347] Remove an unnecessary route, fix link
Commit: c72c53c28ac32ed64159df263c6acb76238740bd
https://github.com/okfn/ckan/commit/c72c53c28ac32ed64159df263c6acb76238740bd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/public/css/style.css
Log Message:
-----------
[#2305] Remove some duplicated css
Commit: 06ac119c0565001e9a11f9483e2aab6032fa3edf
https://github.com/okfn/ckan/commit/06ac119c0565001e9a11f9483e2aab6032fa3edf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Add follow feature to CHANGELOG
Commit: f84b110e38bae47a4cfb05ea062c6d52ed6f144a
https://github.com/okfn/ckan/commit/f84b110e38bae47a4cfb05ea062c6d52ed6f144a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2305] Add follow api to changelog
Commit: 40189ee0f34c2dfb46e7363fd8281c7bf884b15a
https://github.com/okfn/ckan/commit/40189ee0f34c2dfb46e7363fd8281c7bf884b15a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/tests/test_plugins.py
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 0d234d78452b47f60677cc2ada342b9852fc5007
https://github.com/okfn/ckan/commit/0d234d78452b47f60677cc2ada342b9852fc5007
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/follower.py
M ckan/public/css/style.css
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_user.py
Log Message:
-----------
Merge branch 'feature-2305-dashboard-activity-stream'
Commit: 2c2bf5405bfae1381314f859300461991101960e
https://github.com/okfn/ckan/commit/2c2bf5405bfae1381314f859300461991101960e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/follower.py
M ckan/public/css/style.css
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_user.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: d290e736397f26be37191f3fadedebe8690804b1
https://github.com/okfn/ckan/commit/d290e736397f26be37191f3fadedebe8690804b1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2592] Add new source install instructions to CHANGELOG
Commit: 890e95ffa81a30e657be1ae693824725b5a942ba
https://github.com/okfn/ckan/commit/890e95ffa81a30e657be1ae693824725b5a942ba
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
Indents the related tab when looking at a list of related items
Commit: fcc52c04adc14276e99e66cb5adb63674f8d3fbe
https://github.com/okfn/ckan/commit/fcc52c04adc14276e99e66cb5adb63674f8d3fbe
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Remove unnecessary exception params that were causing tests to fail due to Unicode issues
Commit: 9ac8976d20a785abafad6f78d40f2699e6aa31a9
https://github.com/okfn/ckan/commit/9ac8976d20a785abafad6f78d40f2699e6aa31a9
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[#2289] include discovered locales
Commit: f50cd42e3065dde811b133b9266e444a9b1b9a2c
https://github.com/okfn/ckan/commit/f50cd42e3065dde811b133b9266e444a9b1b9a2c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
Log Message:
-----------
[#2615] Add activities when following something
Add activity stream activities when a user starts to follow a dataset or
another user.
Commit: 52de660da3cd4b84b0ed62e9c7885b065ef76953
https://github.com/okfn/ckan/commit/52de660da3cd4b84b0ed62e9c7885b065ef76953
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Fix stats extension frontend
Commit: fea640d621a5006a600a2b7a67d972010d31da95
https://github.com/okfn/ckan/commit/fea640d621a5006a600a2b7a67d972010d31da95
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Do not load excanvas.js in IE 9
IE 9 natively supports the canvas element and loading this fallback
will break Flot.
Commit: d70799823cb2dd585708440523801cf2f71aae7c
https://github.com/okfn/ckan/commit/d70799823cb2dd585708440523801cf2f71aae7c
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
Log Message:
-----------
Add excanvas to flot vendor directory
Commit: d1e76cc9d82793209d8d9369981c0e1d6bd97709
https://github.com/okfn/ckan/commit/d1e76cc9d82793209d8d9369981c0e1d6bd97709
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Load flot locally rather than from CDN
Commit: c550b6a49930b7e7918123cf13edd848db9d3672
https://github.com/okfn/ckan/commit/c550b6a49930b7e7918123cf13edd848db9d3672
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/public/scripts/vendor/html5shiv/html5.js
Log Message:
-----------
Upgrade html5shiv to latest release candidate
This includes nice functionality for overriding the default behaviour
which is required to use excanvas.js.
Commit: ab7bcaedaea0b96b80674bb33ee2f7340cbcc47d
https://github.com/okfn/ckan/commit/ab7bcaedaea0b96b80674bb33ee2f7340cbcc47d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Disable html5shiv overriding method on stats page
This was conflicting with the excanvas library used to render the
flot graphs in IE.
Commit: 30e4d440f0d6bfd6014b40eb0cbadac3bf1d73f7
https://github.com/okfn/ckan/commit/30e4d440f0d6bfd6014b40eb0cbadac3bf1d73f7
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Remove trailing commas from all objects in stats page
These choke IE and cause the graphs not to render.
Commit: b9b9b7859c6cb9162da6430e9b49ecd22610a86f
https://github.com/okfn/ckan/commit/b9b9b7859c6cb9162da6430e9b49ecd22610a86f
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Add link to excanvas thread on the net
Commit: 23f57d93549e45277584996ac6eb1680401c0e0c
https://github.com/okfn/ckan/commit/23f57d93549e45277584996ac6eb1680401c0e0c
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
Fix trailing commas in application.js
This prevents exceptions being thrown in IE
Commit: 0588164a70c4b406b41f7808652bedf06514753b
https://github.com/okfn/ckan/commit/0588164a70c4b406b41f7808652bedf06514753b
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Move logic from template to controller
Commit: 53baba208e350a0619300a79d755026e7ce6dea1
https://github.com/okfn/ckan/commit/53baba208e350a0619300a79d755026e7ce6dea1
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
Log Message:
-----------
[#1732] Update schema CHANGELOG (no new version)
Commit: 308fd73395f7f4960ce17a4da7fd6a3a3db57bc2
https://github.com/okfn/ckan/commit/308fd73395f7f4960ce17a4da7fd6a3a3db57bc2
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/lib/search/index.py
M ckan/tests/logic/test_tag_vocab.py
Log Message:
-----------
Merge branch '1732-feature-facet-by-vocabs'
Commit: 5dd74fb1f9a1ffda82d89d1d53f24f69c25bb134
https://github.com/okfn/ckan/commit/5dd74fb1f9a1ffda82d89d1d53f24f69c25bb134
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2615] Use get_action() to get activity_create
Commit: c9e0e044494d0500bfdd88023e0a03b8a7012125
https://github.com/okfn/ckan/commit/c9e0e044494d0500bfdd88023e0a03b8a7012125
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[#2289] add some docstrings etc to lib/i18n
Commit: fbf984e150fc5d6e050a554dd750c5fd85e4e216
https://github.com/okfn/ckan/commit/fbf984e150fc5d6e050a554dd750c5fd85e4e216
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Merge branch '2615-activities_for_follow'
Commit: a719c132afe400ea038a4340c09d46c1a34ea068
https://github.com/okfn/ckan/commit/a719c132afe400ea038a4340c09d46c1a34ea068
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
[xs] whitespace fixes of test
Commit: 47f2aa5c9fc355769a33d83eb9078fc4cfa5cc0e
https://github.com/okfn/ckan/commit/47f2aa5c9fc355769a33d83eb9078fc4cfa5cc0e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2345] Add new action API autodocs to CHANGELOG
Commit: db21610e18d2a054e6d8ef3e162f862e902a66ae
https://github.com/okfn/ckan/commit/db21610e18d2a054e6d8ef3e162f862e902a66ae
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/package.py
M ckan/lib/search/index.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
M ckan/tests/logic/test_tag_vocab.py
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 881f287ff7b65b1949838f5554481f27659fd1c9
https://github.com/okfn/ckan/commit/881f287ff7b65b1949838f5554481f27659fd1c9
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/lib/search/index.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
M ckan/tests/logic/test_tag_vocab.py
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 15a3ae9f04d765882a00c68aa7c934a6aa51d4f9
https://github.com/okfn/ckan/commit/15a3ae9f04d765882a00c68aa7c934a6aa51d4f9
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
rePEP8ification
Commit: 1bca3b5853ef318ee02d6303e70e147440b2c9d2
https://github.com/okfn/ckan/commit/1bca3b5853ef318ee02d6303e70e147440b2c9d2
Author: kindly <kindly at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/controllers/user.py
M ckan/lib/i18n.py
Log Message:
-----------
Merge branch 'defect-2289-i18n-flash'
Commit: 5fa209a41e2b01faf629ce9fa91bb8c7eb172ed5
https://github.com/okfn/ckan/commit/5fa209a41e2b01faf629ce9fa91bb8c7eb172ed5
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#2389] Be more strict when checking for ES
Commit: 71278f801b6bf734c7a9a5ddb745c556c0c3d866
https://github.com/okfn/ckan/commit/71278f801b6bf734c7a9a5ddb745c556c0c3d866
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/tests/functional/test_authz.py
Log Message:
-----------
[#2389] Yet more failing errors if 'error' was present on the JS strings
Commit: f04cdbca0ef62d24061ba1e72517d09c8e2f6f7f
https://github.com/okfn/ckan/commit/f04cdbca0ef62d24061ba1e72517d09c8e2f6f7f
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M CHANGELOG.txt
R Coding_Standards.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
A ckan/i18n/check_po_files.py
M ckan/lib/accept.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/create_test_data.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/repoze_patch.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/lib/search/index.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/follower.py
M ckan/model/tag.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/test_plugins.py
M ckan/tests/test_versions.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/organizations/templates/organization_layout.html
M ckanext/organizations/templates/organization_read.html
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
A 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.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into feature-2389-better-dataexplorer-error-handling
Conflicts:
ckan/controllers/datastore.py
ckan/templates/js_strings.html
Compare: https://github.com/okfn/ckan/compare/c8bc38c62e86...f04cdbca0ef6
More information about the ckan-changes
mailing list