[ckan-changes] [okfn/ckan] 645e2d: [#299] Clear up changes to Pylons' config between ...

• Previous message: [ckan-changes] [okfn/ckan] 645e2d: [#299] Clear up changes to Pylons' config between ...
• Next message: [ckan-changes] [okfn/ckan] 50b548: [#299] Fix psql command line in datastore setup
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 645e2d736bcbf41588e1e4b4f517fa8138ea6078
      https://github.com/okfn/ckan/commit/645e2d736bcbf41588e1e4b4f517fa8138ea6078
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/test_plugins.py
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/__init__.py
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#299] Clear up changes to Pylons' config between tests

We also, instead of always loading test.ini in these tests, we use whatever Pylons loaded.


  Commit: 16849724065ba4461965d71f86826861487130ad
      https://github.com/okfn/ckan/commit/16849724065ba4461965d71f86826861487130ad
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  [#299] Reload AuthFunctions if couldn't find the action we're looking for

The problem I found was when you're testing a bunch of things
sequentially. Then, the first time that method is called, it
loads all known AuthFunctions and puts into a cache. Then it
only checks that cache.

But what happens if some code, after this has happened, adds
a new AuthFunction? It never gets added to the cache.

With this change, if we have the requested function on cache,
we use it. If not, we refresh the cache and see if something
changed.


  Commit: f87ebf41251cb5e050f0adcb557497898505cced
      https://github.com/okfn/ckan/commit/f87ebf41251cb5e050f0adcb557497898505cced
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/stats/tests/test_stats_lib.py

  Log Message:
  -----------
  [#299] Clear test data after each test is run

This might not be the best way to do it. It's too repetitive, but it's
better than leaving trash behind.

We might investigate running the tests inside a transaction, and rolling
back when we're done (is it done already?).


  Commit: 7496756a0b0a68a6e238c64c1be600fae6b0dd79
      https://github.com/okfn/ckan/commit/7496756a0b0a68a6e238c64c1be600fae6b0dd79
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  [#299] Run ckan and ckanext tests on Travis


  Commit: efc74721bf5f5f0cfab381562cf403c1f79da4b5
      https://github.com/okfn/ckan/commit/efc74721bf5f5f0cfab381562cf403c1f79da4b5
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py

  Log Message:
  -----------
  [#299] Fix ckanext.{json,pdf,recline}preview tests

The problem is that we were looking for each *_preview.js, when the included
files are already minified (*_preview.min.js).


  Commit: b65391680b861f2df0a80eda94e999ade348f4da
      https://github.com/okfn/ckan/commit/b65391680b861f2df0a80eda94e999ade348f4da
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/plugins/core.py
    M ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    M ckan/tests/ckantestplugin/setup.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  #299 clear action cache when plugin loads


  Commit: c5f55511e50f03dac7880014799a2eb61e008c5f
      https://github.com/okfn/ckan/commit/c5f55511e50f03dac7880014799a2eb61e008c5f
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  #299 unload and load datastore plugin at correct times


  Commit: 03d67a0eedcf138e77a22e364a0ee19da25720dd
      https://github.com/okfn/ckan/commit/03d67a0eedcf138e77a22e364a0ee19da25720dd
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Revert "Run DataStore tests in Travis-CI"

This reverts commit 76cc9d3b8641489dc8e6674cb0e46ade02ce0b25.

Conflicts:

	.travis.yml


  Commit: b874c3b36adce3bf6ddc2051609d0422bf2af2f2
      https://github.com/okfn/ckan/commit/b874c3b36adce3bf6ddc2051609d0422bf2af2f2
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

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

  Log Message:
  -----------
  [#299] Don't call WHERE statements if there're no terms

This removes the following warning:

/home/vagrant/pyenv/local/lib/python2.7/site-packages/sqlalchemy/sql/expression.py:1925:
SAWarning: The IN-predicate on "term_translation.term" was invoked with an empty sequence.
This results in a contradiction, which nonetheless can be expensive to evaluate.
Consider alternative strategies for improved performance.


  Commit: b47237fb17f1b648f707639487c9149b34064e71
      https://github.com/okfn/ckan/commit/b47237fb17f1b648f707639487c9149b34064e71
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/controllers/revision.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  309 no private datasets in activity streams, revisions, group listing and tag listings


  Commit: 3177bb657eec359b05a41d884338e320ac8012ff
      https://github.com/okfn/ckan/commit/3177bb657eec359b05a41d884338e320ac8012ff
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  make group_list_dictize reasonably fast by going through search index


  Commit: f8908fb4691a1fc3810d28f0e11aaeedbd86b30a
      https://github.com/okfn/ckan/commit/f8908fb4691a1fc3810d28f0e11aaeedbd86b30a
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/templates/snippets/organization.html
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#309] add package count using search index


  Commit: 46c2a86d23981f6d761077aa7618d5449c1e6b64
      https://github.com/okfn/ckan/commit/46c2a86d23981f6d761077aa7618d5449c1e6b64
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  [#345] Also recognize driver `postgres` in `engine_is_pg`


  Commit: 0932cf9613aa9290bf3bcf26700da87b6b2608b7
      https://github.com/okfn/ckan/commit/0932cf9613aa9290bf3bcf26700da87b6b2608b7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/lib/activity_streams_session_extension.py

  Log Message:
  -----------
  [#309] Tidy up a couple of comments

No point in putting "TODO" comments in the source code no one will
remember to go back and do them and the comment may become outdated/misleading.


  Commit: 3912384c2c4fb16d893d6ca9b49486fddb429d56
      https://github.com/okfn/ckan/commit/3912384c2c4fb16d893d6ca9b49486fddb429d56
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Remove code in base controller that is not used in the ckan codebase


  Commit: 810d90c09d5c31f4d7b6eee79e34ccc85751c041
      https://github.com/okfn/ckan/commit/810d90c09d5c31f4d7b6eee79e34ccc85751c041
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Re add function mis-used in api controller


  Commit: 34c4457c2927c32f2a37a65c39ce7838c29d90a4
      https://github.com/okfn/ckan/commit/34c4457c2927c32f2a37a65c39ce7838c29d90a4
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] _make_unicode() still has user


  Commit: ee7514eda1db12ed25f225cd193a8f2d69d037e7
      https://github.com/okfn/ckan/commit/ee7514eda1db12ed25f225cd193a8f2d69d037e7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Move function into only function using it


  Commit: 9586a88916880bb5ac27778f5a29a527d5947416
      https://github.com/okfn/ckan/commit/9586a88916880bb5ac27778f5a29a527d5947416
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] Move function into API controller as only user


  Commit: 708c5d6f2b3530231237a86bb81f44f0c2b008df
      https://github.com/okfn/ckan/commit/708c5d6f2b3530231237a86bb81f44f0c2b008df
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#285] Fix missing imports


  Commit: 0225f91e26b99b0aee8e5d1c983fe568e086322f
      https://github.com/okfn/ckan/commit/0225f91e26b99b0aee8e5d1c983fe568e086322f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#285] Use json defined in h


  Commit: dea3b3ae04d459280fdc4eea60dba42792530003
      https://github.com/okfn/ckan/commit/dea3b3ae04d459280fdc4eea60dba42792530003
  Author: John Glover <j at johnglover.net>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py

  Log Message:
  -----------
  [#285] PEP8


  Commit: b777c9776be934eec111299ee3a98384dd8d33fa
      https://github.com/okfn/ckan/commit/b777c9776be934eec111299ee3a98384dd8d33fa
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckanext/datastore/bin/datastore_setup.py

  Log Message:
  -----------
  [#290] Do not request password in datastore permissions script


  Commit: e82823ef5c35ba670cf290cab2be6246d13c1096
      https://github.com/okfn/ckan/commit/e82823ef5c35ba670cf290cab2be6246d13c1096
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckanext/pdfpreview/tests/test_preview.py

  Log Message:
  -----------
  [#290] Fix test class name


  Commit: 7dbf278765ba96ffc472f03fea3bb26a2a6f377e
      https://github.com/okfn/ckan/commit/7dbf278765ba96ffc472f03fea3bb26a2a6f377e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckanext/resourceproxy/tests/file_server.py

  Log Message:
  -----------
  [#299] Ignore SimpleHTTPServer's log messages


  Commit: 4a780f4c68403a8ee382c2d9a2512104c5563445
      https://github.com/okfn/ckan/commit/4a780f4c68403a8ee382c2d9a2512104c5563445
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  [#299] Run before_show on ITag before running it on IPackage


  Commit: a1943a2591d1233a7f4a1fd857d465a73d6b6d8e
      https://github.com/okfn/ckan/commit/a1943a2591d1233a7f4a1fd857d465a73d6b6d8e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Log Message:
  -----------
  Merge branch 'master' into 299-bug-ckanext-tests-failures

Conflicts:
	ckan/lib/dictization/model_dictize.py


  Commit: 50b5481ff287f2cc65a1a432fa5f7055ec388fee
      https://github.com/okfn/ckan/commit/50b5481ff287f2cc65a1a432fa5f7055ec388fee
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckanext/datastore/bin/datastore_setup.py

  Log Message:
  -----------
  [#299] Fix psql command line in datastore setup


  Commit: d1f39746a3b614a23b34d09db428edf5b5793068
      https://github.com/okfn/ckan/commit/d1f39746a3b614a23b34d09db428edf5b5793068
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    M ckan/tests/ckantestplugin/setup.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#299] Clear AuthFunctions cache after loading/unloading plugin


  Commit: 4b7452f80fb31d956ca58c545675b64ef8b0ed24
      https://github.com/okfn/ckan/commit/4b7452f80fb31d956ca58c545675b64ef8b0ed24
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-07 (Thu, 07 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/model/meta.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch 'master' into 299-bug-ckanext-tests-failures


  Commit: 83bae9ac407869fa82530db756809f530c4026fe
      https://github.com/okfn/ckan/commit/83bae9ac407869fa82530db756809f530c4026fe
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/model/activity.py
    M ckan/plugins/core.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/javascript/modules/popover-context.js
    R ckan/public/base/javascript/modules/popover-context.min.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    R ckan/public/base/less/popover-context.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/authz.html
    M ckan/templates/ajax_snippets/api_info.html
    R ckan/templates/ajax_snippets/popover_context_dataset.html
    R ckan/templates/ajax_snippets/popover_context_group.html
    R ckan/templates/ajax_snippets/popover_context_user.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/related/dashboard.html
    A ckan/templates/snippets/context.html
    A ckan/templates/snippets/context/dataset.html
    A ckan/templates/snippets/context/group.html
    A ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/read.html
    A ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/preview_recline.min.js
    M ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
    R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
    R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
    M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
    R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/layers.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.js
    R ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
    R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
    R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
    A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
    R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
    R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
    M ckanext/reclinepreview/theme/templates/recline.html
    M doc/install-from-source.rst
    M doc/writing-extensions.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 299-bug-ckanext-tests-failures


  Commit: 9d39b8c90ac6776251a7f6a42432006708bdff6c
      https://github.com/okfn/ckan/commit/9d39b8c90ac6776251a7f6a42432006708bdff6c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#299] Configure DataStore plugin after loading it in tests

This is a hack.

We probably should configure all IConfigurable plugins whenever we load a new
one. We have to do this because they're configured before setup_class is ran,
so DataStore never gets configured.


  Commit: 5822df3c6a55efc76033c17331a410d774813981
      https://github.com/okfn/ckan/commit/5822df3c6a55efc76033c17331a410d774813981
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/logic/schema.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    A ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/js/.jshintrc
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/accordion.less
    M ckan/public/base/vendor/bootstrap/less/alerts.less
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    M ckan/public/base/vendor/bootstrap/less/button-groups.less
    M ckan/public/base/vendor/bootstrap/less/buttons.less
    M ckan/public/base/vendor/bootstrap/less/carousel.less
    M ckan/public/base/vendor/bootstrap/less/close.less
    M ckan/public/base/vendor/bootstrap/less/code.less
    M ckan/public/base/vendor/bootstrap/less/component-animations.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/forms.less
    M ckan/public/base/vendor/bootstrap/less/grid.less
    M ckan/public/base/vendor/bootstrap/less/hero-unit.less
    M ckan/public/base/vendor/bootstrap/less/labels-badges.less
    M ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/media.less
    M ckan/public/base/vendor/bootstrap/less/mixins.less
    M ckan/public/base/vendor/bootstrap/less/modals.less
    M ckan/public/base/vendor/bootstrap/less/navbar.less
    M ckan/public/base/vendor/bootstrap/less/navs.less
    M ckan/public/base/vendor/bootstrap/less/pager.less
    M ckan/public/base/vendor/bootstrap/less/pagination.less
    M ckan/public/base/vendor/bootstrap/less/popovers.less
    M ckan/public/base/vendor/bootstrap/less/progress-bars.less
    M ckan/public/base/vendor/bootstrap/less/reset.less
    M ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    M ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/bootstrap/less/scaffolding.less
    M ckan/public/base/vendor/bootstrap/less/sprites.less
    M ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
    A ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    M ckan/public/base/vendor/bootstrap/less/thumbnails.less
    M ckan/public/base/vendor/bootstrap/less/tooltip.less
    M ckan/public/base/vendor/bootstrap/less/type.less
    M ckan/public/base/vendor/bootstrap/less/utilities.less
    M ckan/public/base/vendor/bootstrap/less/variables.less
    M ckan/public/base/vendor/bootstrap/less/wells.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/toolbar.html
    M ckan/templates/group/index.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/index.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_package.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 299-bug-ckanext-tests-failures


  Commit: b895f3e23703f4a4727e8adb63a2f9b93cdb20e9
      https://github.com/okfn/ckan/commit/b895f3e23703f4a4727e8adb63a2f9b93cdb20e9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    R ckan/controllers/datastore.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    R ckan/templates/admin/authz.html
    M ckan/templates/admin/snippets/header.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    R ckan/templates/package/resource_api_data.html
    M ckan/templates/package/snippets/data_api_button.html
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/lib/test_helpers.py
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  Merge branch 'master' into 299-bug-ckanext-tests-failures


  Commit: c30f00cbdaa11adaa9f408050864fd9a6c814fa0
      https://github.com/okfn/ckan/commit/c30f00cbdaa11adaa9f408050864fd9a6c814fa0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/new_authz.py
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#299] Rename clear_cache functions so they're more explicit


  Commit: e8cc863cc71e47b0da05896687d8f254f439edff
      https://github.com/okfn/ckan/commit/e8cc863cc71e47b0da05896687d8f254f439edff
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/tests/functional/test_storage.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#299] Refactoring imports to comply to Coding Standards


  Commit: 9b18ebc3c82e46cc2cd3b21df2d5f06502f8a14b
      https://github.com/okfn/ckan/commit/9b18ebc3c82e46cc2cd3b21df2d5f06502f8a14b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/lib/cli.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/bg.png
    M ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/nav-active.png
    A ckan/public/base/images/nav.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/follower-list.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    A ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/confirm_reset.html
    M ckan/templates/admin/index.html
    R ckan/templates/admin/snippets/header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/group/about.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/back_to_package_action.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/social.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    A ckan/templates/user/edit_base.html
    M ckan/templates/user/list.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/followers.html

  Log Message:
  -----------
  Merge branch 'master' into 299-bug-ckanext-tests-failures


  Commit: 066a06abfa26e4ad187d8207c7b5f824cceb60f4
      https://github.com/okfn/ckan/commit/066a06abfa26e4ad187d8207c7b5f824cceb60f4
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

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

  Log Message:
  -----------
  [#299] Refactor import ordering


  Commit: d8596eef9a0279ae8af672f1660d02b870320231
      https://github.com/okfn/ckan/commit/d8596eef9a0279ae8af672f1660d02b870320231
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M .travis.yml
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/search/index.py
    A ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/model/group_extra.py
    M ckan/model/package_extra.py
    M ckan/new_authz.py
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 299-bug-ckanext-tests-failures


  Commit: ae073ec25bee3a68f41a1f84c0f143c772940111
      https://github.com/okfn/ckan/commit/ae073ec25bee3a68f41a1f84c0f143c772940111
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M .travis.yml
    M ckan/config/middleware.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    M ckan/tests/ckantestplugin/setup.py
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M doc/writing-extensions.rst

  Log Message:
  -----------
  Merge branch '299-bug-ckanext-tests-failures'


Compare: https://github.com/okfn/ckan/compare/b9384609357c...ae073ec25bee

• Previous message: [ckan-changes] [okfn/ckan] 645e2d: [#299] Clear up changes to Pylons' config between ...
• Next message: [ckan-changes] [okfn/ckan] 50b548: [#299] Fix psql command line in datastore setup
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]