[ckan-changes] [okfn/ckan] 604229: Patch to compile less when minifying files

• Previous message: [ckan-changes] [okfn/ckan] 604229: Patch to compile less when minifying files
• Next message: [ckan-changes] [okfn/ckan] 604229: Patch to compile less when minifying files
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/2750-add-docs-and-examples-for-idatasetform-and-igroupform
  Home:   https://github.com/okfn/ckan
  Commit: 604229bb905a51f6f5fc41f4f07706f6d10bc3a4
      https://github.com/okfn/ckan/commit/604229bb905a51f6f5fc41f4f07706f6d10bc3a4
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Patch to compile less when minifying files


  Commit: 803ea54e2f7fbb48db30c213689fb74ef7d0e223
      https://github.com/okfn/ckan/commit/803ea54e2f7fbb48db30c213689fb74ef7d0e223
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.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/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
    A ckan/public/base/vendor/bootstrap/js/.jshintrc
    A ckan/public/base/vendor/bootstrap/js/bootstrap-affix.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-carousel.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-scrollspy.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
    M 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/tests/index.html
    A ckan/public/base/vendor/bootstrap/js/tests/phantom.js
    A ckan/public/base/vendor/bootstrap/js/tests/server.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-affix.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-alert.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-button.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-carousel.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-collapse.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-dropdown.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-modal.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-phantom.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-popover.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-scrollspy.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tab.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tooltip.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-transition.js
    A ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-typeahead.js
    A ckan/public/base/vendor/bootstrap/js/tests/vendor/jquery.js
    A ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.css
    A ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.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/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/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

  Log Message:
  -----------
  Merge branch '300-frontend-dependancies' into 354-ia-review


  Commit: fe934bca0539cfe480aa78ce44d6a87eae0f6796
      https://github.com/okfn/ckan/commit/fe934bca0539cfe480aa78ce44d6a87eae0f6796
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/public/base/less/variables.less

  Log Message:
  -----------
  [#354] Tweaked variables.less to remove uneeded junk


  Commit: 4032fc42a914cc22a4247f1c4620b56d7d86d087
      https://github.com/okfn/ckan/commit/4032fc42a914cc22a4247f1c4620b56d7d86d087
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html
    M ckan/templates/page.html

  Log Message:
  -----------
  [#354] Made pages full width


  Commit: dc0310eb98545364c4644f061d02f1a4da1b0343
      https://github.com/okfn/ckan/commit/dc0310eb98545364c4644f061d02f1a4da1b0343
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    A ckan/public/base/images/nav.png
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/home/about.html
    M ckan/templates/package/snippets/info.html

  Log Message:
  -----------
  [#354] Lot's of minor tweaks to individual pages


  Commit: fdbf7f7ee0fa03aaae8b507660053ac905848db5
      https://github.com/okfn/ckan/commit/fdbf7f7ee0fa03aaae8b507660053ac905848db5
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/variables.less
    M ckan/templates/header.html

  Log Message:
  -----------
  [#354] Added user masthead


  Commit: 690bbb03f81a1421a808e51e4fe4f85ad8891dcf
      https://github.com/okfn/ckan/commit/690bbb03f81a1421a808e51e4fe4f85ad8891dcf
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

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

  Log Message:
  -----------
  [#354] Updated placeholder images to use font awesome


  Commit: f209fd3b42706784c444e5007c6ca46681e569bd
      https://github.com/okfn/ckan/commit/f209fd3b42706784c444e5007c6ca46681e569bd
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/profile.less
    M ckan/templates/group/read_base.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/back_to_user_action.html

  Log Message:
  -----------
  [#354] Updated left side bar class and all relevant pages


  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: 8f07b4f15392df7fe6f37ca3219592c09779f335
      https://github.com/okfn/ckan/commit/8f07b4f15392df7fe6f37ca3219592c09779f335
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-05 (Tue, 05 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/cli.py
    A ckan/public/base/images/nav-active.png
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.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/variables.less
    M ckan/templates/group/about.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/package/about.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/snippets/info.html
    M ckan/templates/snippets/social.html

  Log Message:
  -----------
  [#354] Package pages now work within the new iA now


  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: b998a05b1bbbdd5e42a81d21a8ec6aec3d35a31d
      https://github.com/okfn/ckan/commit/b998a05b1bbbdd5e42a81d21a8ec6aec3d35a31d
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/package/base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  [#354] Moved action buttons and dataset page now works better


  Commit: 7ad5f1de07197f136ac5b7a5d73806790a418c25
      https://github.com/okfn/ckan/commit/7ad5f1de07197f136ac5b7a5d73806790a418c25
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    A ckan/public/base/images/bg.png
    M ckan/public/base/less/ckan.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/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    M ckan/templates/organization/edit_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/resources_list.html

  Log Message:
  -----------
  [#354] Added noise to background and a load of template tweaks


  Commit: 03d01cb868a9856bb8e872bbb89e57baaffe66e3
      https://github.com/okfn/ckan/commit/03d01cb868a9856bb8e872bbb89e57baaffe66e3
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  [#354] Tweaks to the groups and orgs templates


  Commit: 6929425c4462a9f0d699c34b3f29e8c871a78679
      https://github.com/okfn/ckan/commit/6929425c4462a9f0d699c34b3f29e8c871a78679
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/module.less
    M ckan/templates/package/base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read_base.html
    R ckan/templates/package/snippets/back_to_package_action.html
    A ckan/templates/package/snippets/package_context.html

  Log Message:
  -----------
  [#354] Few more tweaks to the templates


  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: c1f42eee382a60a3afafcd78d764ab669d0e2d9f
      https://github.com/okfn/ckan/commit/c1f42eee382a60a3afafcd78d764ab669d0e2d9f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/search/index.py

  Log Message:
  -----------
  [#381] Stop convert_from_extras() putting extra quotes around strings

Currently there are tests broken because of this, but they look like
just outdated asserts that are expecting to see the extra quotes.


  Commit: 1f2f6efbfc4d412c560ffeda551d3e7501935a11
      https://github.com/okfn/ckan/commit/1f2f6efbfc4d412c560ffeda551d3e7501935a11
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/schema.py
    M ckan/model/meta.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/less/forms.less
    M ckan/templates/admin/authz.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/read.html
    M ckan/tests/lib/test_dictization_schema.py
    M ckanext/datastore/plugin.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/resource.config
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.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/css/bootstrap-responsive.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.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/jquery.flot.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
    R 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/json/json2.js
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R 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.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.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
    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
    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
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    R 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/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.event.drag-2.0.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
    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.png
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
    A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.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

  Log Message:
  -----------
  Merge master


  Commit: 6cda8d7d2cab9352307d554d39ca0ff00d6c123e
      https://github.com/okfn/ckan/commit/6cda8d7d2cab9352307d554d39ca0ff00d6c123e
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M 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_base.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [#354] Simplified package templates around breadcrumbs


  Commit: e15f111373b58d03eaa50b1c59b4b3de25e6abf4
      https://github.com/okfn/ckan/commit/e15f111373b58d03eaa50b1c59b4b3de25e6abf4
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/resources_list.html

  Log Message:
  -----------
  [#354] Reverted some tweaks to the dataset page


  Commit: ef80704a59830688dc21bcb934cacf9f376ab8d6
      https://github.com/okfn/ckan/commit/ef80704a59830688dc21bcb934cacf9f376ab8d6
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [#354] Small tweaks to the homepage to make it work with the new layout.less


  Commit: a6e842510bd03fed0e1a3bd3088e2064910d476f
      https://github.com/okfn/ckan/commit/a6e842510bd03fed0e1a3bd3088e2064910d476f
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckan/templates/error_document_template.html

  Log Message:
  -----------
  [#354] Fixes error document in new iA


  Commit: ef0c5e6f33f722b2094b335ecf3080f05e7427ef
      https://github.com/okfn/ckan/commit/ef0c5e6f33f722b2094b335ecf3080f05e7427ef
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  [#354] Spaces not tabs


  Commit: ba48e8f1d461aa79460ef438af9c341eae07b8dc
      https://github.com/okfn/ckan/commit/ba48e8f1d461aa79460ef438af9c341eae07b8dc
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-12 (Tue, 12 Feb 2013)

  Changed paths:
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html

  Log Message:
  -----------
  [#354] Final tweaks to the header


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.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/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_activity.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:
  -----------
  #381 migrate db and get rid of all convert to extras calls


  Commit: 460afb906abd4b4535e24d959325fa546924817c
      https://github.com/okfn/ckan/commit/460afb906abd4b4535e24d959325fa546924817c
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

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

  Log Message:
  -----------
  [#354] Update for editing resources breadcrumbs


  Commit: 781973040c1eb23520c27a8e4067906c4829eb37
      https://github.com/okfn/ckan/commit/781973040c1eb23520c27a8e4067906c4829eb37
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less

  Log Message:
  -----------
  [#354] Moved homepage css


  Commit: 7afe230775d432235e061413e933a046f1c2601d
      https://github.com/okfn/ckan/commit/7afe230775d432235e061413e933a046f1c2601d
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/templates/snippets/group_item.html

  Log Message:
  -----------
  [#354] Small tweaks to the homepage


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

  Changed paths:
    M ckan/lib/create_test_data.py

  Log Message:
  -----------
  #381 fix sqlite errors


  Commit: 85d925c68ce6d9b9b6880f4fb3fa0cda2155477d
      https://github.com/okfn/ckan/commit/85d925c68ce6d9b9b6880f4fb3fa0cda2155477d
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    R ckan/public/base/less/follower-list.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/nav.less
    M ckan/templates/admin/authz.html
    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/header.html
    M ckan/templates/user/list.html
    M ckan/templates/user/snippets/followers.html

  Log Message:
  -----------
  [#354] Tweaks to sysadmin templates


  Commit: 6fc6a579331891983379cd68da0a422e2056b51d
      https://github.com/okfn/ckan/commit/6fc6a579331891983379cd68da0a422e2056b51d
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/templates/admin/authz.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html

  Log Message:
  -----------
  [#354] Added some helper text to the sysadmin pages


  Commit: 1f84a546f86c47fea6bd3ef3adf3afab4ba07ca5
      https://github.com/okfn/ckan/commit/1f84a546f86c47fea6bd3ef3adf3afab4ba07ca5
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/migration/versions/067_turn_extras_to_strings.py

  Log Message:
  -----------
  #381 add control charactors to migration


  Commit: e3bc093cd017f6a8fcdbd2f071cd9c23d4389096
      https://github.com/okfn/ckan/commit/e3bc093cd017f6a8fcdbd2f071cd9c23d4389096
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/user.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/model/activity.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/popover-context.js
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/masthead.less
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/home/index.html
    A ckan/templates/snippets/popover_context.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/snippets/followee_dropdown.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#354] Merge fixes for master


  Commit: 10cdaa7d0650dc4e5a3b802ef98457ff6eeb13ad
      https://github.com/okfn/ckan/commit/10cdaa7d0650dc4e5a3b802ef98457ff6eeb13ad
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  [#354] Merge fixes for masthead


  Commit: 17afa129e6aee6f2d16f58d365c7b6b86b8ca6c1
      https://github.com/okfn/ckan/commit/17afa129e6aee6f2d16f58d365c7b6b86b8ca6c1
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/public/base/less/dashboard.less
    M ckan/templates/user/dashboard.html

  Log Message:
  -----------
  [#354] Tweaks to dashboard after master merge


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

  Changed paths:
    M ckan/migration/versions/067_turn_extras_to_strings.py

  Log Message:
  -----------
  #381 make control charicter use x style escaping


  Commit: 085f105cb68d4ea7970ef011f444d18ba76b8636
      https://github.com/okfn/ckan/commit/085f105cb68d4ea7970ef011f444d18ba76b8636
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/migration/versions/067_turn_extras_to_strings.py

  Log Message:
  -----------
  #381 make double backslash at end of replace


  Commit: 252bed90ff422c125818cc6605049e9c0d57b971
      https://github.com/okfn/ckan/commit/252bed90ff422c125818cc6605049e9c0d57b971
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-13 (Wed, 13 Feb 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/dashboard.js

  Log Message:
  -----------
  [#253] Remove new activities count when hitting the dashboard the first time


  Commit: 65a176118fa4352dce548d121151ad4faad95576
      https://github.com/okfn/ckan/commit/65a176118fa4352dce548d121151ad4faad95576
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M ckan/migration/versions/067_turn_extras_to_strings.py

  Log Message:
  -----------
  #381 use python to do the dumping


  Commit: 883f668f4d539faff06b1fb83827050bc39fd3ed
      https://github.com/okfn/ckan/commit/883f668f4d539faff06b1fb83827050bc39fd3ed
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [#354] Homepage template fix from bad merge


  Commit: c3c2ed2743be5265625fcf643bf19ae70cc6bb11
      https://github.com/okfn/ckan/commit/c3c2ed2743be5265625fcf643bf19ae70cc6bb11
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-14 (Thu, 14 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/public/base/less/ckan.less
    M ckan/templates/header.html
    M ckan/templates/package/read.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    A ckan/templates/user/edit_base.html

  Log Message:
  -----------
  [#354] Simplifying the iA of the dashboard and edit profile pages


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

  Changed paths:
    M .gitignore
    A .travis.yml
    A CONTRIBUTING.rst
    M README.rst
    M ckan/__init__.py
    R ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-2.0.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    R ckan/controllers/group_formalchemy.py
    M ckan/controllers/home.py
    A ckan/controllers/organization.py
    M ckan/controllers/package.py
    R ckan/controllers/package_formalchemy.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    R ckan/forms/__init__.py
    R ckan/forms/authorization_group.py
    R ckan/forms/authz.py
    R ckan/forms/builder.py
    R ckan/forms/common.py
    R ckan/forms/group.py
    R ckan/forms/package.py
    R ckan/forms/package_dict.py
    R ckan/forms/registry.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    A ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    A ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    R ckan/logic/auth/publisher/__init__.py
    R ckan/logic/auth/publisher/create.py
    R ckan/logic/auth/publisher/delete.py
    R ckan/logic/auth/publisher/get.py
    R ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/063_org_changes.py
    A ckan/migration/versions/064_add_email_last_sent_column.py
    A ckan/migration/versions/065_add_email_notifications_preference.py
    A ckan/migration/versions/066_default_package_type.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/authz.py
    M ckan/model/dashboard.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/main.min.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/maroon.min.css
    M ckan/public/base/css/red.css
    M ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/css/json.css
    R ckan/public/base/datapreview/css/json.min.css
    R ckan/public/base/datapreview/css/pdf.css
    R ckan/public/base/datapreview/css/pdf.min.css
    R ckan/public/base/datapreview/css/recline.css
    R ckan/public/base/datapreview/css/recline.min.css
    R ckan/public/base/datapreview/img/ajaxload-circle.gif
    R ckan/public/base/datapreview/preview_json.js
    R ckan/public/base/datapreview/preview_json.min.js
    R ckan/public/base/datapreview/preview_pdf.js
    R ckan/public/base/datapreview/preview_pdf.min.js
    R ckan/public/base/datapreview/preview_recline.js
    R ckan/public/base/datapreview/preview_recline.min.js
    R ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/backbone/backbone.js
    R ckan/public/base/datapreview/vendor/backbone/backbone.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
    R ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    R ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    R ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.js
    R ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    R ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.js
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
    R ckan/public/base/datapreview/vendor/moment/moment.js
    R ckan/public/base/datapreview/vendor/moment/moment.min.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.js
    R ckan/public/base/datapreview/vendor/mustache/mustache.min.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    R ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    R ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    R ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    R ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    R ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
    R ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
    R ckan/public/base/datapreview/vendor/recline/css/recline.css
    R ckan/public/base/datapreview/vendor/recline/css/recline.min.css
    R ckan/public/base/datapreview/vendor/recline/recline.js
    R ckan/public/base/datapreview/vendor/recline/recline.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
    R ckan/public/base/datapreview/vendor/slickgrid/README.txt
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
    R ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
    R ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.js
    R ckan/public/base/datapreview/vendor/underscore/underscore.min.js
    R ckan/public/base/datapreview/vendor/webL10n/README.md
    R ckan/public/base/datapreview/vendor/webL10n/l10n.js
    R ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
    A ckan/public/base/images/dashboard-followee-related.png
    A ckan/public/base/images/editing.png
    A ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/placeholder-group.png
    A ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/client.min.js
    M ckan/public/base/javascript/module.min.js
    A ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/modules/dashboard.js
    A ckan/public/base/javascript/modules/dashboard.min.js
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/javascript/modules/data-viewer.min.js
    A ckan/public/base/javascript/modules/follow.min.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/resource.config
    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/dropdown.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/group.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/less/profile.less
    M ckan/public/base/less/variables.less
    A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
    M ckan/public/base/vendor/resource.config
    A ckan/templates/activity_streams/activity_stream_email_notifications.text
    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/base.html
    R ckan/templates/dataviewer/json.html
    R ckan/templates/dataviewer/pdf.html
    R ckan/templates/dataviewer/recline.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/page_header.html
    M ckan/templates/footer.html
    M ckan/templates/group/base_form_page.html
    A ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/index.html
    A ckan/templates/group/member_new.html
    A ckan/templates/group/members.html
    M ckan/templates/group/read.html
    A ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/form.html
    A ckan/templates/organization/about.html
    A ckan/templates/organization/admins.html
    A ckan/templates/organization/base_form_page.html
    A ckan/templates/organization/confirm_delete.html
    A ckan/templates/organization/confirm_delete_member.html
    A ckan/templates/organization/edit.html
    A ckan/templates/organization/edit_base.html
    A ckan/templates/organization/index.html
    A ckan/templates/organization/member_new.html
    A ckan/templates/organization/members.html
    A ckan/templates/organization/new.html
    A ckan/templates/organization/new_organization_form.html
    A ckan/templates/organization/read.html
    A ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/feeds.html
    A ckan/templates/organization/snippets/info.html
    A ckan/templates/organization/snippets/organization_form.html
    A ckan/templates/organization/snippets/organization_item.html
    A ckan/templates/organization/snippets/organization_list.html
    A ckan/templates/package/activity.html
    A ckan/templates/package/activity_stream.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/page.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/facet_list.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    A ckan/templates/snippets/organization.html
    A ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    A ckan/templates/snippets/page_header.html
    A ckan/templates/snippets/private.html
    M ckan/templates/snippets/related.html
    A ckan/templates/tests/mock_json_resource_preview_template.html
    A ckan/templates/tests/mock_resource_preview_template.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read.html
    A ckan/templates/user/read_base.html
    A ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/templates_legacy/admin/index.html
    M ckan/templates_legacy/admin/layout.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/forms/__init__.py
    R ckan/tests/forms/test_authz.py
    R ckan/tests/forms/test_group.py
    R ckan/tests/forms/test_package.py
    M ckan/tests/functional/api/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    A ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authz.py
    R ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/functional/test_pagination.py
    A ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_publisher_auth.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    R ckan/tests/lib/test_authztool.py
    A ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    A ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    R ckan/tests/misc/test_auth_profiles.py
    M ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_package_saver.py
    M ckan/tests/mock_mail_server.py
    M ckan/tests/mock_publisher_auth.py
    R ckan/tests/models/test_authz.py
    M ckan/tests/models/test_group.py
    R ckan/tests/models/test_repo.py
    R ckan/tests/test_authz.py
    M ckan_deb/usr/lib/ckan/common.sh
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.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
    A ckanext/jsonpreview/__init__.py
    A ckanext/jsonpreview/plugin.py
    A ckanext/jsonpreview/tests/__init__.py
    A ckanext/jsonpreview/tests/test_preview.py
    A ckanext/jsonpreview/theme/public/css/json.css
    A ckanext/jsonpreview/theme/public/css/json.min.css
    A ckanext/jsonpreview/theme/public/preview_json.js
    A ckanext/jsonpreview/theme/public/preview_json.min.js
    A ckanext/jsonpreview/theme/public/resource.config
    A ckanext/jsonpreview/theme/templates/json.html
    M ckanext/multilingual/solr/schema.xml
    A ckanext/pdfpreview/__init__.py
    A ckanext/pdfpreview/plugin.py
    A ckanext/pdfpreview/tests/__init__.py
    A ckanext/pdfpreview/tests/test_preview.py
    A ckanext/pdfpreview/theme/public/css/pdf.css
    A ckanext/pdfpreview/theme/public/css/pdf.min.css
    A ckanext/pdfpreview/theme/public/css/recline.css
    A ckanext/pdfpreview/theme/public/css/recline.min.css
    A ckanext/pdfpreview/theme/public/img/ajaxload-circle.gif
    A ckanext/pdfpreview/theme/public/preview_pdf.js
    A ckanext/pdfpreview/theme/public/preview_pdf.min.js
    A ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    A ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/texture.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/README.md
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    A ckanext/pdfpreview/theme/templates/pdf.html
    A ckanext/reclinepreview/__init__.py
    A ckanext/reclinepreview/plugin.py
    A ckanext/reclinepreview/tests/__init__.py
    A ckanext/reclinepreview/tests/test_preview.py
    A ckanext/reclinepreview/theme/public/css/recline.css
    A ckanext/reclinepreview/theme/public/css/recline.min.css
    A ckanext/reclinepreview/theme/public/img/ajaxload-circle.gif
    A ckanext/reclinepreview/theme/public/preview_recline.js
    A 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
    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
    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
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.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
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A 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
    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
    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
    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
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    A 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
    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
    A ckanext/reclinepreview/theme/templates/recline.html
    A ckanext/resourceproxy/__init__.py
    A ckanext/resourceproxy/controller.py
    A ckanext/resourceproxy/plugin.py
    A ckanext/resourceproxy/tests/__init__.py
    A ckanext/resourceproxy/tests/file_server.py
    A ckanext/resourceproxy/tests/static/huge.json
    A ckanext/resourceproxy/tests/static/test.json
    A ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    A doc/architecture.rst
    R doc/buildbot.rst
    R doc/coding-standards.rst
    M doc/configuration.rst
    A doc/css-coding-standards.rst
    M doc/datastore-api.rst
    M doc/datastore-setup.rst
    M doc/datastore.rst
    R doc/domain-model-dataset.rst
    R doc/domain-model-resource.rst
    R doc/domain-model-task-status.rst
    R doc/domain-model.rst
    A doc/email-notifications.rst
    A doc/frontend-testing.rst
    A doc/html-coding-standards.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/javascript-coding-standards.rst
    A doc/migration.rst
    A doc/organizations_and_groups.rst
    A doc/python-coding-standards.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M doc/toolkit.rst
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into compile-less-via-paster


  Commit: 63a4a5081c8782ca0b439688d0e36b825f89409b
      https://github.com/okfn/ckan/commit/63a4a5081c8782ca0b439688d0e36b825f89409b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M ckan/lib/cli.py
    M setup.py

  Log Message:
  -----------
  Add front-end-build paste command


  Commit: 4a067ff87ca893d709cdb93d21cb88df78222d7f
      https://github.com/okfn/ckan/commit/4a067ff87ca893d709cdb93d21cb88df78222d7f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Improve docsting for paster less


  Commit: 2e8f7f9ddcbad4164b9daf099db0b21353267920
      https://github.com/okfn/ckan/commit/2e8f7f9ddcbad4164b9daf099db0b21353267920
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#402] Fix password visibility


  Commit: 5809fa061ebbdf6102e39f58badfabe1405203c3
      https://github.com/okfn/ckan/commit/5809fa061ebbdf6102e39f58badfabe1405203c3
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M ckan/controllers/admin.py

  Log Message:
  -----------
  [#409] Remove authz admin functionality from controller


  Commit: 313b1b3794d9d8bac0c7753b27fb444f30fdd89a
      https://github.com/okfn/ckan/commit/313b1b3794d9d8bac0c7753b27fb444f30fdd89a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    R ckan/templates/admin/authz.html

  Log Message:
  -----------
  [#409] Remove authz admin template


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

  Changed paths:
    M ckan/templates/admin/snippets/header.html

  Log Message:
  -----------
  [#409] Remove authz admin from menu


  Commit: 61aacc8f106b13e65f48a1759e9aded019359555
      https://github.com/okfn/ckan/commit/61aacc8f106b13e65f48a1759e9aded019359555
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/datastore.py
    R ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  [#362][s]: remove controller, routing and test code related to old (ES) datastore.

Note, have not removed (and will not remove) references to old datastore in:

* templates_legacy (assume these will get removed anyway)
* i18n (assume this will get rebuilt prior to release)


  Commit: 27361b88e1b8fe2167f83bd9cb5cf70e953ce052
      https://github.com/okfn/ckan/commit/27361b88e1b8fe2167f83bd9cb5cf70e953ce052
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2013-02-15 (Fri, 15 Feb 2013)

  Changed paths:
    M ckan/controllers/package.py
    R ckan/templates/package/resource_api_data.html
    M ckan/templates/package/snippets/data_api_button.html

  Log Message:
  -----------
  [#362,bugfix][s]: remove remaining reference to routing for old datastore (by removing api_data method in package controller).

The ultimate change was reasonably substantial - removal of an entire method on
a controller and associated template. It began simply with the need to
remove/update reference this routing call in api_data method on package
controller

    url = h.url_for('datastore_read', id=id, qualified=True)

I spent about half an hour trying to understand if this method was used at all.

I ultimately determined that we had a setup where clicking on the Data API
button in the resource view had 2 possible effect routes:

* Via href={url} => package.py/api_data method =>
  template/package/resource_api_data.html =>
  template/ajax_snippets/api_info.html
* Via JS intercept of click => api/snippets controller =>
  template/ajax_snippets/api_info.html

But there was a subtle difference: the first route (which is *not* normally
followed since JS is usally enabled) still uses the old datastore URL (this is
why I'd started this investigation!).

(Aside: this was hard to debug through the interface as JS is enabled and I
note we do not have resource view tests so the non AJAX route is not tested).

I first tried to correct this by setting the URL to the correct datastore API
but then discovered other parameters were missing - it seems the signature of
the call to ajax_snippets template has changed but that the relevant code in
package/resource_data_api.html has not been updated:

    {% snippet 'ajax_snippets/api_info.html', datastore_root_url=datastore_root_url, embedded=true %}

Rather than continue fixing I decided at this point to remove this non-AJAX
fallback code in its entirety.

Comment: this was a subtle bug that has crept in because there are now 2 ways to do
something and one of these routes (the non-AJAX route) is almost never used ...

I wonder whether it is necessary always to have both options (AJAX and
non-AJAX) as it likely to multiply code complexity and, hence, these sort of bugs.


  Commit: 3c1313b816680b65bf15416569b385c9699c94e5
      https://github.com/okfn/ckan/commit/3c1313b816680b65bf15416569b385c9699c94e5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

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

  Log Message:
  -----------
  [#412] Allow any valid url schemes for resource urls


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

  Changed paths:
    M ckan/templates/package/snippets/data_api_button.html

  Log Message:
  -----------
  [#362] Fix api info for non-js browsing


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

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

  Log Message:
  -----------
  [#241] Use human readable info when we cannot follow


  Commit: 35340ffc7e78f82049318ecd9048e79367428c59
      https://github.com/okfn/ckan/commit/35340ffc7e78f82049318ecd9048e79367428c59
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

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

  Log Message:
  -----------
  [#241] Fix display name for user


  Commit: 5af18d77590cd5ff9eb872a54f38a01f2ac585c8
      https://github.com/okfn/ckan/commit/5af18d77590cd5ff9eb872a54f38a01f2ac585c8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

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

  Log Message:
  -----------
  [#241] Learn to spell


  Commit: 4ad8f1245336015e6841fe36c12ccc9f1b9d0951
      https://github.com/okfn/ckan/commit/4ad8f1245336015e6841fe36c12ccc9f1b9d0951
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

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

  Log Message:
  -----------
  [#241] Actually get the package for the display name


  Commit: 0fe757949f244ab935e49c619f2603e16659e29b
      https://github.com/okfn/ckan/commit/0fe757949f244ab935e49c619f2603e16659e29b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

  Changed paths:
    M ckan/templates/package/snippets/data_api_button.html

  Log Message:
  -----------
  [#362] Fix broken test code


  Commit: 67758257746ec64b09be04e1a4fa94ccc6627068
      https://github.com/okfn/ckan/commit/67758257746ec64b09be04e1a4fa94ccc6627068
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

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

  Log Message:
  -----------
  [#241] Sometimes it is good to read the code before commiting a change


  Commit: 46534b10f3bd28579c13e13612fc55bda3566691
      https://github.com/okfn/ckan/commit/46534b10f3bd28579c13e13612fc55bda3566691
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-18 (Mon, 18 Feb 2013)

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

  Log Message:
  -----------
  [#241] Fix another typo


  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: 26c75e5e93a449db075ec7ee8f615eb8138aa8a3
      https://github.com/okfn/ckan/commit/26c75e5e93a449db075ec7ee8f615eb8138aa8a3
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M ckan/lib/cli.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #176 from okfn/compile-less-via-paster

Patch to compile less when minifying files - updated logic


  Commit: 90a6ef2f170ae6ca9720955fb48ab8491a4bb5d7
      https://github.com/okfn/ckan/commit/90a6ef2f170ae6ca9720955fb48ab8491a4bb5d7
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge pull request #402 from okfn/402-password-in-clear

New password not hidden when changing password


  Commit: 2bce23c96833ebe31970c125fb18ed9b71112f50
      https://github.com/okfn/ckan/commit/2bce23c96833ebe31970c125fb18ed9b71112f50
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/logic/schema.py
    M ckan/plugins/core.py
    M ckan/public/base/css/main.css
    R ckan/public/base/javascript/modules/popover-context.min.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/main.less
    R ckan/public/base/less/popover-context.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
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    A ckan/public/base/vendor/bootstrap/js/.jshintrc
    R ckan/public/base/vendor/bootstrap/js/bootstrap-affix.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-carousel.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-scrollspy.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    R ckan/public/base/vendor/bootstrap/js/tests/index.html
    R ckan/public/base/vendor/bootstrap/js/tests/phantom.js
    R ckan/public/base/vendor/bootstrap/js/tests/server.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-affix.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-alert.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-button.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-carousel.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-collapse.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-dropdown.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-modal.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-phantom.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-popover.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-scrollspy.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tab.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-tooltip.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-transition.js
    R ckan/public/base/vendor/bootstrap/js/tests/unit/bootstrap-typeahead.js
    R ckan/public/base/vendor/bootstrap/js/tests/vendor/jquery.js
    R ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.css
    R ckan/public/base/vendor/bootstrap/js/tests/vendor/qunit.js
    A ckan/public/base/vendor/bootstrap/less/accordion.less
    R ckan/public/base/vendor/bootstrap/less/accordion.less
    A ckan/public/base/vendor/bootstrap/less/alerts.less
    R ckan/public/base/vendor/bootstrap/less/alerts.less
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    R ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    A 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
    A ckan/public/base/vendor/bootstrap/less/code.less
    R ckan/public/base/vendor/bootstrap/less/code.less
    R ckan/public/base/vendor/bootstrap/less/component-animations.less
    A 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
    A ckan/public/base/vendor/bootstrap/less/grid.less
    R ckan/public/base/vendor/bootstrap/less/grid.less
    R ckan/public/base/vendor/bootstrap/less/hero-unit.less
    A ckan/public/base/vendor/bootstrap/less/hero-unit.less
    M ckan/public/base/vendor/bootstrap/less/labels-badges.less
    R ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/layouts.less
    M ckan/public/base/vendor/bootstrap/less/media.less
    M ckan/public/base/vendor/bootstrap/less/mixins.less
    A ckan/public/base/vendor/bootstrap/less/modals.less
    R 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
    R ckan/public/base/vendor/bootstrap/less/progress-bars.less
    A ckan/public/base/vendor/bootstrap/less/progress-bars.less
    R ckan/public/base/vendor/bootstrap/less/reset.less
    A ckan/public/base/vendor/bootstrap/less/reset.less
    R ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    A ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    A ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    R 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
    R ckan/public/base/vendor/bootstrap/less/tests/buttons.html
    A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
    R ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
    A ckan/public/base/vendor/bootstrap/less/tests/forms.html
    R ckan/public/base/vendor/bootstrap/less/tests/forms.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    R ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    R ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    R 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
    A ckan/public/base/vendor/bootstrap/less/utilities.less
    R ckan/public/base/vendor/bootstrap/less/utilities.less
    M ckan/public/base/vendor/bootstrap/less/variables.less
    A ckan/public/base/vendor/bootstrap/less/wells.less
    R ckan/public/base/vendor/bootstrap/less/wells.less
    M ckan/public/base/vendor/resource.config
    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/footer.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.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
    R ckan/templates/snippets/popover_context.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_package.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/preview_recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.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.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.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.ie.min.css
    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
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.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.min.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
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    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.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    M doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merged master


  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: 071798263c99e94ce7d95ae4ec6a0295593a8836
      https://github.com/okfn/ckan/commit/071798263c99e94ce7d95ae4ec6a0295593a8836
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/layout.less
    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/user/dashboard.html

  Log Message:
  -----------
  [#354] Lot's of tweaks from after #300 merge


  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: 8208584c3b9cf662a120d35a8af6c6ed820781fb
      https://github.com/okfn/ckan/commit/8208584c3b9cf662a120d35a8af6c6ed820781fb
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

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

  Log Message:
  -----------
  [#412] Switch to use urlparse


  Commit: de894c0ea8e1c5ad0a23b7150760296bd57c15a1
      https://github.com/okfn/ckan/commit/de894c0ea8e1c5ad0a23b7150760296bd57c15a1
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/templates/package/snippets/data_api_button.html

  Log Message:
  -----------
  [#362] Fix datastore active check and misleading message


  Commit: 5aab872c4925d807ad549c3e36af585e2ce73c54
      https://github.com/okfn/ckan/commit/5aab872c4925d807ad549c3e36af585e2ce73c54
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/controllers/admin.py
    R ckan/templates/admin/authz.html
    M ckan/templates/admin/snippets/header.html

  Log Message:
  -----------
  Merge pull request #409 from okfn/409-kill-old-admin

Remove old auth page


  Commit: 032c779d3c1455ba34603999445b3d26afebd5dd
      https://github.com/okfn/ckan/commit/032c779d3c1455ba34603999445b3d26afebd5dd
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/datastore.py
    M ckan/controllers/package.py
    R ckan/templates/package/resource_api_data.html
    M ckan/templates/package/snippets/data_api_button.html
    R ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  Merge branch '362-remove-old-datastore'

Conflicts:
	ckan/templates/package/snippets/data_api_button.html


  Commit: f8089c9598ff26f07b05eb7a24faf75175f333db
      https://github.com/okfn/ckan/commit/f8089c9598ff26f07b05eb7a24faf75175f333db
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/controllers/admin.py
    R ckan/templates/admin/authz.html
    M ckan/templates/admin/snippets/header.html

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


  Commit: 4ed2976ab8ef6d56e6455f54e38c3293e7ce9008
      https://github.com/okfn/ckan/commit/4ed2976ab8ef6d56e6455f54e38c3293e7ce9008
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    R ckan/templates/admin/authz.html
    M ckan/templates/admin/base.html

  Log Message:
  -----------
  [#354] Removed ready for master merge


  Commit: a23679d8c3b47b099c1919f2991c2a0e0af2d821
      https://github.com/okfn/ckan/commit/a23679d8c3b47b099c1919f2991c2a0e0af2d821
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/controllers/admin.py

  Log Message:
  -----------
  Merged master


  Commit: c6ace53ecd2d74f2a3e47b1c0b7fd96f759838bb
      https://github.com/okfn/ckan/commit/c6ace53ecd2d74f2a3e47b1c0b7fd96f759838bb
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html

  Log Message:
  -----------
  [#354] Adds username to header


  Commit: 9dd058ef8f9441f5f6d0f8da5916a2812cff711c
      https://github.com/okfn/ckan/commit/9dd058ef8f9441f5f6d0f8da5916a2812cff711c
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  Small template tweaks


  Commit: be6c301ddf4df488f34c76d1fb9f7548252ac902
      https://github.com/okfn/ckan/commit/be6c301ddf4df488f34c76d1fb9f7548252ac902
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/new_authz.py
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  Adds helper text and other tweaks to templates


  Commit: 01c7cc9bc146d58438e3c4b1119c09f958d62257
      https://github.com/okfn/ckan/commit/01c7cc9bc146d58438e3c4b1119c09f958d62257
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  Use ordered dict


  Commit: 4c147ad0474a8d8babd6981cc0b5e2489e14307c
      https://github.com/okfn/ckan/commit/4c147ad0474a8d8babd6981cc0b5e2489e14307c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/new_authz.py
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  Translate roles


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Fix default role


  Commit: 65e00131e7786e9233cad23aaa65a3028a2599e8
      https://github.com/okfn/ckan/commit/65e00131e7786e9233cad23aaa65a3028a2599e8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/new_authz.py

  Log Message:
  -----------
  Get proper role for member edit


  Commit: 31d384534bdf3400d39641d4b7ca530ac0a3c25a
      https://github.com/okfn/ckan/commit/31d384534bdf3400d39641d4b7ca530ac0a3c25a
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  Tweaked column width for after boostrap upgrade from master


  Commit: 14716b77366f14d6689ea46cf0ec6e5b8b6e021b
      https://github.com/okfn/ckan/commit/14716b77366f14d6689ea46cf0ec6e5b8b6e021b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Fix user dict issue


  Commit: 7aed53436a4e8f31a78c0ba9b7834579dd21e3ac
      https://github.com/okfn/ckan/commit/7aed53436a4e8f31a78c0ba9b7834579dd21e3ac
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [#423] Update related items urls


  Commit: c9f10108d7792ecb7939fffb8997355009c40119
      https://github.com/okfn/ckan/commit/c9f10108d7792ecb7939fffb8997355009c40119
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/datastore.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/logic/action/get.py
    M ckan/new_authz.py
    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

  Log Message:
  -----------
  Merged master


  Commit: 3e072c60416c61d9048009abafb78667b38ff888
      https://github.com/okfn/ckan/commit/3e072c60416c61d9048009abafb78667b38ff888
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Use db_to_form_package_schema() by default

Make DefaultDatasetForm's db_to_form_schema() method return
db_to_form_package_schema() rather than None, so that validation against
db_to_form_package_schema() is done by default, even when there's no
IDatasetForm plugin active.

The reason for this is that bugs in db_to_form_package_schema() can
cause pages to crash, features to stop working, etc., but the tests
currently do not catch these bugs because db_to_form_package_schema() is
only used when an IDatasetForm plugin that returns a schema based on
db_to_form_package_schema() is active, and no such plugin is active when
the tests run.


  Commit: 91086acdecc7f31593f0eaaf694f1159e9be8892
      https://github.com/okfn/ckan/commit/91086acdecc7f31593f0eaaf694f1159e9be8892
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  Show vocab tags as normal tags by default

Commit 77663865a changed the default behaviour of vocab tags so that
they are _not_ shown as normal tags (e.g. on the dataset read and search
pages). I thought this was a good idea because it's weird when you use
tag vocabulary to add a custom field, to see that tag also appear in the
normal tags. However, changing this behaviour breaks some tests, so I'm
changing it back!

If an extension is using a tag vocabulary to add a custom field, and it
doesn't want tags from that vocabulary to appear alongside normal tags,
then the extension can add the freet_tags_only converter to the schema
itself.


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

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  [#267] Change debug message from info to debug


  Commit: 852e9d83e82c9e380f5c94de479cee4fad14df85
      https://github.com/okfn/ckan/commit/852e9d83e82c9e380f5c94de479cee4fad14df85
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  [#435] Add support for OrderedDict to python < 2.7


  Commit: 8abc473144816061b533d9321673834e63016c1c
      https://github.com/okfn/ckan/commit/8abc473144816061b533d9321673834e63016c1c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Merge pull request #367 from okfn/367-less-noise-on-app-start

Deprecation warning in default set up


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

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  [#435] Use OrderedDict in sqlalchemy


  Commit: 58a24be98c25dd46588ca5bcc4ad7b51f07c4a0d
      https://github.com/okfn/ckan/commit/58a24be98c25dd46588ca5bcc4ad7b51f07c4a0d
  Author: John Glover <j at johnglover.net>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  [#426] Update Recline to latest master.

Includes fixes for some bugs with the graph
'bars' plot.

See https://github.com/okfn/recline/pull/324
and https://github.com/okfn/recline/pull/325


  Commit: 6fd1a215238a9d89b4528d6d8f41274e2978f6e5
      https://github.com/okfn/ckan/commit/6fd1a215238a9d89b4528d6d8f41274e2978f6e5
  Author: Stefan Wehrmeyer <mail at stefanwehrmeyer.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Replace all Gravatar URLs with scheme relative URLs

If the site is deployed under https the insecure
gravatar embed will prevent the browser from
showing a nice green logo. Loading everything
over the same schema is sensible.


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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge pull request #434 from okfn/secure-gravatar-url

Replace all gravatar http URLs with scheme relative URLs


  Commit: 67a4fa484bd4b97a0cf1fa607a3b747e85984ed0
      https://github.com/okfn/ckan/commit/67a4fa484bd4b97a0cf1fa607a3b747e85984ed0
  Author: kindly <kindly at gmail.com>
  Date:   2013-02-20 (Wed, 20 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/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/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.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/new_authz.py
    M ckan/plugins/core.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
    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/popover-context.js
    R ckan/public/base/javascript/modules/popover-context.min.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/javascript/resource.config
    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
    R ckan/public/base/less/popover-context.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/activity_streams/activity_stream_items.html
    R ckan/templates/admin/authz.html
    M ckan/templates/admin/snippets/header.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/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/footer.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/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/package/base_form_page.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
    R ckan/templates/package/resource_api_data.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/related/dashboard.html
    M ckan/templates/snippets/activity_item.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/group_item.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_user_form.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
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_dictization.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/preview_recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.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.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.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.ie.min.css
    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
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.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.min.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
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    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.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    M doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  381 merge conflicts master


  Commit: 5475bc645ac7cdbb4000fde8d5020d8945473efd
      https://github.com/okfn/ckan/commit/5475bc645ac7cdbb4000fde8d5020d8945473efd
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-20 (Wed, 20 Feb 2013)

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

  Log Message:
  -----------
  [#435] fix 2.6 nose issue


  Commit: ba1d68997cf1ce1d67ac1c6893f0925337e29edb
      https://github.com/okfn/ckan/commit/ba1d68997cf1ce1d67ac1c6893f0925337e29edb
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  Merge branch '426-recline-graph-fixes'


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  [#435] Add python 2.6 to travis tests


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

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  Merge pull request #423 from okfn/423-new-related-url

Related link should be called related


  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: 4a93fb7d7cc151c4ff825da14aa1eaffde8095f3
      https://github.com/okfn/ckan/commit/4a93fb7d7cc151c4ff825da14aa1eaffde8095f3
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [#354] Removed uneeded route


  Commit: cfec3dc4dea73d2ee9b03dbeda76a13bf618c63f
      https://github.com/okfn/ckan/commit/cfec3dc4dea73d2ee9b03dbeda76a13bf618c63f
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  [#354] Removed references to delete files


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  [#435] Add python 2.5 to travis tests


  Commit: 1ec2077c7afc570a8664b5dd1d3434456854cda0
      https://github.com/okfn/ckan/commit/1ec2077c7afc570a8664b5dd1d3434456854cda0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Revert "[#435] Add python 2.5 to travis tests"

This reverts commit c775013efe7f975a35324e725c754b10de4d8f2d.


  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: 37bb5b0e85fe1359fd33ae8bd56b82988d734805
      https://github.com/okfn/ckan/commit/37bb5b0e85fe1359fd33ae8bd56b82988d734805
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/masthead.less
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/about.html
    M ckan/templates/header.html
    M ckan/templates/organization/about.html
    R ckan/templates/package/about.html
    M ckan/templates/package/read.html
    M ckan/templates/package/search.html
    M ckan/templates/user/edit_base.html

  Log Message:
  -----------
  [#354] Tweaks from first round of code review


  Commit: 2894673c8d957a64e29e78d0e9e6b534e901a2ce
      https://github.com/okfn/ckan/commit/2894673c8d957a64e29e78d0e9e6b534e901a2ce
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [#354] Removed old about dataset route


  Commit: 43eea9b693bc91833251c696e737a75e5597a240
      https://github.com/okfn/ckan/commit/43eea9b693bc91833251c696e737a75e5597a240
  Author: tobes <toby.junk at gmail.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 '354-ia-review'


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

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Recompile less for master


  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: 479251759d95dd2567a717187aa556f476fcbb91
      https://github.com/okfn/ckan/commit/479251759d95dd2567a717187aa556f476fcbb91
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read.html

  Log Message:
  -----------
  Adds 'add dataset' button back in


  Commit: 4938836825a87eec7942b89ba4716197c08515a3
      https://github.com/okfn/ckan/commit/4938836825a87eec7942b89ba4716197c08515a3
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  Removed add dataset from header


  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: 7c138f7d897b5928eac9d0766442f7ceb6ef7f89
      https://github.com/okfn/ckan/commit/7c138f7d897b5928eac9d0766442f7ceb6ef7f89
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.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
    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 381-convert-from-extras-quoting


  Commit: ec78532c862d34b57d7a6dee6f801ea63a21e026
      https://github.com/okfn/ckan/commit/ec78532c862d34b57d7a6dee6f801ea63a21e026
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-21 (Thu, 21 Feb 2013)

  Changed paths:
    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/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_activity.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 '381-convert-from-extras-quoting'


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

  Changed paths:
    M .travis.yml
    M ckan/new_authz.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  Merge pull request #435 from okfn/435-python-support-ordereddict

Python 2.6 support


  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'


  Commit: 5539a64ca99f892fad3c48f390c5fafc4139ca57
      https://github.com/okfn/ckan/commit/5539a64ca99f892fad3c48f390c5fafc4139ca57
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

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

  Log Message:
  -----------
  Merge pull request #412 from okfn/412-resource-url-sceme-fix

Data Hub: Automatic prepending of http:// to resource URLs breaks FTP and Git URLs


  Commit: ca990ee1231a4a0abd543cd4233b9ec4ff03ec0d
      https://github.com/okfn/ckan/commit/ca990ee1231a4a0abd543cd4233b9ec4ff03ec0d
  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/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/controllers/related.py
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.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/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.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/plugins/core.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/bg.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.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/javascript/modules/popover-context.js
    R ckan/public/base/javascript/modules/popover-context.min.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/javascript/resource.config
    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
    R ckan/public/base/less/follower-list.less
    A ckan/public/base/less/font-awesome.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/main.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
    R ckan/public/base/less/popover-context.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
    R ckan/templates/admin/authz.html
    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
    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/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/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/index.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/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.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
    R ckan/templates/package/resource_api_data.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/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/snippets/activity_item.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/group_item.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/popover_context.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/edit_user_form.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
    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/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.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
    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/reclinepreview/theme/public/preview_recline.js
    R ckanext/reclinepreview/theme/public/preview_recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.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.min.css
    A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
    A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
    A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
    A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
    A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
    A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
    M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.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.ie.min.css
    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
    A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.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
    A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.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.min.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
    A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    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.min.js
    A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    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
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 253-remove-dashboard-notifications-count-reset


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

  Changed paths:
    M ckan/public/base/javascript/modules/dashboard.js

  Log Message:
  -----------
  Merge branch '253-remove-dashboard-notifications-count-reset'


  Commit: 8744ea4a2e8ff060c910a05b72a308674b622a9d
      https://github.com/okfn/ckan/commit/8744ea4a2e8ff060c910a05b72a308674b622a9d
  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/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/controllers/related.py
    M ckan/lib/cli.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/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.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/plugins/core.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/bg.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.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/javascript/modules/dashboard.js
    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
    R ckan/public/base/less/follower-list.less
    A ckan/public/base/less/font-awesome.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/main.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
    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
    R ckan/templates/admin/authz.html
    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/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/error_document_template.html
    M ckan/templates/group/about.html
    M ckan/templates/group/index.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/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.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
    R ckan/templates/package/resource_api_data.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/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/snippets/activity_item.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/home_breadcrumb_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/edit_user_form.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
    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/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.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
    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/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    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
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 241-better-following-errors


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#241] Use proper names in follower success flash messages

Use user display names and group and package titles, not IDs, in "You
are now following..." and "You are no longer following..." flash
messages.


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

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

  Log Message:
  -----------
  [#241] Tweak "You are already following..." flash messages

To make them consistent with the "You are now following..." and "You are
no longer following..." messages, just say e.g. "You are now following
{name}" not "You are now following dataset {name}".


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Merge branch '241-better-following-errors'


  Commit: 15bf450a9493fd78596629d475ee3493bdafa6b4
      https://github.com/okfn/ckan/commit/15bf450a9493fd78596629d475ee3493bdafa6b4
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [#296] Fix delete related auth checks


  Commit: 577ae56e1c9ad8e63183c1fbb96636bfaf34c27c
      https://github.com/okfn/ckan/commit/577ae56e1c9ad8e63183c1fbb96636bfaf34c27c
  Author: John Martin <me at johnmart.in>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

  Changed paths:
    M ckan/public/base/less/activity.less

  Log Message:
  -----------
  [#237] Fixes #237 by using position:absolute and not float:left


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

  Changed paths:
    M ckan/migration/versions/064_add_email_last_sent_column.py

  Log Message:
  -----------
  [#294] Add default values to migration 64

Add a default value to the email_last_sent column that is added in
migration script 64. This fixes a crash when upgrading the database, if
the dashboard table already contained data.

Fixes #294.


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

  Changed paths:
    M ckan/public/base/less/activity.less

  Log Message:
  -----------
  Merge branch '237-activity-stream-wrapping'


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

  Changed paths:
    A ckanext/example_itemplatehelpers/__init__.py
    A ckanext/example_itemplatehelpers/plugin.py
    A ckanext/example_itemplatehelpers/templates/home/index.html
    M setup.py

  Log Message:
  -----------
  Add an example ITemplateHelpers extension


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

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Improve the ITemplateHelpers docstrings

Just make the docstrings a bit clearer and more explicit, and reference
the new example_itemplatehelpers extension.


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

  Changed paths:
    M ckanext/example_itemplatehelpers/plugin.py

  Log Message:
  -----------
  example_itemplatehelpers use a function not a method

It's not a good idea for template helper functions to be class methods,
because self is not thread-safe.


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

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Add a couple of details to ITemplateHelpers docs


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

  Changed paths:
    M ckan/migration/versions/064_add_email_last_sent_column.py

  Log Message:
  -----------
  Merge pull request #453 from okfn/294-bug-migration-64-fails

[#294] Add default values to migration 64


  Commit: 5f82d7c7dff19d31764463bbc0678b3b72890622
      https://github.com/okfn/ckan/commit/5f82d7c7dff19d31764463bbc0678b3b72890622
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M .travis.yml
    M ckan/config/middleware.py
    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/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/cli.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/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.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/schema.py
    M ckan/migration/versions/064_add_email_last_sent_column.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/plugins/core.py
    M ckan/plugins/interfaces.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/javascript/modules/dashboard.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
    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
    R ckan/templates/admin/authz.html
    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/member_new.html
    M ckan/templates/organization/members.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
    R ckan/templates/package/resource_api_data.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/data_api_button.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/edit_user_form.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
    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/model/test_package.py
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.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
    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
    A ckanext/example_itemplatehelpers/__init__.py
    A ckanext/example_itemplatehelpers/plugin.py
    A ckanext/example_itemplatehelpers/templates/home/index.html
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    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
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 2750-add-docs-and-examples-for-idatasetform-and-igroupform


Compare: https://github.com/okfn/ckan/compare/99a255d0bd71...5f82d7c7dff1

• Previous message: [ckan-changes] [okfn/ckan] 604229: Patch to compile less when minifying files
• Next message: [ckan-changes] [okfn/ckan] 604229: Patch to compile less when minifying files
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]