[ckan-changes] [okfn/ckan] 25c80f: Add coverage reports with coveralls

GitHub noreply at github.com
Thu Oct 17 10:52:59 UTC 2013


  Branch: refs/heads/1030-ui-update
  Home:   https://github.com/okfn/ckan
  Commit: 25c80f16f57ecc34fda2d52bbd8d3a41e0b33d66
      https://github.com/okfn/ckan/commit/25c80f16f57ecc34fda2d52bbd8d3a41e0b33d66
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-06 (Sat, 06 Jul 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M bin/travis-build

  Log Message:
  -----------
  Add coverage reports with coveralls


  Commit: 7c60ba441dcbdb309e82344a6a981b87243a20a3
      https://github.com/okfn/ckan/commit/7c60ba441dcbdb309e82344a6a981b87243a20a3
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/delete.py
    A ckan/migration/versions/070_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  [#1163] Users can be deleted

To do this, I've configured the User model to be stateful using vdm.sqlalchemy.
Right now, there're two states: active and deleted. If a user is deleted, he
can't login, and is unauthorized to do anything. She also doesn't appear in the
user's list anymore, but you can still access her profile page, if you know her
username.

If she was logged in when her user was deleted, the next time she goes into
CKAN, she'll be logged off. Unfortunately, there's not a useful message like
"Your user has been deleted." Yet.

There's no way to undelete a user, but it should be simply creating an
action to set her state to active.


  Commit: ad2de00a4e2c2772d1e59faee26ca818731168c9
      https://github.com/okfn/ckan/commit/ad2de00a4e2c2772d1e59faee26ca818731168c9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/migration/versions/070_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py

  Log Message:
  -----------
  [#1163] Use ckan.model.State instead of vdm.sqlalchemy.State

This makes us a bit less tied to vdm.


  Commit: d6fde48e5cd73a2d0754b3ceb9fe6319deedaa20
      https://github.com/okfn/ckan/commit/d6fde48e5cd73a2d0754b3ceb9fe6319deedaa20
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/migration/versions/070_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py

  Log Message:
  -----------
  [#1163] Use ckan.model.core.State instead of ckan.model.State

With this change, we're able to avoid having to load ckan.model inside methods,
to avoid circular dependencies.


  Commit: 89a38101afe7b1415d431cdffc013e45bf90bf67
      https://github.com/okfn/ckan/commit/89a38101afe7b1415d431cdffc013e45bf90bf67
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/tests/lib/test_authenticator.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  [#1178] Add PENDING state to User


  Commit: c0c6803b574d48016af6185fd0a2a71605567a77
      https://github.com/okfn/ckan/commit/c0c6803b574d48016af6185fd0a2a71605567a77
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [#1178] The user is activated when it performs the reset password


  Commit: 74f649c9e3eb0690f5e48f939b4546b415b0777b
      https://github.com/okfn/ckan/commit/74f649c9e3eb0690f5e48f939b4546b415b0777b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M dev-requirements.txt

  Log Message:
  -----------
  [#1178] Admins can invite users

The invited user starts in pending state, with the password reset key set. We
still have to send an email to the user telling him/her to change the password
and log in.

I had to change authorization code to only automatically unauthorize deleted
users, not pending. This was because the users needs to be able to perform the
password reset when pending, to be able to become active.


  Commit: 31523cd27a35958c2f0660a2762bcfd0274c8006
      https://github.com/okfn/ckan/commit/31523cd27a35958c2f0660a2762bcfd0274c8006
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#1178] perform_reset uses the received id as the context's user

When performing a password reset, the user is probably (always?) not logged in.
So c.user is an empty string. So, the auth functions have no way to tell which
user is trying to reset his/her password.

This worked fine before, because everyone was able to reset the password. But
now that we've got users in DELETED state, it's not the case anymore.


  Commit: e5890740164c38ca0ebf10bf25a297b0b634e204
      https://github.com/okfn/ckan/commit/e5890740164c38ca0ebf10bf25a297b0b634e204
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1178] Send email to the invited user

I removed the time.sleep(0.1) on TestMailer. Looking through the code, I
couldn't find anywhere where a timer looked needed. And I ran these tests a
hundred times without the timer to see if I could make them fail, but no. So, I
guess they're not needed anymore.

I also had to move the RESET_LINK_MESSAGE inside get_reset_link_body(). This
was because, when importing ckan.lib.mailer in ckan.logic.action.create.py, I
got:

    TypeError: No object (name: translator) has been registered for this thread

This seems to be because we were using _() before pylons had a change to set up
the translator. Moving it inside the method solves this.


  Commit: f2f9095926e143ef7a1fe46f613c88bbf1096478
      https://github.com/okfn/ckan/commit/f2f9095926e143ef7a1fe46f613c88bbf1096478
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/model/user.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py

  Log Message:
  -----------
  [#1178] Adds user to organization when inviting, and only org admins can invite


  Commit: b75524ee9b74166428555c6c5f76db7f58c67f14
      https://github.com/okfn/ckan/commit/b75524ee9b74166428555c6c5f76db7f58c67f14
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/model/user.py
    M ckan/templates/group/member_new.html
    M ckan/templates/organization/member_new.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py

  Log Message:
  -----------
  [#1178] Invite user on add member to organization/group

I've added an "Email" field to the "Add Member" to Organization/Group page. If
you add an e-mail there, we'll create a new user and invite her (doesn't matter
if there's already a user with the same email).

I still need to change the template and add help texts.


  Commit: 1503ffa654d2d09dfe7de9333622c9e1edd9564a
      https://github.com/okfn/ckan/commit/1503ffa654d2d09dfe7de9333622c9e1edd9564a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-31 (Sat, 31 Aug 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/solr/schema-2.0.xml
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.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/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/model/activity.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/snippets/activity_item.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/reclinepreview/theme/public/resource.config
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/install-from-source.rst
    M doc/python-coding-standards.rst
    M doc/test.rst
    M doc/upgrade-source.rst
    A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 1178-users-invitations


  Commit: 89db2ed23ca5cb0136a44d2829f2e713f2b2558d
      https://github.com/okfn/ckan/commit/89db2ed23ca5cb0136a44d2829f2e713f2b2558d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-31 (Sat, 31 Aug 2013)

  Changed paths:
    R ckan/migration/versions/070_add_state_column_to_user_table.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py

  Log Message:
  -----------
  [#1178] Move migration from 070 to 071, as we have a new 070


  Commit: 87d0b8b520e1f4860bec04b2a6e5edd67a40b33e
      https://github.com/okfn/ckan/commit/87d0b8b520e1f4860bec04b2a6e5edd67a40b33e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

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

  Log Message:
  -----------
  [#1228] strip whitespace from title in model_dictize.package_dictize


  Commit: 40397fe5c9bd0e2703f0d4e26227863c6cbc6b4a
      https://github.com/okfn/ckan/commit/40397fe5c9bd0e2703f0d4e26227863c6cbc6b4a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/templates/group/member_new.html
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  [#1178] Add help text to the add member forms


  Commit: 08c45188a91f64d121f0d7ed753e461de7df277d
      https://github.com/okfn/ckan/commit/08c45188a91f64d121f0d7ed753e461de7df277d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch 'master' into 1178-users-invitations


  Commit: 0f710ac9888b83977641d082eddf59be97023592
      https://github.com/okfn/ckan/commit/0f710ac9888b83977641d082eddf59be97023592
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/lib/base.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/__init__.py
    M ckan/logic/action/get.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    R doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1178-users-invitations


  Commit: 2adda64767ea178e558ccd6844b84efe267a6dcf
      https://github.com/okfn/ckan/commit/2adda64767ea178e558ccd6844b84efe267a6dcf
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M ckan/migration/versions/071_add_state_column_to_user_table.py

  Log Message:
  -----------
  [#1178] Fix typo exeecute -> execute in migration


  Commit: 6327e2454ae5a98df9e71ecd27725aa0ea9f2e2d
      https://github.com/okfn/ckan/commit/6327e2454ae5a98df9e71ecd27725aa0ea9f2e2d
  Author: Ian Ward <ian at excess.org>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#772] explaion plugin loading order


  Commit: b0f3e643b2640c2a717d56f802a5d61477fcf7f3
      https://github.com/okfn/ckan/commit/b0f3e643b2640c2a717d56f802a5d61477fcf7f3
  Author: amercader <amercadero at gmail.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1237] Improve facet.limit search option

A negative value should be allowed if you don't want to limit the facet
values, but the search params schema didn't allow it. Also mention in
the docs that this can be set via configuration and that the default is
50. Added some tests.


  Commit: 2d76140db869595b83d2d501380bbe9f248192f5
      https://github.com/okfn/ckan/commit/2d76140db869595b83d2d501380bbe9f248192f5
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  [#1178] Small CSS tweaks and fix for premature closing div


  Commit: f03e409b6e8eed6633cf530ff8cf08b882d1b726
      https://github.com/okfn/ckan/commit/f03e409b6e8eed6633cf530ff8cf08b882d1b726
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#848] Fix configuration name search.facet.limits -> search.facet.limit


  Commit: 43afc32641e9d09293ebb5276f1098598770ff3a
      https://github.com/okfn/ckan/commit/43afc32641e9d09293ebb5276f1098598770ff3a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#848] extra_template_paths and extra_public_paths aren't deprecated


  Commit: fca56dceb35bae9889b2b017af0a8b38afddec15
      https://github.com/okfn/ckan/commit/fca56dceb35bae9889b2b017af0a8b38afddec15
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#848] ckan.template_footer_end is deprecated


  Commit: 2994a3c3232a8134746337ff528ff613c1844565
      https://github.com/okfn/ckan/commit/2994a3c3232a8134746337ff528ff613c1844565
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#848] Reorganize and add examples of FileStore's configuration parameters


  Commit: e7db320c5f514048f18e892e3158bfe0c4c83c1f
      https://github.com/okfn/ckan/commit/e7db320c5f514048f18e892e3158bfe0c4c83c1f
  Author: Guy Sheffer <guysoft at gmail.com>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M doc/i18n.rst

  Log Message:
  -----------
  Add notes and changes to new language submission, since pull requests are not accepted anymore


  Commit: c8a483a77f82c4c8a545c569e87cd7843a3d92dc
      https://github.com/okfn/ckan/commit/c8a483a77f82c4c8a545c569e87cd7843a3d92dc
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1221] use write url for search as this uses correct priviledges


  Commit: e7d295d27b56f3ab5252f2e090927c0a3e57ea1e
      https://github.com/okfn/ckan/commit/e7d295d27b56f3ab5252f2e090927c0a3e57ea1e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.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/update.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/autoform.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/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
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.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/search.html
    M ckan/templates/package/snippets/additional_info.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
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.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/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.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/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    R doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1228-dictize-whitespace


  Commit: c339162836695677f02e9090f2ce40f6a65ad194
      https://github.com/okfn/ckan/commit/c339162836695677f02e9090f2ce40f6a65ad194
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    M ckan/model/follower.py

  Log Message:
  -----------
  [#1178] PEP8 (and correct a comment)


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

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/public/base/less/forms.less
    M ckan/templates/user/new_user_form.html
    A ckan/templates/user/snippets/recaptcha.html

  Log Message:
  -----------
  [#1070] Makes recaptcha work with the jinja2 templates


  Commit: afc80ed59d6173a96980576fc4760702413ac8dc
      https://github.com/okfn/ckan/commit/afc80ed59d6173a96980576fc4760702413ac8dc
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

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

  Log Message:
  -----------
  [#1259] Fixes a JS error with autocomplete module and improves UX

1. Basically adds an extra check to make sure that 'abort()' is
defined
2. Then changes the module to behave a little nicer when inbetween
ajax requests


  Commit: 50f0d989dcae4b2f9c3ba4b24211eea0f8caed1c
      https://github.com/okfn/ckan/commit/50f0d989dcae4b2f9c3ba4b24211eea0f8caed1c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/logic/validators.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/homepage.less
    M ckan/templates/admin/config.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/logic/test_action.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1228-dictize-whitespace


  Commit: 59504d7f38e6ef35a2681451ccdaaa99de42b541
      https://github.com/okfn/ckan/commit/59504d7f38e6ef35a2681451ccdaaa99de42b541
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

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

  Log Message:
  -----------
  Merge branch '1228-dictize-whitespace'


  Commit: 958027dfd182bfaff874aff1ce1f973bf29fc016
      https://github.com/okfn/ckan/commit/958027dfd182bfaff874aff1ce1f973bf29fc016
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/model/resource.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/homepage.less
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.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/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
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.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/search.html
    M ckan/templates/package/snippets/additional_info.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
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.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/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M 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_user.py
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 848-finishing-configuration-docs


  Commit: 23ab179467aebd0c98b843b293622715c78b794f
      https://github.com/okfn/ckan/commit/23ab179467aebd0c98b843b293622715c78b794f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch '848-finishing-configuration-docs'


  Commit: 11ff9097f9bca2bbc3bf4e280f6134e477944738
      https://github.com/okfn/ckan/commit/11ff9097f9bca2bbc3bf4e280f6134e477944738
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.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/navl/validators.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/update.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/homepage.less
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.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/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
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.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/search.html
    M ckan/templates/package/snippets/additional_info.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
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.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/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M 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_user.py
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.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/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 772-document-plugin-load-order


  Commit: 70bff16b4408e614933cfaf42fdbf4d2a774ad94
      https://github.com/okfn/ckan/commit/70bff16b4408e614933cfaf42fdbf4d2a774ad94
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M doc/configuration.rst
    M doc/extensions/best-practices.rst

  Log Message:
  -----------
  [#772] Clarify plugin-loading order and best practice


  Commit: 09364bedc0dd84239865befbb92805a97cd67909
      https://github.com/okfn/ckan/commit/09364bedc0dd84239865befbb92805a97cd67909
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M doc/configuration.rst
    M doc/extensions/best-practices.rst

  Log Message:
  -----------
  Merge branch '772-document-plugin-load-order'


  Commit: e0e0fb5c2562ef021038cedb84aab42d89911659
      https://github.com/okfn/ckan/commit/e0e0fb5c2562ef021038cedb84aab42d89911659
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/logic/action/create.py
    M ckan/logic/validators.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/homepage.less
    M ckan/templates/admin/config.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/logic/test_action.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into translation-doc-deprecated


  Commit: b6f1ff3f220b5e2198d2441261854fb398412cbc
      https://github.com/okfn/ckan/commit/b6f1ff3f220b5e2198d2441261854fb398412cbc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M doc/i18n.rst

  Log Message:
  -----------
  Merge branch 'translation-doc-deprecated'


  Commit: 4b2c46b59bd6cb5ed1235b60e1555d776c5456b2
      https://github.com/okfn/ckan/commit/4b2c46b59bd6cb5ed1235b60e1555d776c5456b2
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

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

  Log Message:
  -----------
  [#1265] Keep visibility value on form errors

The wrong value was checked to choose the selected option.


  Commit: 96678854079906a74ce7e7a1ac195b9c18c29a00
      https://github.com/okfn/ckan/commit/96678854079906a74ce7e7a1ac195b9c18c29a00
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M bin/ckan_spam.py
    M bin/travis-build
    R build.sh
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema-2.0.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.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/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/069_resource_url_and_metadata_modified.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/model/activity.py
    M ckan/model/extension.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.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/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
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.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/search.html
    M ckan/templates/package/snippets/additional_info.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
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.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/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_tag_vocab.py
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/mock_plugin.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.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/l10n.min.js
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/resource.config
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M dev-requirements.txt
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    A doc/changelog.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/i18n.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    R doc/toolkit.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst
    M doc/upgrade-source.rst
    M doc/upgrading.rst
    R doc/writing-extensions.rst
    R fabfile.py
    R jshint.json
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    A pip-requirements-docs.txt
    A requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch 'master' into coveralls

Conflicts:
	bin/travis-build


  Commit: dad667eb4233b00561167db2aff41092afecfd2d
      https://github.com/okfn/ckan/commit/dad667eb4233b00561167db2aff41092afecfd2d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Correct encoding to make coveralls work


  Commit: a903ef999d8d67db48118ea8413595707c2e3080
      https://github.com/okfn/ckan/commit/a903ef999d8d67db48118ea8413595707c2e3080
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Add test coverage banner to readme


  Commit: 5ad2c9bc8d651c31b302499780b6926b7a798ebc
      https://github.com/okfn/ckan/commit/5ad2c9bc8d651c31b302499780b6926b7a798ebc
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M .coveragerc

  Log Message:
  -----------
  Don't cover tests files


  Commit: 1ab6ff449faef790a4f160d30aedd08a82b726fb
      https://github.com/okfn/ckan/commit/1ab6ff449faef790a4f160d30aedd08a82b726fb
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M doc/upgrade-source.rst

  Log Message:
  -----------
  [#1268] Add 'python setup.py develop' step to source upgrade instructions


  Commit: e7266eb1854a62c88414e1b412a9ae3304b7c6a1
      https://github.com/okfn/ckan/commit/e7266eb1854a62c88414e1b412a9ae3304b7c6a1
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

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

  Log Message:
  -----------
  Merge pull request #1265 from okfn/1265-visibility-field-errors

Visibility field value not kept if there are errors on the form


  Commit: 485f681f6f5d5fe890dc339d57a8563844e2fde2
      https://github.com/okfn/ckan/commit/485f681f6f5d5fe890dc339d57a8563844e2fde2
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1272] prevent keyerror when looking up 'url_type' in datastore before_show


  Commit: a8ac4a6d955fa796bdd603efa7e3768f44758431
      https://github.com/okfn/ckan/commit/a8ac4a6d955fa796bdd603efa7e3768f44758431
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge pull request #1272 from okfn/1272-datastore-key-error

fix possible KeyError in before_show of datastore plugin


  Commit: b2182944f4a56d78b5942461e8d25ab4d7c18c09
      https://github.com/okfn/ckan/commit/b2182944f4a56d78b5942461e8d25ab4d7c18c09
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge pull request #1268 from okfn/1268-add-step-upgrade-source

Add "python setup.py develop" step to source upgrade instructions


  Commit: 16924d937af4207a585fd34eaf2be083bcc2d6d2
      https://github.com/okfn/ckan/commit/16924d937af4207a585fd34eaf2be083bcc2d6d2
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M ckan/migration/versions/071_add_state_column_to_user_table.py

  Log Message:
  -----------
  [#1178] Remove backward migrations, as we don't support it


  Commit: 0bd163e75eacc65fee0546fa356f195f1e109713
      https://github.com/okfn/ckan/commit/0bd163e75eacc65fee0546fa356f195f1e109713
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M ckan/tests/lib/test_authenticator.py

  Log Message:
  -----------
  [#1178] Fix repeated test name


  Commit: d073ce7f6b56361cf8c5452c2f969e4d45356437
      https://github.com/okfn/ckan/commit/d073ce7f6b56361cf8c5452c2f969e4d45356437
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Use the data returned by validate, instead of the one passed as param


  Commit: 1da817c40b59d7dfa866abd9e68ed844442f34d4
      https://github.com/okfn/ckan/commit/1da817c40b59d7dfa866abd9e68ed844442f34d4
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Move user_invite_schema to ckan.logic.schema


  Commit: c2e4f767eed6485383a7ef2efd40a8e990d0a623
      https://github.com/okfn/ckan/commit/c2e4f767eed6485383a7ef2efd40a8e990d0a623
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Refactor user name creation

I've isolated the loop where it needs to be. This makes the code clearer, but
makes it susceptible to errors. For example, after the random name was
generated but before the user is created, another user with the same name might
be created, breaking our code.

This should be rare enough to bother us.


  Commit: dfd8ae9fb07ff551707bdc08c6e23bd424c7335c
      https://github.com/okfn/ckan/commit/dfd8ae9fb07ff551707bdc08c6e23bd424c7335c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#1178] Simplify "if" expression, removing redundancy


  Commit: bae4d47c3227bd5f7581ac5859edcb9badd027c0
      https://github.com/okfn/ckan/commit/bae4d47c3227bd5f7581ac5859edcb9badd027c0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/migration/versions/071_add_state_column_to_user_table.py

  Log Message:
  -----------
  [#1178] Use model.State instead of core.State


  Commit: 31d64f3a1145894033da3061a826cbe42337d64c
      https://github.com/okfn/ckan/commit/31d64f3a1145894033da3061a826cbe42337d64c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/logic/__init__.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/update.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/homepage.less
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.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/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.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/search.html
    M ckan/templates/package/snippets/additional_info.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
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.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/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M 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_user.py
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.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/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/i18n.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    M doc/upgrade-source.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1178-users-invitations

Conflicts:
	ckan/controllers/user.py
	ckan/templates/group/member_new.html
	ckan/tests/logic/test_action.py
	dev-requirements.txt


  Commit: 3218b581443ad07cd09a93d364bf5085fb0f7884
      https://github.com/okfn/ckan/commit/3218b581443ad07cd09a93d364bf5085fb0f7884
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

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

  Log Message:
  -----------
  [#1237] Fix docstring


  Commit: 8c70cefc139df2572e72c3f24d16e2bb37a06e03
      https://github.com/okfn/ckan/commit/8c70cefc139df2572e72c3f24d16e2bb37a06e03
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  Merge branch '1221-preview-fails-private-datasets'


  Commit: e6d2c45c7f34b2ec5faf8fca619f90b53449a9a2
      https://github.com/okfn/ckan/commit/e6d2c45c7f34b2ec5faf8fca619f90b53449a9a2
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge pull request #1237 from okfn/1237-facet.limit_improvements

'facet.limit' in package_search wrongly handled


  Commit: 6431ba3dc6a117926101a97ae859132a906cf0f2
      https://github.com/okfn/ckan/commit/6431ba3dc6a117926101a97ae859132a906cf0f2
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#1178] Add auth_user_obj back to context in
User controller methods.


  Commit: 4ac411b61cfae7048cdc6cc5cace42aec20a13e9
      https://github.com/okfn/ckan/commit/4ac411b61cfae7048cdc6cc5cace42aec20a13e9
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Fix typo in org member_new template


  Commit: 322149c6934a574589f37ffe8317c444ad0885ff
      https://github.com/okfn/ckan/commit/322149c6934a574589f37ffe8317c444ad0885ff
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Constrain number of attempts to generate
a random user name in user_invite


  Commit: a480ace5ae73532627ad9b04cc3416f855373fc6
      https://github.com/okfn/ckan/commit/a480ace5ae73532627ad9b04cc3416f855373fc6
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

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

  Log Message:
  -----------
  [#1178] handle edge case where _get_random_username_from_email
fails by returning the cleaned local part of the
email address. This is expected to fail
validation in user_create.


  Commit: 971026bf286aee490e8080bab715870d65b84cf7
      https://github.com/okfn/ckan/commit/971026bf286aee490e8080bab715870d65b84cf7
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  [#1263] Remove the 'clear all' from the faceter on the left nav


  Commit: db86eacac53575aade586bf3338effb852f0edf8
      https://github.com/okfn/ckan/commit/db86eacac53575aade586bf3338effb852f0edf8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

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

  Log Message:
  -----------
  [#1259] Remove redundant callback definition


  Commit: 306ef40efc5a29c84377e1aacbc0c77c2d758081
      https://github.com/okfn/ckan/commit/306ef40efc5a29c84377e1aacbc0c77c2d758081
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

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

  Log Message:
  -----------
  Merge pull request #1259 from okfn/1259-autocomplete-fixes

Autocomplete JS module issues


  Commit: 3d4040da6702c8eefeecf8b77c65a1c267d262c8
      https://github.com/okfn/ckan/commit/3d4040da6702c8eefeecf8b77c65a1c267d262c8
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/public/base/less/forms.less
    M ckan/templates/group/member_new.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  Merge pull request #1178 from okfn/1178-users-invitations

Users invitations


  Commit: 31ccd35da1000e00a9ca819be7080809ea735ca9
      https://github.com/okfn/ckan/commit/31ccd35da1000e00a9ca819be7080809ea735ca9
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css

  Log Message:
  -----------
  [#1178] Updating style (paster less) after merge


  Commit: 33c4bd5a511d60e6771523b9025f003f69ae0a70
      https://github.com/okfn/ckan/commit/33c4bd5a511d60e6771523b9025f003f69ae0a70
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#1070] Removed privatekey from app_globals


  Commit: b83048cc8958c46db04da82758d3ddf541572cfd
      https://github.com/okfn/ckan/commit/b83048cc8958c46db04da82758d3ddf541572cfd
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/templates/admin/config.html
    M ckan/templates/group/member_new.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/i18n.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    M doc/upgrade-source.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

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


  Commit: d0920e946fbbf6e31241391d85bb48b7063c8687
      https://github.com/okfn/ckan/commit/d0920e946fbbf6e31241391d85bb48b7063c8687
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/public/base/less/forms.less
    M ckan/templates/user/new_user_form.html
    A ckan/templates/user/snippets/recaptcha.html

  Log Message:
  -----------
  Merge pull request #1070 from okfn/1070-recaptcha

Recaptcha not working in CKAN 2.0 (jinja templates)


  Commit: bf4c8e715fa7db2a3211e80a1e1e2e2f785bb54b
      https://github.com/okfn/ckan/commit/bf4c8e715fa7db2a3211e80a1e1e2e2f785bb54b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/public/base/test/spec/modules/autocomplete.spec.js

  Log Message:
  -----------
  Fix the automodule.js tests


  Commit: df45a9bc61795eaf906705a6cd195c567138b573
      https://github.com/okfn/ckan/commit/df45a9bc61795eaf906705a6cd195c567138b573
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/public/base/test/spec/modules/autocomplete.spec.js

  Log Message:
  -----------
  setupAutocomplete() before testing autocomplete.lookup()


  Commit: 10d495e046adce891451821bfc7e6e52189c3ed1
      https://github.com/okfn/ckan/commit/10d495e046adce891451821bfc7e6e52189c3ed1
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/public/base/test/spec/modules/autocomplete.spec.js

  Log Message:
  -----------
  Fix wrong call in autocomplete tests


  Commit: 383ab7765783661137f5ef2a89c94e48fb5f2a2c
      https://github.com/okfn/ckan/commit/383ab7765783661137f5ef2a89c94e48fb5f2a2c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  Merge branch '1263'


  Commit: 2ce216488ab95be47ad6fbb661d349801323b2fb
      https://github.com/okfn/ckan/commit/2ce216488ab95be47ad6fbb661d349801323b2fb
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css

  Log Message:
  -----------
  Recompile *.less files


  Commit: f75e37dc3cfa2da3948ba1eb4fcf351021c60132
      https://github.com/okfn/ckan/commit/f75e37dc3cfa2da3948ba1eb4fcf351021c60132
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M .travis.yml
    M dev-requirements.txt

  Log Message:
  -----------
  Move coveralls to dev requirements


  Commit: be09f3c08bcd5cc668b16fdb4dea73c1ec8c6134
      https://github.com/okfn/ckan/commit/be09f3c08bcd5cc668b16fdb4dea73c1ec8c6134
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#1266] Pin coveralls version to ==0.3


  Commit: 1e5b72fd943e60069d33ceba917e90900b951aa5
      https://github.com/okfn/ckan/commit/1e5b72fd943e60069d33ceba917e90900b951aa5
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M README.rst
    M bin/travis-build
    M ckan/config/environment.py
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #1266 from okfn/coveralls

Coveralls support


  Commit: 5eb3c4099be05f59b477f2f9d0ffe81d7740cc7b
      https://github.com/okfn/ckan/commit/5eb3c4099be05f59b477f2f9d0ffe81d7740cc7b
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M README.rst
    M bin/travis-build
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/group/member_new.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    A ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/i18n.rst
    M doc/upgrade-source.rst

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


Compare: https://github.com/okfn/ckan/compare/36cd347b8854...5eb3c4099be0


More information about the ckan-changes mailing list