[ckan-changes] [ckan/ckan] 643bbe: Fix documentation for form.select

Mon May 5 19:18:38 UTC 2014

  Branch: refs/heads/1251-resource-view
  Home:   https://github.com/ckan/ckan
  Commit: 643bbe81cf903137554e586881e798fddb5c52a7
      https://github.com/ckan/ckan/commit/643bbe81cf903137554e586881e798fddb5c52a7
  Author: Hayden <haydenwaring at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  Fix documentation for form.select

  Commit: 8c5ec7f997ce93ba9734fbf69c42cfb974197f87
      https://github.com/ckan/ckan/commit/8c5ec7f997ce93ba9734fbf69c42cfb974197f87
  Author: Hayden <haydenwaring at gmail.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  Update form.html

  Commit: b9305b6f01fca1f70a476e92e7c1307f13ddfb0a
      https://github.com/ckan/ckan/commit/b9305b6f01fca1f70a476e92e7c1307f13ddfb0a
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  [#1601] Add ports.conf change to instructions

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

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#1434] add default_show_group_schema for customizing group show

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

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

  Log Message:
  -----------
  [#1434] use default_show_group_schema when no other schema given

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

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

  Log Message:
  -----------
  [#1641] resource_create validates being passed an "url" parameter

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

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

  Log Message:
  -----------
  [#1641] Recreate resource_create tests as "new_tests"

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

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

  Log Message:
  -----------
  Minor English typos fixes

  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: 50c31142d1b5db898795ae3b19bfb36a4f01fd03
      https://github.com/ckan/ckan/commit/50c31142d1b5db898795ae3b19bfb36a4f01fd03
  Author: Vítor Avelino <contact at vitoravelino.me>
  Date:   2014-04-23 (Wed, 23 Apr 2014)

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

  Log Message:
  -----------
  [#1538] Break long title words (module content heading on sidebar and media-item heading)

  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: fccfad0d4b64183ed1f5f8cf38f92e17b29f47e7
      https://github.com/ckan/ckan/commit/fccfad0d4b64183ed1f5f8cf38f92e17b29f47e7
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

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

  Log Message:
  -----------
  Revert "[#1641] Recreate resource_create tests as "new_tests""

This was more complex than I expected. To avoid blocking this issue, I'm
reverting it here and will work on it at #1669.

This reverts commit cf046dc4997367b84d0b04e1015cdfed0663cfad.

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

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

  Log Message:
  -----------
  [#1641] Refactor renaming TestCreate -> TestResourceCreate

  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

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

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

  Log Message:
  -----------
  [#1641] Rename test method so it reads more natural

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

  Changed paths:
    M doc/contributing/testing.rst

  Log Message:
  -----------
  [#1673] Change testing standards saying that not all methods need docstrings

If we follow the other coding standards, like making small tests, naming, etc.,
they should all be quite understandable just from the test name. So we leave
the option to add docstrings to the developer that's creating it, if she can't
make it simple enough not to need it.

  Commit: 251d0a51601b42ebd6063ca98c6ce8fc1ed18ba8
      https://github.com/ckan/ckan/commit/251d0a51601b42ebd6063ca98c6ce8fc1ed18ba8
  Author: Rodrigo Parra <rodpar07 at gmail.com>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M doc/contributing/test.rst

  Log Message:
  -----------
  [#1663] Remove redundant '--ckan-migration' explanation from test documentation

  Commit: f49954e272e638a39b0b6baf8da11fede905097f
      https://github.com/ckan/ckan/commit/f49954e272e638a39b0b6baf8da11fede905097f
  Author: Rodrigo Parra <rodpar07 at gmail.com>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M doc/contributing/test.rst

  Log Message:
  -----------
  Fix typo in migration testing documentation

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

  Changed paths:
    M doc/contributing/test.rst

  Log Message:
  -----------
  Merge pull request #1663 from rparrapy/patch-1

Remove repeated string.

  Commit: 6391dda7c6900142b5d3665fd42351e2d7ac51a0
      https://github.com/ckan/ckan/commit/6391dda7c6900142b5d3665fd42351e2d7ac51a0
  Author: Vítor Avelino <contact at vitoravelino.me>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

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

  Log Message:
  -----------
  [#1538] Fix indentation

  Commit: 55b78315eda22103f755e8ecaba78ec7c35d72f2
      https://github.com/ckan/ckan/commit/55b78315eda22103f755e8ecaba78ec7c35d72f2
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

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

  Log Message:
  -----------
  Merge pull request #1667 from vitoravelino/1538-break-long-words-small-containers

[#1538] Break long title words

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

  Changed paths:
    M doc/contributing/pull-requests.rst

  Log Message:
  -----------
  Fix link to "Testing CKAN" on "Making a pull request" doc page

  Commit: ef4571431813e5bff86d768fc736f99a0f0962dd
      https://github.com/ckan/ckan/commit/ef4571431813e5bff86d768fc736f99a0f0962dd
  Author: Vítor Avelino <contact at vitoravelino.me>
  Date:   2014-04-25 (Fri, 25 Apr 2014)

  Changed paths:
    A ckan/public/base/vendor/select2/README.md
    R ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    R ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2.png
    R ckan/public/base/vendor/select2/select2.png
    R ckan/public/base/vendor/select2/select2x2.png
    A ckan/public/base/vendor/select2/select2x2.png

  Log Message:
  -----------
  [#1278] Upgrade select2 to 3.4.5

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

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  Don't respond to GET requests

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

  Changed paths:
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1641-resource-create-requires-url

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

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/new_authz.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst

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

  Commit: 2330b2b92e96364df2da0a6f66903adf3c71da2c
      https://github.com/ckan/ckan/commit/2330b2b92e96364df2da0a6f66903adf3c71da2c
  Author: Ian Ward <ian at excess.org>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1692] fix int_validator

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

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1692] int_validator: accept all-whitespace for backwards compat.

  Commit: 3b0bae973ca59ced4b0a1466a9c2a24401d2f49d
      https://github.com/ckan/ckan/commit/3b0bae973ca59ced4b0a1466a9c2a24401d2f49d
  Author: Ian Ward <ian at excess.org>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1692] add tests for int_validator

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

  Changed paths:
    M ckan/logic/validators.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1692] fix int_validator tests and non-whole handling

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

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1692] remove doc tests

  Commit: 0d00ac2b677f635c3ae68510718f6dafcb3bd04e
      https://github.com/ckan/ckan/commit/0d00ac2b677f635c3ae68510718f6dafcb3bd04e
  Author: Ian Ward <ian at excess.org>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1692] fix int_validator tests more

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

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1692] suppress DeprecationWarning on test of invalid data to int_validator

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

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1692] use assert_equals

  Commit: 0074a9d01773781e4f746d93772f88b2b3e55cb6
      https://github.com/ckan/ckan/commit/0074a9d01773781e4f746d93772f88b2b3e55cb6
  Author: Ian Ward <ian at excess.org>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M doc/contributing/testing.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1673-not-all-test-methods-need-docstrings'

  Commit: cbec00a2a8977e07aeff48105709c43786809b12
      https://github.com/ckan/ckan/commit/cbec00a2a8977e07aeff48105709c43786809b12
  Author: Ian Ward <ian at excess.org>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1683-tracking-post'

  Commit: 6ca20c79f748b2374702b88f0bf3b615afa9840c
      https://github.com/ckan/ckan/commit/6ca20c79f748b2374702b88f0bf3b615afa9840c
  Author: Ian Ward <ian at excess.org>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1692] coding standards: single quotes

  Commit: 74dc38e902d084441d22ba0ae39481e7cc5fa3c6
      https://github.com/ckan/ckan/commit/74dc38e902d084441d22ba0ae39481e7cc5fa3c6
  Author: Ian Ward <ian at excess.org>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1692] coding standards: imports at top

  Commit: b20be7d67cdd0c5e9c33a24c4fcf12ea8d0ad981
      https://github.com/ckan/ckan/commit/b20be7d67cdd0c5e9c33a24c4fcf12ea8d0ad981
  Author: Ian Ward <ian at excess.org>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1692] follow testing pattern proposed in #1672

  Commit: c7f654c90c242e8df673e8060ea0ec23662dd653
      https://github.com/ckan/ckan/commit/c7f654c90c242e8df673e8060ea0ec23662dd653
  Author: Ian Ward <ian at excess.org>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1692] pep8

  Commit: 26e7e904060f468ba960b492ca68d00289bd5478
      https://github.com/ckan/ckan/commit/26e7e904060f468ba960b492ca68d00289bd5478
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    A ckan/public/base/vendor/select2/README.md
    R ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    R ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2.png
    R ckan/public/base/vendor/select2/select2.png
    R ckan/public/base/vendor/select2/select2x2.png
    A ckan/public/base/vendor/select2/select2x2.png

  Log Message:
  -----------
  Merge pull request #1680 from vitoravelino/1278-placeholder-select2

[#1278] Fix placeholder select2

  Commit: 84da02f410d5551469f5c3c5a89a56dc2991ba5f
      https://github.com/ckan/ckan/commit/84da02f410d5551469f5c3c5a89a56dc2991ba5f
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-02 (Fri, 02 May 2014)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  Merge pull request #1692 from wardi/fix-int-validator

fix int_validator

  Commit: 7742c388b3e6e611c98bc40420f585860f582160
      https://github.com/ckan/ckan/commit/7742c388b3e6e611c98bc40420f585860f582160
  Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  Merge pull request #1595 from hwaring/master

Fix documentation for form.select in macro/form.html

  Commit: e720f97d39b7ddf590074525a1dbe9d44a2fbf85
      https://github.com/ckan/ckan/commit/e720f97d39b7ddf590074525a1dbe9d44a2fbf85
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch '1601-source-deploy'

  Commit: 3f886918bcd09ae29fda216841f9d318c9ff6c87
      https://github.com/ckan/ckan/commit/3f886918bcd09ae29fda216841f9d318c9ff6c87
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'wardi/1434-add-default_show_group_schema'

  Commit: 8ddcb61b0584522b6a9debc558214d08baa78834
      https://github.com/ckan/ckan/commit/8ddcb61b0584522b6a9debc558214d08baa78834
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/new_authz.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    A ckan/public/base/vendor/select2/README.md
    R ckan/public/base/vendor/select2/README.md
    R ckan/public/base/vendor/select2/select2-spinner.gif
    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
    M ckan/public/base/vendor/select2/select2.min.js
    R ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/select2x2.png
    M ckan/templates/macros/form.html
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'master' into 1251-resource-view

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

Compare: https://github.com/ckan/ckan/compare/9767d3334c13...8ddcb61b0584