[ckan-changes] [ckan/ckan] 524a18: [#781] Begin improving IFacets docs

GitHub noreply at github.com
Thu Apr 24 15:18:17 UTC 2014 

  Branch: refs/heads/1641-resource-create-requires-url
  Home:   https://github.com/ckan/ckan
  Commit: 524a187af87e2e7d0102bceb8b47c83ab706291e
      https://github.com/ckan/ckan/commit/524a187af87e2e7d0102bceb8b47c83ab706291e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M ckan/plugins/interfaces.py
    A ckanext/example_ifacets/__init__.py
    A ckanext/example_ifacets/plugin.py
    M setup.py

  Log Message:
  -----------
  [#781] Begin improving IFacets docs

Better docstrings and an example extension for IFacets. Both still need
some work..


  Commit: 252e95918ee342058c2c8704752028096d665dbc
      https://github.com/ckan/ckan/commit/252e95918ee342058c2c8704752028096d665dbc
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  [#1386] Add factories for Dataset and Resources


  Commit: 56955c01c4588d4a7de955269f41bb4f514d4319
      https://github.com/ckan/ckan/commit/56955c01c4588d4a7de955269f41bb4f514d4319
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  [#1386] Allow to define auth user when using factories

When creating an instance of the factory, users can provide an 'auth_user'
keyword argument with the name of the user that should perform the action.
If they don't provide the 'auth_user' argument the site user will be used
(this user is a sysadmin). If the action should be performed anonymously
(ie no logged in user), auth_user=None should be provided.

Note that the keyword argument could not be named 'user', as some action
functions use this same parameter.


  Commit: 910573bfa0f5a2fc05f23f59ffa96cf73d4f648a
      https://github.com/ckan/ckan/commit/910573bfa0f5a2fc05f23f59ffa96cf73d4f648a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  [#1386] PEP8 fixes


  Commit: 945cebaf5116294fa536539d0a847bcc845ed2ff
      https://github.com/ckan/ckan/commit/945cebaf5116294fa536539d0a847bcc845ed2ff
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-24 (Tue, 24 Dec 2013)

  Changed paths:
    M ckan/templates/home/snippets/search.html

  Log Message:
  -----------
  [#1364] Change labelling on homepage search area


  Commit: 9adf61603237191feafd58ffd991a639307d7871
      https://github.com/ckan/ckan/commit/9adf61603237191feafd58ffd991a639307d7871
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  Allow specifying user when creating a group using the factory

With this, we're able to create a group owned by a specific user.


  Commit: 21f4873f318b0f727c94c0d6a833073d33563c29
      https://github.com/ckan/ckan/commit/21f4873f318b0f727c94c0d6a833073d33563c29
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M ckan/new_tests/helpers.py

  Log Message:
  -----------
  new_tests.helpers.call_auth now work for any auth type (update, create, ...)


  Commit: 6eac66ad7c0d2760e7be1cb1d984f1ce0cffd260
      https://github.com/ckan/ckan/commit/6eac66ad7c0d2760e7be1cb1d984f1ce0cffd260
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M ckan/logic/auth/create.py
    A ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/auth/test_create.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py

  Log Message:
  -----------
  [#1505] Fix bug when non-sysadmins invited users to organizations

The problem was with the .user_invite() auth function. Instead of adding 'id'
to the data_dict, I was adding it to the context. Fixed now.

I've also changed it to require a data_dict, and a data_dict['group_id'] (as
they're required anyway).

While I'm at it, I rewrote the tests into the new testing style.


  Commit: eb81417f65c869d7f5cf845a00617785cf655728
      https://github.com/ckan/ckan/commit/eb81417f65c869d7f5cf845a00617785cf655728
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M .travis.yml
    M bin/travis-install-dependencies
    M ckan/model/license.py
    M ckan/new_tests/logic/auth/test_update.py
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' into 1505-invite-to-organization-causes-error


  Commit: 44af521e4dd98d7d2a0184496feec82a75119da9
      https://github.com/ckan/ckan/commit/44af521e4dd98d7d2a0184496feec82a75119da9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/auth/test_create.py

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


  Commit: 555a5de2405b1ccea7bf8fa96c2119824c43fc32
      https://github.com/ckan/ckan/commit/555a5de2405b1ccea7bf8fa96c2119824c43fc32
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  new_tests.helpers.call_auth now uses logic.check_access


  Commit: 53649a31e2846e5895733646590de65cebde24e7
      https://github.com/ckan/ckan/commit/53649a31e2846e5895733646590de65cebde24e7
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  Instead of importing NotAuthorized in test helpers, do it on the test file


  Commit: b63da48c5e7a45197764902b296be0713d3c7534
      https://github.com/ckan/ckan/commit/b63da48c5e7a45197764902b296be0713d3c7534
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  Change way to call nose's assert_raises, so it works on Python 2.6


  Commit: 74fe5a76385f0ca168e899e8076850cb6ef8166b
      https://github.com/ckan/ckan/commit/74fe5a76385f0ca168e899e8076850cb6ef8166b
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

  Changed paths:
    M ckan/templates/home/snippets/search.html

  Log Message:
  -----------
  Add a block for extension authors to extend


  Commit: f50a3b2ee5690fa49db8c38d4159c416dd3989c0
      https://github.com/ckan/ckan/commit/f50a3b2ee5690fa49db8c38d4159c416dd3989c0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M ckan/lib/helpers.py
    A ckan/new_tests/lib/test_helpers.py

  Log Message:
  -----------
  [#1532] Fix bug where url_for_static added leading slash in absolute urls


  Commit: 828fa4a2e41e9f05de7d1466ff13aa88f0de70e5
      https://github.com/ckan/ckan/commit/828fa4a2e41e9f05de7d1466ff13aa88f0de70e5
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-28 (Fri, 28 Feb 2014)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/templates/user/snippets/followee_dropdown.html

  Log Message:
  -----------
  [#1519] Fix organization activity filter in dashboard

The old implementation had the same type for orgs and groups and when an
org was selected a 404 was returned because group_show was called.

I didn't go all the way down separating both, ie group_followee list
still returns both groups and orgs.


  Commit: 5cbc29115af4cb5d188227b607bdebf2de01acd0
      https://github.com/ckan/ckan/commit/5cbc29115af4cb5d188227b607bdebf2de01acd0
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-28 (Fri, 28 Feb 2014)

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

  Log Message:
  -----------
  [#1519] Separate group / org follow actions


  Commit: 94521e2caf015b185ea2dce00f1f7ae661860a01
      https://github.com/ckan/ckan/commit/94521e2caf015b185ea2dce00f1f7ae661860a01
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-28 (Fri, 28 Feb 2014)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1519] Fix test


  Commit: 1492632b5bb0ecfa02330f41e37b999643d27a99
      https://github.com/ckan/ckan/commit/1492632b5bb0ecfa02330f41e37b999643d27a99
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    M ckan/templates/group/snippets/group_item.html

  Log Message:
  -----------
  [#1594] Fix breakage in package groups page

The group.type field, when undefined and merged with a unicode string
returns a unicode, which causes a traceback thanks to `url_for` in
pylons not accepting unicode.


  Commit: 2643ba26fe8c09f71c0adee4b1d8491658ec5757
      https://github.com/ckan/ckan/commit/2643ba26fe8c09f71c0adee4b1d8491658ec5757
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-03-23 (Sun, 23 Mar 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  [#1612] Check before showing 'Show more $facet'


  Commit: d64cf3dbd884d9a6f89aaaceff2a7dbf78201168
      https://github.com/ckan/ckan/commit/d64cf3dbd884d9a6f89aaaceff2a7dbf78201168
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

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

  Log Message:
  -----------
  Move the closing div inside the block

Fixes #1619. Move the closing div inside the block since it's defined
in the block anyway.


  Commit: bce737152f0cef74783fcb4b1e73804e26d65f2c
      https://github.com/ckan/ckan/commit/bce737152f0cef74783fcb4b1e73804e26d65f2c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M ckan/new_tests/logic/action/test_create.py

  Log Message:
  -----------
  [#1505] Merge tests that verify that the user was invited and it is pending

This is a tiny compromise in readability (IMO) to make the tests a bit faster


  Commit: 8b2150677f65071566ec6b579058563236f64f2b
      https://github.com/ckan/ckan/commit/8b2150677f65071566ec6b579058563236f64f2b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M ckan/new_tests/logic/auth/test_create.py

  Log Message:
  -----------
  [#1505] Test not only the method call, but also that we're returning the value


  Commit: 073091c3c43dfca0b56bcc761c1322a69eba2058
      https://github.com/ckan/ckan/commit/073091c3c43dfca0b56bcc761c1322a69eba2058
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#1505] Test for actual True-ness, and not truthiness.

If we don't add the ```is True```, any truthy value works (i.e. 'string').


  Commit: 3f05c63f297da16a228afdc676581c9682c8554e
      https://github.com/ckan/ckan/commit/3f05c63f297da16a228afdc676581c9682c8554e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M .tx/config
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/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
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/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/cli.py
    M ckan/lib/plugins.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M doc/conf.py
    M doc/contributing/documentation.rst
    M doc/extensions/testing-extensions.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/maintaining/filestore.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1505-invite-to-organization-causes-error

Conflicts:
	ckan/new_tests/factories.py


  Commit: 43f1c1eff128786169d4df5b5d4d2bba8ed0b4e8
      https://github.com/ckan/ckan/commit/43f1c1eff128786169d4df5b5d4d2bba8ed0b4e8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M ckan/new_tests/logic/auth/test_create.py

  Log Message:
  -----------
  [#1505] Fix tests on Python 2.6


  Commit: 9b9dbb8149f6b469278f32dcbfec9da0aef348e6
      https://github.com/ckan/ckan/commit/9b9dbb8149f6b469278f32dcbfec9da0aef348e6
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/new_tests/lib/test_helpers.py

  Log Message:
  -----------
  [#1532] url_for_static shouldn't work with external URLs. Revert f50a3b.

url_for_static shouldn't allow urls that aren't served in CKAN's static folder,
as this might lead to CSRF vulnerabilities if used with non-escaped user input.


  Commit: 4d18dde8aacc4f7ef80c880811f583c0d1a36e1a
      https://github.com/ckan/ckan/commit/4d18dde8aacc4f7ef80c880811f583c0d1a36e1a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/extract.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/new_tests/lib/test_helpers.py
    M ckan/templates/header.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    M doc/contributing/frontend/templating.rst

  Log Message:
  -----------
  [#1532] url_for_static doesn't accept external URLs and create url_for_static_or_external

The intent of the developer when using url_for_static() is to get the URL for
something that's served in the static folder inside CKAN. It should fail if
called with an external URL. This avoids a possible CSRF vulnerability, if we
allow user-provided input into url_for_static().

For the case when we want to either accept a static object's URL or an external
URL, for example when setting up the g.site_logo, I wrote the
url_for_static_or_external method. This makes it clearer what the user accepts.


  Commit: 6ffa8d6d3d8e05ef327f9ff497168c6518d46228
      https://github.com/ckan/ckan/commit/6ffa8d6d3d8e05ef327f9ff497168c6518d46228
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M ckan/new_tests/lib/test_helpers.py

  Log Message:
  -----------
  [#1532] Fix PEP8 issues


  Commit: 8614fb321702826d6e45d0015379f4f6897752b8
      https://github.com/ckan/ckan/commit/8614fb321702826d6e45d0015379f4f6897752b8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M MANIFEST.in
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M ckan/config/deployment.ini_tmpl
    A ckan/config/resource_formats.json
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/resource.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M doc/conf.py
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/images/manage_users.jpg
    M doc/maintaining/configuration.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/paster.rst
    M doc/sysadmin-guide.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1532-bug-where-url-for-static-adds-leading-slash-for-absolute-urls

Conflicts:
	ckan/templates/header.html


  Commit: 05d7320d7febec6ebc7e86beb5a57d6cc5715c54
      https://github.com/ckan/ckan/commit/05d7320d7febec6ebc7e86beb5a57d6cc5715c54
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    A doc/api.rst

  Log Message:
  -----------
  [#1622] Mention that the docs moved


  Commit: 7b1d97e5fcb469ffe86fb07a4698096f57819d3e
      https://github.com/ckan/ckan/commit/7b1d97e5fcb469ffe86fb07a4698096f57819d3e
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M doc/contributing/documentation.rst

  Log Message:
  -----------
  Update the documentation guide while I'm at it


  Commit: ea5493f43164375802a758a2ddd87a0f134ba41f
      https://github.com/ckan/ckan/commit/ea5493f43164375802a758a2ddd87a0f134ba41f
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M ckan/logic/converters.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  Remove whitespace from resource URL


  Commit: 39b408ec553ff0bebdefb5ac8ad2c2b7cd3b3d6e
      https://github.com/ckan/ckan/commit/39b408ec553ff0bebdefb5ac8ad2c2b7cd3b3d6e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    A .coveragerc
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M MANIFEST.in
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/__init__.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    A ckan/config/resource_formats.json
    M ckan/config/routing.py
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/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
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/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/accept.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    A ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__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/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.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/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/resource.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/controllers/test_util.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_get.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_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/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/vendor/jquery.ui.core.js
    A ckan/public/base/vendor/jquery.ui.mouse.js
    A ckan/public/base/vendor/jquery.ui.sortable.js
    M ckan/public/base/vendor/jquery.ui.widget.js
    R ckan/public/base/vendor/jquery.ui.widget.min.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/admin/index.html
    M ckan/templates/base.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.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/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/group/snippets/info.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/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/feeds.html
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 781-improve-ifacets-docs

Conflicts:
	setup.py


  Commit: 2ce39e78fd99e454d45554cf375e53a27667fa6f
      https://github.com/ckan/ckan/commit/2ce39e78fd99e454d45554cf375e53a27667fa6f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#781] Finish the IFacets docstrings


  Commit: 5052ca9bd2a6964f95f17711f6a7482e9eac28fc
      https://github.com/ckan/ckan/commit/5052ca9bd2a6964f95f17711f6a7482e9eac28fc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    R ckanext/example_ifacets/__init__.py
    R ckanext/example_ifacets/plugin.py
    M setup.py

  Log Message:
  -----------
  [#781] Remove the example IFacets plugin

It has no tests, and I'm not going to write any for it right now.


  Commit: b05744b2c1bdc83e182519bc9336476877a60bbc
      https://github.com/ckan/ckan/commit/b05744b2c1bdc83e182519bc9336476877a60bbc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M MANIFEST.in
    M ckan/config/deployment.ini_tmpl
    A ckan/config/resource_formats.json
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/resource.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/templates/macros/form.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/snippets/facet_list.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/lib/test_resource_search.py
    A doc/_themes/sphinx-theme-okfn
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    M doc/contributing/release-process.rst
    A doc/contributing/simple-code-contributions.rst
    A doc/contributing/string-i18n.rst
    M doc/extensions/best-practices.rst
    M doc/images/manage_users.jpg
    M doc/maintaining/configuration.rst
    M doc/maintaining/paster.rst
    M doc/sysadmin-guide.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1505-invite-to-organization-causes-error


  Commit: 2db1410339f0e27018d3efa93187d525ab16537a
      https://github.com/ckan/ckan/commit/2db1410339f0e27018d3efa93187d525ab16537a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M ckan/new_tests/logic/auth/test_create.py

  Log Message:
  -----------
  [#1505] Remove assertions that group_member_create was called in the tests

If user_invite fails when group_member_create fails, and succeeds when
group_member_create succeeds, there's no need to assert that
group_member_create was actually called.


  Commit: 3f67f5ce7413ccd081937d650b6099efd94889ef
      https://github.com/ckan/ckan/commit/3f67f5ce7413ccd081937d650b6099efd94889ef
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  [#1505] Instead of accessing and then deleting an attribute, simply pop() it.


  Commit: a153f1d8ee0e3f10907b8edc368cf6636232d312
      https://github.com/ckan/ckan/commit/a153f1d8ee0e3f10907b8edc368cf6636232d312
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/extract.py
    M ckan/lib/jinja_extensions.py
    M ckan/templates/header.html
    M doc/contributing/frontend/templating.rst

  Log Message:
  -----------
  [#1532] Use only {{ }}, not {% %}

We don't need multiple ways of calling the same method.


  Commit: 6eb9f077a642ac9bffba5f0d9c2f257a5837fe74
      https://github.com/ckan/ckan/commit/6eb9f077a642ac9bffba5f0d9c2f257a5837fe74
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

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

  Log Message:
  -----------
  [#1639] Fix bug when loading the users from ckan.hide_activity_from_users

The problem was that we did set ```user_list```, but never used it.


  Commit: 24791741a060b9778a8f5c03c1d255043ff0428f
      https://github.com/ckan/ckan/commit/24791741a060b9778a8f5c03c1d255043ff0428f
  Author: Tobias Preuss <tobias.preuss at googlemail.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Remove duplicate 'the'.


  Commit: 5ace2dee9a7234e0e8a5b5674e1ddaaa9e3af1be
      https://github.com/ckan/ckan/commit/5ace2dee9a7234e0e8a5b5674e1ddaaa9e3af1be
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py

  Log Message:
  -----------
  Merge branch '1505-invite-to-organization-causes-error'


  Commit: 0d634976324e6215a1942ba542b99dc51cdbfbb9
      https://github.com/ckan/ckan/commit/0d634976324e6215a1942ba542b99dc51cdbfbb9
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

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

  Log Message:
  -----------
  Merge pull request #1639 from ckan/1639-fix-bug-in-activity-stream-get-filtered-users

_activity_stream_get_filtered_users() doesn't work when there's the config ckan.hide_activity_from_users


  Commit: 5dbed5717b8bce80f2bdb0a33b0670b6c91c693e
      https://github.com/ckan/ckan/commit/5dbed5717b8bce80f2bdb0a33b0670b6c91c693e
  Author: amercader <amercadero at gmail.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

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

  Log Message:
  -----------
  Merge branch '1619-template-block'


  Commit: b9e4ce76c03721ab8bba914f7860c8538009bf1f
      https://github.com/ckan/ckan/commit/b9e4ce76c03721ab8bba914f7860c8538009bf1f
  Author: amercader <amercadero at gmail.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#781] Add small comment about ordering


  Commit: 0d58c768197eb0be241d7bfb80672ea2c001a64b
      https://github.com/ckan/ckan/commit/0d58c768197eb0be241d7bfb80672ea2c001a64b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Merge branch '781-improve-ifacets-docs'


  Commit: 9a4f1123364898b77f714b536692ee7182e7ffab
      https://github.com/ckan/ckan/commit/9a4f1123364898b77f714b536692ee7182e7ffab
  Author: amercader <amercadero at gmail.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M ckan/templates/group/snippets/group_item.html

  Log Message:
  -----------
  Merge branch '1594-package-group'


  Commit: 53cb0e6ef63f81a25cf5a560788b1d23f316e204
      https://github.com/ckan/ckan/commit/53cb0e6ef63f81a25cf5a560788b1d23f316e204
  Author: amercader <amercadero at gmail.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#781] Fix spelling to avoid test failure


  Commit: 3e54a65345e26eb2e431d9f1f04b541cc942b5d0
      https://github.com/ckan/ckan/commit/3e54a65345e26eb2e431d9f1f04b541cc942b5d0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge pull request #1638 from johnjohndoe/patch-1

Remove duplicate 'the'.


  Commit: 1c86590bbea2eed88c9d335201dd517bcfe05b37
      https://github.com/ckan/ckan/commit/1c86590bbea2eed88c9d335201dd517bcfe05b37
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge pull request #1519 from ckan/1519-fix-orgs-in-dashboard

Activity Stream from: Organization Error group not found


  Commit: caecaa8a2a8dd7dc6a2a2efdb5c855aa92ba5097
      https://github.com/ckan/ckan/commit/caecaa8a2a8dd7dc6a2a2efdb5c855aa92ba5097
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  Remove unwanted stuff


  Commit: 700cf428b9e7a0891d461bb3ea0afe8a068a6e4a
      https://github.com/ckan/ckan/commit/700cf428b9e7a0891d461bb3ea0afe8a068a6e4a
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    A ckan/new_tests/logic/test_converters.py

  Log Message:
  -----------
  Add unittests for new converter


  Commit: 465c5d4fa172eb121241d77b6edbfd3a8070b574
      https://github.com/ckan/ckan/commit/465c5d4fa172eb121241d77b6edbfd3a8070b574
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Don't special case limit=0


  Commit: fa44f6b460c6ca5ac87af4b99488e6bd52cb55be
      https://github.com/ckan/ckan/commit/fa44f6b460c6ca5ac87af4b99488e6bd52cb55be
  Author: Ian Ward <ian at excess.org>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  Merge branch '1612-facets-show-more'


  Commit: e396a516e1e1231f67763b29f535cddd49ba7717
      https://github.com/ckan/ckan/commit/e396a516e1e1231f67763b29f535cddd49ba7717
  Author: Ian Ward <ian at excess.org>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    M ckan/lib/helpers.py
    A ckan/new_tests/lib/test_helpers.py
    M ckan/templates/header.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html

  Log Message:
  -----------
  Merge branch '1532-bug-where-url-for-static-adds-leading-slash-for-absolute-urls'


  Commit: 460e6bc69978574490b945500e32356a09098dc4
      https://github.com/ckan/ckan/commit/460e6bc69978574490b945500e32356a09098dc4
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    A ckan/new_tests/logic/test_converters.py

  Log Message:
  -----------
  Merge pull request #1634 from ckan/1634-whitespace

Trailing whitespace in resource URLs not stripped


  Commit: f9961a56e441a5a3d05190bf64fe364ce2002a8e
      https://github.com/ckan/ckan/commit/f9961a56e441a5a3d05190bf64fe364ce2002a8e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M MANIFEST.in
    M README.rst
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M bin/travis-install-dependencies
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    A ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/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
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/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/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__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/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/resource.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_converters.py
    M ckan/new_tests/logic/test_validators.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/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/layout1.html
    M ckan/templates/home/layout2.html
    M ckan/templates/home/layout3.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.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/login_form.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/test_coding_standards.py
    R ckan_deb/DEBIAN/control.template
    R ckan_deb/usr/bin/ckan-create-instance
    R ckan_deb/usr/bin/ckan-instance-maintenance
    R ckan_deb/usr/bin/ckan-setup-solr
    R ckan_deb/usr/lib/ckan/common.sh
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    R ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v4.py
    A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_theme/__init__.py
    A ckanext/example_theme/custom_config_setting/__init__.py
    A ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
    A ckanext/example_theme/custom_config_setting/templates/snippets
    A ckanext/example_theme/v01_empty_extension/__init__.py
    A ckanext/example_theme/v01_empty_extension/plugin.py
    A ckanext/example_theme/v02_empty_template/__init__.py
    A ckanext/example_theme/v02_empty_template/plugin.py
    A ckanext/example_theme/v02_empty_template/templates/home/index.html
    A ckanext/example_theme/v03_jinja/__init__.py
    A ckanext/example_theme/v03_jinja/plugin.py
    A ckanext/example_theme/v03_jinja/templates/home/index.html
    A ckanext/example_theme/v04_ckan_extends/__init__.py
    A ckanext/example_theme/v04_ckan_extends/plugin.py
    A ckanext/example_theme/v04_ckan_extends/templates/home/index.html
    A ckanext/example_theme/v05_block/__init__.py
    A ckanext/example_theme/v05_block/plugin.py
    A ckanext/example_theme/v05_block/templates/home/layout1.html
    A ckanext/example_theme/v06_super/__init__.py
    A ckanext/example_theme/v06_super/plugin.py
    A ckanext/example_theme/v06_super/templates/home/layout1.html
    A ckanext/example_theme/v07_helper_function/__init__.py
    A ckanext/example_theme/v07_helper_function/plugin.py
    A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v08_custom_helper_function/__init__.py
    A ckanext/example_theme/v08_custom_helper_function/plugin.py
    A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v09_snippet/__init__.py
    A ckanext/example_theme/v09_snippet/plugin.py
    A ckanext/example_theme/v09_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/__init__.py
    A ckanext/example_theme/v10_custom_snippet/plugin.py
    A ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
    A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
    A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
    A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v12_extra_public_dir/__init__.py
    A ckanext/example_theme/v12_extra_public_dir/plugin.py
    A ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
    A ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html
    A ckanext/example_theme/v12_extra_public_dir/templates/snippets
    A ckanext/example_theme/v13_custom_css/__init__.py
    A ckanext/example_theme/v13_custom_css/plugin.py
    A ckanext/example_theme/v13_custom_css/public/example_theme.css
    A ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v13_custom_css/templates/base.html
    A ckanext/example_theme/v13_custom_css/templates/home
    A ckanext/example_theme/v13_custom_css/templates/snippets
    A ckanext/example_theme/v14_more_custom_css/__init__.py
    A ckanext/example_theme/v14_more_custom_css/plugin.py
    A ckanext/example_theme/v14_more_custom_css/public/example_theme.css
    A ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v14_more_custom_css/templates
    A ckanext/example_theme/v15_fanstatic/__init__.py
    A ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
    A ckanext/example_theme/v15_fanstatic/plugin.py
    A ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
    A ckanext/example_theme/v15_fanstatic/templates/base.html
    A ckanext/example_theme/v15_fanstatic/templates/home
    A ckanext/example_theme/v15_fanstatic/templates/snippets
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    A doc/.gitignore
    M doc/_templates/footer.html
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/contents.rst
    R doc/contributing.rst
    A doc/contributing/architecture.rst
    A doc/contributing/commit-messages.rst
    A doc/contributing/css.rst
    A doc/contributing/database-migrations.rst
    A doc/contributing/documentation.rst
    A doc/contributing/frontend/index.rst
    A doc/contributing/frontend/javascript-module-tutorial.rst
    A doc/contributing/frontend/resources.rst
    A doc/contributing/frontend/template-blocks.rst
    A doc/contributing/frontend/template-tutorial.rst
    A doc/contributing/frontend/templating.rst
    A doc/contributing/html.rst
    A doc/contributing/i18n.rst
    A doc/contributing/index.rst
    R doc/css-coding-standards.rst
    R doc/documentation-guidelines.rst
    R doc/frontend-development.rst
    R doc/html-coding-standards.rst
    R doc/i18n.rst
    R doc/javascript-module-tutorial.rst
    R doc/legacy-api.rst
    R doc/migration.rst
    R doc/resources.rst
    R doc/template-blocks.rst
    R doc/template-tutorial.rst
    R doc/templating.rst

  Log Message:
  -----------
  Merge branch 'master' into 1386-improve-factories

Conflicts:
	ckan/new_tests/factories.py


  Commit: 82a32806d46fb08f5394afa816683ea2a3db4758
      https://github.com/ckan/ckan/commit/82a32806d46fb08f5394afa816683ea2a3db4758
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  [#1386] Fix bug when creating multiple sysadmins


  Commit: cacb9340fa25fb8a231450fe79ee0e6b2aa70e04
      https://github.com/ckan/ckan/commit/cacb9340fa25fb8a231450fe79ee0e6b2aa70e04
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py
    A ckan/new_tests/test_factories.py

  Log Message:
  -----------
  [#1386] Add basic tests for the factories

These tests are very simple: try to create two objects using each factory, but
they already helped me find some bugs (fixed in this commit).

This also guarantees that we can safely call each factory with no parameters,
and they're not reusing unique variables (like was the case for the Sysadmin).


  Commit: 526d62445be3cadf723b6dbecccbd8e434379185
      https://github.com/ckan/ckan/commit/526d62445be3cadf723b6dbecccbd8e434379185
  Author: Michael Speth <mspeth at monky-games.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datapusher/plugin.py
    M doc/maintaining/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  Added xlsx and tsv to the defaults for ckan.datapusher.formats.


  Commit: b7ffdf299e450159044c54df822ec060d71731f2
      https://github.com/ckan/ckan/commit/b7ffdf299e450159044c54df822ec060d71731f2
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M ckan/new_tests/test_factories.py

  Log Message:
  -----------
  [#1386] The factories' tests must work without reseting the DB between methods

The factories' methods should work no mater which order they're called, nor how
many times they're called. Because of this, we don't need to reset the DB
inbetween each test method. If this doesn't work, it's because the factories
are broken.


  Commit: 3e14850edd94cad7e8a299cea6334098223e4e82
      https://github.com/ckan/ckan/commit/3e14850edd94cad7e8a299cea6334098223e4e82
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  [#1386] Fix _get_action_user_name() docs, as we renamed auth_user -> user


  Commit: 80b531966407a1a48d23ad80b971fde337ebf046
      https://github.com/ckan/ckan/commit/80b531966407a1a48d23ad80b971fde337ebf046
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py
    M ckan/new_tests/test_factories.py

  Log Message:
  -----------
  [#1386] Fix bug where the dataset factory didn't allow to use anonymous user


  Commit: 4deaed97f0e02fbb1069043fbd22d5771bf31f10
      https://github.com/ckan/ckan/commit/4deaed97f0e02fbb1069043fbd22d5771bf31f10
  Author: Michael Speth <mspeth at monky-games.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datapusher/plugin.py
    M doc/maintaining/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  [#1644] Fixed 79 char limit for datapusher.format and reformated python
array.


  Commit: 05b87bdcb399fa50019096cb30b67b7f5dbaca79
      https://github.com/ckan/ckan/commit/05b87bdcb399fa50019096cb30b67b7f5dbaca79
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  [#1386] Simplify docs for _get_action_user_name()

The documentation on how to create, for example, a Dataset with an specific
user is specific to the Dataset factory. The same can be said for any factory
that allows an user.

It would be good to use the same pattern (passing a user dict as "user" to the
factory) in all factories.


  Commit: da028ac32514af5b03d4fbec1662ea34e9de22dc
      https://github.com/ckan/ckan/commit/da028ac32514af5b03d4fbec1662ea34e9de22dc
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  [#1386] Use a unique name for each created Resource


  Commit: ee3788634109b825b5593cd07c5a4297b65d18ab
      https://github.com/ckan/ckan/commit/ee3788634109b825b5593cd07c5a4297b65d18ab
  Author: Michael Speth <mspeth at monky-games.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  [#1644] Removed white space at end of line & I think fixed line intendation.


  Commit: f8f8ca75583642e42dd97314081c3a0dbb528a25
      https://github.com/ckan/ckan/commit/f8f8ca75583642e42dd97314081c3a0dbb528a25
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M .coveragerc
    M bin/travis-run-tests

  Log Message:
  -----------
  [#1650] Calculate coverage on Travis' builds


  Commit: 2ae56b8475b727d97f6c7287b1709be28a806d00
      https://github.com/ckan/ckan/commit/2ae56b8475b727d97f6c7287b1709be28a806d00
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#1650] Upgrade coveralls requirement to 0.4.1

Just to keep us not too far behind.


  Commit: 01372cb8b826f3901b5b23c9f11d0f6a277c1d3d
      https://github.com/ckan/ckan/commit/01372cb8b826f3901b5b23c9f11d0f6a277c1d3d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  [#1650] Add coverage badge to README


  Commit: 9eb6d7c8d84d1fc589d848f3aa8a48bc6972c8c0
      https://github.com/ckan/ckan/commit/9eb6d7c8d84d1fc589d848f3aa8a48bc6972c8c0
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M .coveragerc
    M README.rst
    M bin/travis-run-tests
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #1650 from ckan/1650-reenable-coveralls

Re-enable coveralls


  Commit: 40d586c6a98e5c934a550f2c3515fbff32bd0a48
      https://github.com/ckan/ckan/commit/40d586c6a98e5c934a550f2c3515fbff32bd0a48
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datapusher/plugin.py
    M doc/maintaining/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #1644 from Conzar/master

Added xlsx and tsv to the defaults for ckan.datapusher.formats.


  Commit: 9d35add335d7edb81ffe467b4e1220d2ec5051c7
      https://github.com/ckan/ckan/commit/9d35add335d7edb81ffe467b4e1220d2ec5051c7
  Author: Ian Ward <ian at excess.org>
  Date:   2014-04-16 (Wed, 16 Apr 2014)

  Changed paths:
    A doc/api.rst
    M doc/contributing/documentation.rst

  Log Message:
  -----------
  Merge branch '1622-oops-moved'


  Commit: 04e6ac4c0363bb2923c27ef6bad398b3f73ac819
      https://github.com/ckan/ckan/commit/04e6ac4c0363bb2923c27ef6bad398b3f73ac819
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-04-18 (Fri, 18 Apr 2014)

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

  Log Message:
  -----------
  Removed clean_action_name as it causes confusion


  Commit: 196b3f070ccae8ffb85328b390a2f2c4f8c15ba0
      https://github.com/ckan/ckan/commit/196b3f070ccae8ffb85328b390a2f2c4f8c15ba0
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M .coveragerc
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M MANIFEST.in
    M README.rst
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    A ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M 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
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/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
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M 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
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/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/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__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/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/resource.py
    M ckan/model/user.py
    A ckan/new_tests/controllers/test_util.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_converters.py
    M ckan/new_tests/logic/test_validators.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/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.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/login_form.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    A doc/.gitignore
    M doc/_templates/footer.html
    M doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/appendices/solr-multicore.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    M doc/conf.py
    R doc/configuration.rst
    M doc/contents.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    M doc/contributing/release-process.rst
    A doc/contributing/simple-code-contributions.rst
    A doc/contributing/string-i18n.rst
    A doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/email-notifications.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/getting-started.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/images/manage_users.jpg
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    M doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M doc/theming/templates.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    M doc/user-guide.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1364-search-form-label-tweak


  Commit: 78b6e6dadc0ea6654a72f8634650424ee6ca5e20
      https://github.com/ckan/ckan/commit/78b6e6dadc0ea6654a72f8634650424ee6ca5e20
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/templates/home/snippets/search.html

  Log Message:
  -----------
  Merge pull request #1364 from ckan/1364-search-form-label-tweak

[#1364] Homepage search fixes


  Commit: 9567f83a2460e9acc251fb18e96f9ea60e1447bd
      https://github.com/ckan/ckan/commit/9567f83a2460e9acc251fb18e96f9ea60e1447bd
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  [#1386] Small refactoring in a factories' helper


  Commit: 84536aa099f86b7a251028a59e923a4a21f2a1de
      https://github.com/ckan/ckan/commit/84536aa099f86b7a251028a59e923a4a21f2a1de
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/new_tests/factories.py
    A ckan/new_tests/test_factories.py

  Log Message:
  -----------
  Merge pull request #1386 from ckan/1386-improve-factories

[WIP] Improve new tests factories


  Commit: f1d883837dc09b7767f4f083104fa4d8477fc9b5
      https://github.com/ckan/ckan/commit/f1d883837dc09b7767f4f083104fa4d8477fc9b5
  Author: Ian Ward <ian at excess.org>
  Date:   2014-04-23 (Wed, 23 Apr 2014)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1625-remove-clean-action-name'


  Commit: cd7fb37430eceb37c5e3f81db4eb8e95f8945f25
      https://github.com/ckan/ckan/commit/cd7fb37430eceb37c5e3f81db4eb8e95f8945f25
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M .coveragerc
    M README.rst
    M bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_helpers.py
    M ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/auth/test_create.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_converters.py
    A ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/plugin.py
    M dev-requirements.txt
    A doc/api.rst
    M doc/contributing/documentation.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1641-resource-create-requires-url

Conflicts:
	ckan/new_tests/logic/action/test_create.py


Compare: https://github.com/ckan/ckan/compare/114bdfd59b53...cd7fb37430ec

More information about the ckan-changes mailing list