[ckan-changes] [okfn/ckan] 3d41be: [#618] create symlink from docs/CONTRIBUTING.rst t...

Fri Apr 19 10:21:42 UTC 2013

  Branch: refs/heads/release-datagov-saml2
  Home:   https://github.com/okfn/ckan
  Commit: 3d41beb3435951a23b17c2e32e6f0dbd3a0183c5
      https://github.com/okfn/ckan/commit/3d41beb3435951a23b17c2e32e6f0dbd3a0183c5
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    A doc/CONTRIBUTING.rst

  Log Message:
  -----------
  [#618] create symlink from docs/CONTRIBUTING.rst to CONTRIBUTING.txt

  Commit: 9f0ff9d64d364440105e00e0ebdf348054b6ef54
      https://github.com/okfn/ckan/commit/9f0ff9d64d364440105e00e0ebdf348054b6ef54
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#606] Fix no resource error to not me flash message

  Commit: e061b0c59af5a58032996b1e8bd80888ef941b97
      https://github.com/okfn/ckan/commit/e061b0c59af5a58032996b1e8bd80888ef941b97
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

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

  Log Message:
  -----------
  [#509] Fix bug in add/remove groups

  Commit: 7551cbbc241c0304cb767f572965aac1e8142034
      https://github.com/okfn/ckan/commit/7551cbbc241c0304cb767f572965aac1e8142034
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#509] Test fixups

  Commit: 2b46a450ce4ce118599a86ecefd3d4b8baba8d32
      https://github.com/okfn/ckan/commit/2b46a450ce4ce118599a86ecefd3d4b8baba8d32
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

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

  Log Message:
  -----------
  [#726] Fix page zoom out bug up to zoom:0.6

  Commit: f9bb3ee1146acc10f11eb0a9c62968257335f8aa
      https://github.com/okfn/ckan/commit/f9bb3ee1146acc10f11eb0a9c62968257335f8aa
  Author: kindly <kindly at gmail.com>
  Date:   2013-04-06 (Sat, 06 Apr 2013)

  Changed paths:
    M ckan/lib/search/query.py

  Log Message:
  -----------
  739 add extra options to solr query

  Commit: 4e149cbd888e93465c77731a7f18f603f6299ec8
      https://github.com/okfn/ckan/commit/4e149cbd888e93465c77731a7f18f603f6299ec8
  Author: kindly <kindly at gmail.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  #739 remove whitespace between : and term for comaptibility with edismax search

  Commit: 48da70a71de2a0c2d3ed7da152dd289f2f166a51
      https://github.com/okfn/ckan/commit/48da70a71de2a0c2d3ed7da152dd289f2f166a51
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M ckan/public/base/less/prose.less
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#740] Adds ellipsis wrapper to resource_read

  Commit: 96dee5fa6a3e7244f2fd40158d9a8485d5ef450f
      https://github.com/okfn/ckan/commit/96dee5fa6a3e7244f2fd40158d9a8485d5ef450f
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/search/query.py

  Log Message:
  -----------
  Merge pull request #739 from okfn/739-add-extra-options-to-query

Add extra options to search queries

  Commit: 04d8df80da19579bd551e469a879f12c8dedb15c
      https://github.com/okfn/ckan/commit/04d8df80da19579bd551e469a879f12c8dedb15c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    R doc/CONTRIBUTING.rst
    A doc/contributing.rst

  Log Message:
  -----------
  [#618] Rename contributing -> CONTRIBUTING in docs

The source file in the root of this git repo is still called CONTRIBUTING.rst,
but the symlink to it in docs/ is now lower-case contributing.rst. This
means the docs.ckan.org URL is /contributing.html not
/CONTRIBUTING.html.

  Commit: 25852a2032f11d3c3117a3cfa29c81643c545c2f
      https://github.com/okfn/ckan/commit/25852a2032f11d3c3117a3cfa29c81643c545c2f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  [#618] Add contributing docs to docs index

  Commit: 3428f8a5c1f873bfa36dfb08fa62eb226bf9092c
      https://github.com/okfn/ckan/commit/3428f8a5c1f873bfa36dfb08fa62eb226bf9092c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  [#618] Fix a broken link in CONTRIBUTING.rst

  Commit: 2ab6084a5e7e8ecd109a65d6b5dd2dc53f5f368c
      https://github.com/okfn/ckan/commit/2ab6084a5e7e8ecd109a65d6b5dd2dc53f5f368c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  [#618] Move Coding Standards link to top of CONTRIBUTING.rst

Make it more prominent.

  Commit: 254222ffbd43f736eb5baf7c188578ecbd5a2a55
      https://github.com/okfn/ckan/commit/254222ffbd43f736eb5baf7c188578ecbd5a2a55
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    A doc/contributing.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch '618-source-contributing-file-from-docs'

  Commit: 09220c47854666bd126a8bc8125621abbc6b399f
      https://github.com/okfn/ckan/commit/09220c47854666bd126a8bc8125621abbc6b399f
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

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

  Log Message:
  -----------
  [#748] Changes page title on /organization index

  Commit: 6760976d0e1868a03196d90949dd619cff7f89d9
      https://github.com/okfn/ckan/commit/6760976d0e1868a03196d90949dd619cff7f89d9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Fix broken link in CONTRIBUTING.rst

There seems to be a bug in GitHub's restructured text rendering, an
internal link to a section with a ' in its  title will be broken (but it
works fine in Sphinx). Rename the section to workaround this.

  Commit: f3bb02d9fe3f749055ef838379ed4cf11ca3db00
      https://github.com/okfn/ckan/commit/f3bb02d9fe3f749055ef838379ed4cf11ca3db00
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Remove changelog update from contributing guidelines

We agreed not to update the changelog as features are added, someone
will update it all at once before a release instead.

  Commit: 5fff2bc88d6f84566178d76660fc37f6876131d5
      https://github.com/okfn/ckan/commit/5fff2bc88d6f84566178d76660fc37f6876131d5
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

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

  Log Message:
  -----------
  [#509] minor indentation cleanup

  Commit: a5c5b667b1325475c26c1e12564ca4fa11c4e042
      https://github.com/okfn/ckan/commit/a5c5b667b1325475c26c1e12564ca4fa11c4e042
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch '509-group-add-remove'

  Commit: ac3714c6e86b83eeda136c962e0ada5e364d2de8
      https://github.com/okfn/ckan/commit/ac3714c6e86b83eeda136c962e0ada5e364d2de8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

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

  Log Message:
  -----------
  Merge pull request #735 from okfn/726-zoom-bug

#726 Fix page zoom out render issue

  Commit: cd8f25f6556ef5ed9d381d71e343d62e71cdaf32
      https://github.com/okfn/ckan/commit/cd8f25f6556ef5ed9d381d71e343d62e71cdaf32
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

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

  Log Message:
  -----------
  [#726] Recompile CSS files.

  Commit: 6f637791340bf04b61e6f6169fddabbb06b77251
      https://github.com/okfn/ckan/commit/6f637791340bf04b61e6f6169fddabbb06b77251
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  reformat /ckan/ckan/config/routing.py

  Commit: 87e0df4ea027f883c8f208f5b95ffee544f481a6
      https://github.com/okfn/ckan/commit/87e0df4ea027f883c8f208f5b95ffee544f481a6
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/error.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/error.py

  Commit: a591c7d33a88b65de9e0a3903acd82028f4225ad
      https://github.com/okfn/ckan/commit/a591c7d33a88b65de9e0a3903acd82028f4225ad
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/feed.py

  Commit: 1f2cbbaa15de2ce305cfadaed580e140b19fb47a
      https://github.com/okfn/ckan/commit/1f2cbbaa15de2ce305cfadaed580e140b19fb47a
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/home.py

  Commit: 6ebc7d9010a29fb7d19a03513a5f02cf43aea812
      https://github.com/okfn/ckan/commit/6ebc7d9010a29fb7d19a03513a5f02cf43aea812
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/organization.py
    M ckan/controllers/package.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/organization.py

  Commit: 468210b5303371bec33c8d9e60b1f992c228bb04
      https://github.com/okfn/ckan/commit/468210b5303371bec33c8d9e60b1f992c228bb04
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/related.py

  Commit: f0088871d8f09c6243901c98ab542e53cf7aa011
      https://github.com/okfn/ckan/commit/f0088871d8f09c6243901c98ab542e53cf7aa011
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/storage.py

  Commit: 39b49dfd22e6b678fbdaa6ec2ad612e9afef9a91
      https://github.com/okfn/ckan/commit/39b49dfd22e6b678fbdaa6ec2ad612e9afef9a91
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/tag.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/tag.py

  Commit: bbb15f9ca6dd256ce178c950f33f6264c1dcd5e6
      https://github.com/okfn/ckan/commit/bbb15f9ca6dd256ce178c950f33f6264c1dcd5e6
  Author: jbspeakr <jbspeakr at funkblocka.de>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  reformat /ckan/ckan/controllers/user.py

  Commit: 40edf3abf91037db32bea141a16a8074ec29b7ef
      https://github.com/okfn/ckan/commit/40edf3abf91037db32bea141a16a8074ec29b7ef
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M ckan/public/base/less/prose.less
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch '740-resource-url'

  Commit: 4361de6044a366da3c72a7c32542f2a62835f35c
      https://github.com/okfn/ckan/commit/4361de6044a366da3c72a7c32542f2a62835f35c
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

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

  Log Message:
  -----------
  [#740] Rebuild css

  Commit: bfc96b789eb088a4cc73f48b5d438c81ca59a1d8
      https://github.com/okfn/ckan/commit/bfc96b789eb088a4cc73f48b5d438c81ca59a1d8
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

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

  Log Message:
  -----------
  Merge branch '749-org-index-title'

  Commit: 60fb73f5e45f790bee9b01c5c8c3ec7734610f93
      https://github.com/okfn/ckan/commit/60fb73f5e45f790bee9b01c5c8c3ec7734610f93
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/validators.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/misc.py
    M ckan/model/tag.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    A ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/header.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    A ckan/templates/package/history.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_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    A ckan/templates/package/snippets/history_revisions.html
    M ckan/templates/package/snippets/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_form.html
    M ckan/templates/package/snippets/resources_list.html
    A ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/license.html
    A ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_member.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    R doc/about.rst
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/legacy-api.rst
    M doc/test.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 606-nice-error-on-no-resource

  Commit: 5354769c480f4ad115bf53ca7450d3f49c837edb
      https://github.com/okfn/ckan/commit/5354769c480f4ad115bf53ca7450d3f49c837edb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-12 (Fri, 12 Apr 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge branch '606-nice-error-on-no-resource'

  Commit: 77e26db4573e0f5ece9245ebffb074b0bab538aa
      https://github.com/okfn/ckan/commit/77e26db4573e0f5ece9245ebffb074b0bab538aa
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Add IAuthenticator

  Commit: cdf792609a7977abbe8c84cab8f0e657418c7001
      https://github.com/okfn/ckan/commit/cdf792609a7977abbe8c84cab8f0e657418c7001
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M ckan/logic/auth/__init__.py

  Log Message:
  -----------
  Improve logic/auth/__init__.py bad logic (data_dict={})

  Commit: ba5063c17956b721c0ab209dc5fa9dcd4e7414d4
      https://github.com/okfn/ckan/commit/ba5063c17956b721c0ab209dc5fa9dcd4e7414d4
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M ckan/logic/auth/__init__.py

  Log Message:
  -----------
  Slight refactor of logic/auth/__init__.py for more pythonic plus store found object

  Commit: 48f37eff2cf96f2b6a1eb9be8816f3946daf9435
      https://github.com/okfn/ckan/commit/48f37eff2cf96f2b6a1eb9be8816f3946daf9435
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  Saml2 - add check_access calls to some user actions

  Commit: 7a12178c569841027dd9e240adb16542c9e36b5e
      https://github.com/okfn/ckan/commit/7a12178c569841027dd9e240adb16542c9e36b5e
  Author: kindly <kindly at gmail.com>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M ckan/logic/auth/update.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  Fix for unauthorized user edit

  Commit: 5f26be7e5b863f6a2fd2a9d90fe96a047233ab25
      https://github.com/okfn/ckan/commit/5f26be7e5b863f6a2fd2a9d90fe96a047233ab25
  Author: kindly <kindly at gmail.com>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/config/routing.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_user.py
    A doc/contributing.rst
    M doc/index.rst

  Log Message:
  -----------
  merge conflict IAuthenticator

  Commit: 54adb2f2e5185ecad806986fe1d5e1306659ad25
      https://github.com/okfn/ckan/commit/54adb2f2e5185ecad806986fe1d5e1306659ad25
  Author: amercader <amercadero at gmail.com>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/main.debug.min.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

  Log Message:
  -----------
  Frontend build

  Commit: ce94d35cf0b1068b6c8e5ce32a8d11bf03923d33
      https://github.com/okfn/ckan/commit/ce94d35cf0b1068b6c8e5ce32a8d11bf03923d33
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-19 (Fri, 19 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/config/routing.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/auth/update.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/fuchsia.min.css
    M ckan/public/base/css/main.debug.min.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
    M ckan/tests/functional/test_user.py
    A doc/contributing.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'release-datagov' into release-datagov-saml2

Conflicts:
	ckan/logic/auth/__init__.py
    IAuthenticator fixes

Compare: https://github.com/okfn/ckan/compare/e0e60c11e54b...ce94d35cf0b1