[ckan-changes] [ckan/ckan] 252e95: [#1386] Add factories for Dataset and Resources

Wed Jun 18 06:32:55 UTC 2014

  Branch: refs/heads/1412-generate-apikey
  Home:   https://github.com/ckan/ckan
  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: 0aad65605435839f115b2651a5119dc7c6ce3b10
      https://github.com/ckan/ckan/commit/0aad65605435839f115b2651a5119dc7c6ce3b10
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] Tutorial for custom fields in packages

  Commit: b5646618e801d2d1a1db25416c71375e84da044a
      https://github.com/ckan/ckan/commit/b5646618e801d2d1a1db25416c71375e84da044a
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/index.rst

  Log Message:
  -----------
  [#790] add custom fields tutorial to extensions index

  Commit: c9038d91ab2e172960868604f3c2bbae5bddc128
      https://github.com/ckan/ckan/commit/c9038d91ab2e172960868604f3c2bbae5bddc128
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] clean up formatting

  Commit: 96233ece26929af181147bd61bd8755f5137577c
      https://github.com/ckan/ckan/commit/96233ece26929af181147bd61bd8755f5137577c
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckanext/example_idatasetform/plugin.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] resource customization tutorial

also added resource example to idataset form example

  Commit: 3a60326db6fb10307e7302fe330186a9a26abed8
      https://github.com/ckan/ckan/commit/3a60326db6fb10307e7302fe330186a9a26abed8
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] add tag-vocabularies to custom-fields tutorial

  Commit: 68cc993368f81347f326c7abeed72c42c45f450d
      https://github.com/ckan/ckan/commit/68cc993368f81347f326c7abeed72c42c45f450d
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] fix titles to match docs style guidelines

  Commit: 92516d1e917b056a4102560d4ad04a502ebd679f
      https://github.com/ckan/ckan/commit/92516d1e917b056a4102560d4ad04a502ebd679f
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/plugin_v5.py
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    M doc/_themes/sphinx-theme-okfn
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] custom fields tutorial

move source for tutorial into it's own files

  Commit: 1dd533613e9393c74cbe9e87c64142675dee26b1
      https://github.com/ckan/ckan/commit/1dd533613e9393c74cbe9e87c64142675dee26b1
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A ckanext/example_idatasetform/new_tests/__init__.py
    A ckanext/example_idatasetform/new_tests/test_example_idatasetform.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M doc/extensions/adding-custom-fields.rst
    M setup.py

  Log Message:
  -----------
  [#790] custom fields tutorial

* Add tests to example_idatasetform plugin.
* Split out source from tutorial into plugins so they can be tested
* Use sphinx referencing
* Add section on validators and conveters
* Minor rewrites, fix titles, etc.

  Commit: 453a18c69caf868d8492390add4a524591d87bcd
      https://github.com/ckan/ckan/commit/453a18c69caf868d8492390add4a524591d87bcd
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  [#790] undo doc subproject commits

  Commit: d7d7adcd65b6c79d1dfc0fa2bb23befd752e7b8f
      https://github.com/ckan/ckan/commit/d7d7adcd65b6c79d1dfc0fa2bb23befd752e7b8f
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    R ckanext/example_idatasetform/plugin_v5.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] remove unused plugin version

  Commit: 33d747091839b4b679b49e165cd80a67976f2e38
      https://github.com/ckan/ckan/commit/33d747091839b4b679b49e165cd80a67976f2e38
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckanext/example_idatasetform/new_tests/test_example_idatasetform.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] pep8, fix tests by preventing plugins from loading during import

  Commit: 3fca1af3714af5d204bfadcd82e417bb26412574
      https://github.com/ckan/ckan/commit/3fca1af3714af5d204bfadcd82e417bb26412574
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckanext/example_idatasetform/new_tests/test_example_idatasetform.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] IDatasetForm tutorial cleanups

  Commit: ac9ceb194e48270f550d2899f58bc4d8fbf8728a
      https://github.com/ckan/ckan/commit/ac9ceb194e48270f550d2899f58bc4d8fbf8728a
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] IDatasetForm tutorial: add dataset search page sorting

  Commit: 689ab0a05f61a557ee956b03ca016c0e6f6bfa39
      https://github.com/ckan/ckan/commit/689ab0a05f61a557ee956b03ca016c0e6f6bfa39
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A ckanext/example_idatasetform/templates/package/search.html

  Log Message:
  -----------
  [#790] Add IDatasetForm search template

  Commit: cb1534b414e691eda8be12cc6c397ea1c4dbcede
      https://github.com/ckan/ckan/commit/cb1534b414e691eda8be12cc6c397ea1c4dbcede
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] idatasetform tutorial cleanups

  Commit: ecb70ec152bb4c771dae94b78a8daaa8c819b901
      https://github.com/ckan/ckan/commit/ecb70ec152bb4c771dae94b78a8daaa8c819b901
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] idatasetform tutorial cleanups

  Commit: 7d1ac48ffba1bffdca709ad21c127f991d40f7e3
      https://github.com/ckan/ckan/commit/7d1ac48ffba1bffdca709ad21c127f991d40f7e3
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M doc/extensions/adding-custom-fields.rst

  Log Message:
  -----------
  [#790] idatasetform tutorial cleanups

  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: 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: 5bf5a534e11c4c275de3dec823ae575a6a16e88d
      https://github.com/ckan/ckan/commit/5bf5a534e11c4c275de3dec823ae575a6a16e88d
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/read_base.html

  Log Message:
  -----------
  Use the full organization dict to display orgs

The package page uses only the bits of the organization dict that is returned
from package_show, this doesn't have the image_display_url and therefore
organization images are not shown anymore. This uses a new helper to get the
full organization dict.

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

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  [#1550] Show the file name when uploading a resource

Hiding it is bad makes it hard for the user to check its URL (although it makes
it more difficult for her to change it by mistake).

When you first upload, some browsers have a safety feature to not disclosing
the file's full path to the page so, instead of getting something like:

```
/home/vitor/datasets/unemployment.csv
```

You get:

```
C:\fakepath\unemployment.csv
```

To avoid bothering the user showing this ```fakepath``` stuff, we remove it,
showing just the file name. This only happens when uploading a file. The next
time you edit the resource, we'll have the entire URL, so that'll be shown
instead.

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

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Merge the merge and attached states into filled state

They're the same now.

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

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Refactor the state machine into a simpler architecture

We just have two states now, so we can simplify stuff.

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

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Initialize correctly the status of the image-upload

  Commit: 1d43bc7bbce3b16d6f2de580adfce54ccf6ce97d
      https://github.com/ckan/ckan/commit/1d43bc7bbce3b16d6f2de580adfce54ccf6ce97d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Remove "Remove" button, as we now only use the "X" at the input

  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: f90b85d21cf27a37d2ca6c1b6afb4783bf50c2fe
      https://github.com/ckan/ckan/commit/f90b85d21cf27a37d2ca6c1b6afb4783bf50c2fe
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M ckan/controllers/related.py
    M ckan/logic/action/get.py
    M ckan/templates/package/related_list.html

  Log Message:
  -----------
  [#1617] Clean up templates/package/related_list

Stop using the package dict unnecessarily

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

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  Fix pep8

  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
    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/__init__.py
    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: 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: 567a0dbecb58b4321b37d184da3efa73ca123bf7
      https://github.com/ckan/ckan/commit/567a0dbecb58b4321b37d184da3efa73ca123bf7
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Disable URL field when uploading image

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

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Remove unused "template" option

As far as I could see, this was never used. Maybe the structure of this code
came from copy/pasting from somewhere else where it made sense, and it was left
by mistake.

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

  Changed paths:
    M ckanext/stats/__init__.py

  Log Message:
  -----------
  [#291] Configure ckanext.stats as namespace packages

  Commit: 73b1242d1c7f3f6d7956b2e598136bac67b299ba
      https://github.com/ckan/ckan/commit/73b1242d1c7f3f6d7956b2e598136bac67b299ba
  Author: amercader <amercadero at gmail.com>
  Date:   2014-04-17 (Thu, 17 Apr 2014)

  Changed paths:
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#1652] Fix auth when creating a DataStore resource directly

If you provided a dataset id on datastore_create to create the resource
directly, the auth functions failed as they expected a resource. This
changes the datastore_create auth function to use package_update instead
of resource_update if that is the case.

  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
    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/__init__.py
    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: 2e53006403a4ddc0f940d1d22d3640d2a14fd915
      https://github.com/ckan/ckan/commit/2e53006403a4ddc0f940d1d22d3640d2a14fd915
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M .coveragerc
    M MANIFEST.in
    M README.rst
    M bin/travis-run-tests
    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/auth/create.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/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
    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
    A ckan/new_tests/logic/test_converters.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/resource_form.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/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.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/plugin.py
    M dev-requirements.txt
    A doc/_themes/sphinx-theme-okfn
    A doc/api.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/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/datastore.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/javascript.rst
    M doc/theming/templates.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1592-pkg-org-img

  Commit: 1808a81182e987923000b369f7e74b1ab7194d8c
      https://github.com/ckan/ckan/commit/1808a81182e987923000b369f7e74b1ab7194d8c
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  fix paster db clean again

User.get() leaves an open transaction when the site user is added to the
pylons context, commit here closes it so it does not lock tables when
running paster db clean

  Commit: f31a1924bc8539ab73260771b31cd5174b19b1f9
      https://github.com/ckan/ckan/commit/f31a1924bc8539ab73260771b31cd5174b19b1f9
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  fix paster db clean

defer commit from get_site_user and attach it to pylons context first

  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: 7f0e59e05257e935b0a83d0bce50c0a05f8a8170
      https://github.com/ckan/ckan/commit/7f0e59e05257e935b0a83d0bce50c0a05f8a8170
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

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

  Log Message:
  -----------
  [#1656] add doc string about defer_commit to get_site_user

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

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Disable URL input if it belongs to an uploaded file

  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: ac11f87037d5e383d75c2e1580ed50396e5d8417
      https://github.com/ckan/ckan/commit/ac11f87037d5e383d75c2e1580ed50396e5d8417
  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:
  -----------
  [#1674] Add policy that pull requests shouldn't lower the test coverage

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

  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: db1883a09bd64647f16f861a145c73d52be32f94
      https://github.com/ckan/ckan/commit/db1883a09bd64647f16f861a145c73d52be32f94
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Catch NotFound error in resource_proxy

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

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  Add tests for non-existent resource

  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: 1760033efaffdc706f9c38a34daf120160f64240
      https://github.com/ckan/ckan/commit/1760033efaffdc706f9c38a34daf120160f64240
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

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

  Log Message:
  -----------
  Don't pass context around unnecessarily

  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: cc7e91743d179964dcf271875bc10db64b6fc0c9
      https://github.com/ckan/ckan/commit/cc7e91743d179964dcf271875bc10db64b6fc0c9
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1697] Don't break PEP8 tests if test files have lines >79 chars

According to naming test methods [1] in our testing coding standards, we should
make the test names clear "...even if it means your method name gets really
long, since we don’t write code that calls our test methods there’s no
advantage to having short test method names".  Given this, we shouldn't
validate E501 on our test suite.

[1] https://ckan.readthedocs.org/en/latest/contributing/testing.html#naming-test-methods

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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1697] Revert blacklisted files removed in cc7e917

They still fail even without validating E501.

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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1697] Unblacklist test files that are passing PEP8

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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/tests/functional/test_tracking.py

  Log Message:
  -----------
  [#1697] Fix minor PEP8 issues

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

  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: 2a3312529ec70aa77cb9088f36d6f830ef9cb841
      https://github.com/ckan/ckan/commit/2a3312529ec70aa77cb9088f36d6f830ef9cb841
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Catch NotFound, ValidationError, and NotAuthorized

  Commit: c3452aec491d182fe2a0c0753b0d8c5c3c6cdde8
      https://github.com/ckan/ckan/commit/c3452aec491d182fe2a0c0753b0d8c5c3c6cdde8
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ckanext/stats/__init__.py

  Log Message:
  -----------
  Merge pull request #291 from ckan/291-remove-warnings-during-setup

Alarming messages during setup

  Commit: c68ae4fa9a75c8042ee4130d4bfc0e7c42492001
      https://github.com/ckan/ckan/commit/c68ae4fa9a75c8042ee4130d4bfc0e7c42492001
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Update year in readme

  Commit: 55cdfe4a047788f06da2babbb1cfdfa7b9c6d5b2
      https://github.com/ckan/ckan/commit/55cdfe4a047788f06da2babbb1cfdfa7b9c6d5b2
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Merge pull request #1699 from domoritz/patch-1

Update year in readme

  Commit: 0988eb6a84fff39be1f17c0750a5a4c3ee3ed5ed
      https://github.com/ckan/ckan/commit/0988eb6a84fff39be1f17c0750a5a4c3ee3ed5ed
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  Merge pull request #1550 from ckan/1550-what-file-did-i-upload

[#1550] Show uploaded filename

  Commit: 30426d7441828d9bdc308a2eb3f833b4d74decdb
      https://github.com/ckan/ckan/commit/30426d7441828d9bdc308a2eb3f833b4d74decdb
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    A ckan/public/base/vendor/select2/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js

  Log Message:
  -----------
  [#1512] Upgrade select2

This fixes the issues we had with tag autocomplete.

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

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1703] Fix bug when uploading resources

The problem was that we used to set the URL input as "disabled", which caused
the browser not to send its value when submitting the FORM. The solution is
simple: use "readonly" instead.

  Commit: 5e731d59ed0a83fb76f72c4f7e25cd8d38db32c3
      https://github.com/ckan/ckan/commit/5e731d59ed0a83fb76f72c4f7e25cd8d38db32c3
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1697] Add comment explaining why we're ignoring E501 on tests

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

  Changed paths:
    M doc/images/add_dataset_3.jpg
    M doc/user-guide.rst

  Log Message:
  -----------
  [#1691] Update "Add group" explanation in "Adding a new dataset" docs

  Commit: 337b314a421e57659d610199e0bb2363fd61e721
      https://github.com/ckan/ckan/commit/337b314a421e57659d610199e0bb2363fd61e721
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  Merge pull request #1703 from ckan/1703-error-when-uploading-resource

Error when uploading new resource

  Commit: 39226d34ef2bd2e7b1ac9f1824904faa197fd689
      https://github.com/ckan/ckan/commit/39226d34ef2bd2e7b1ac9f1824904faa197fd689
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M doc/images/add_dataset_3.jpg
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge pull request #1691 from ckan/1691-update-add-group-docs

Remove "Add group" explanation on docs' "Adding a new dataset" page

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

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Fix typo datesets -> datasets

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

  Changed paths:
    A ckan/public/base/vendor/select2/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js

  Log Message:
  -----------
  Merge pull request #1512 from ckan/1512-upgrade-select2

Dataset tags autocomplete doesn't work

  Commit: 9e8e5a4dde817d090822d1947bd0dfd52a2f187e
      https://github.com/ckan/ckan/commit/9e8e5a4dde817d090822d1947bd0dfd52a2f187e
  Author: Ian Ward <ian at excess.org>
  Date:   2014-05-12 (Mon, 12 May 2014)

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

  Log Message:
  -----------
  [#1711] prevent membership update when updating orgs

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

  Changed paths:
    R ckanext/example_idatasetform/new_tests/__init__.py
    R ckanext/example_idatasetform/new_tests/test_example_idatasetform.py
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py

  Log Message:
  -----------
  [#790] save pylons config prior to tests, restore config in teardown

The plugin implements IConfigurer which adds a directory to the
templates. This clashes with the tests for the multilingual extension
that are running off the legacy templates. Having the
package/search.html template here causes the clash.

Saving and restoring the config means the multilingual tests will not
pickup and templates from this plugin.

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

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py

  Log Message:
  -----------
  [#790] add test for search ordering by custom fields

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

  Changed paths:
    M .coveragerc
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M MANIFEST.in
    M README.rst
    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/controllers/feed.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/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.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/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.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/logic/validators.py
    M ckan/model/license.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/new_authz.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
    A ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    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/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    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/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_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/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_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/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/__init__.py
    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/stats/__init__.py
    M dev-requirements.txt
    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/javascript.rst
    M doc/contributing/pull-requests.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/testing.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
    M doc/images/add_dataset_3.jpg
    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
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrading.rst

  Log Message:
  -----------
  Merge branch 'master' into 790-idatasetform-tutorial

Conflicts:
	ckan/new_tests/helpers.py

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

  Changed paths:
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py

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

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

  Changed paths:
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py

  Log Message:
  -----------
  [#790] make tests python 2.6 compatible

  Commit: 225933e65e75cc433333f1e4837b0858392ced0b
      https://github.com/ckan/ckan/commit/225933e65e75cc433333f1e4837b0858392ced0b
  Author: Rodrigo Parra <rodpar07 at gmail.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/custom-fields.js

  Log Message:
  -----------
  [#1708] Use data-module attribute in custom-fields JavaScript module

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

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

  Log Message:
  -----------
  [#1711] document packages ignored by organization_update

  Commit: b8faad3618c8ab55984e730f745071d9fe9aca78
      https://github.com/ckan/ckan/commit/b8faad3618c8ab55984e730f745071d9fe9aca78
  Author: Tom Lukasiak <tlukasiak at gmail.com>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M ckan/templates/footer.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html

  Log Message:
  -----------
  Changed external http:// links to // protocol-independent paths

  Commit: 1686c2494a78603164412ad1ab07e1d95dab648b
      https://github.com/ckan/ckan/commit/1686c2494a78603164412ad1ab07e1d95dab648b
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M ckan/templates/footer.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html

  Log Message:
  -----------
  Merge pull request #1719 from tlukasiak/master

Changed external http:// links to // protocol-independent paths

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

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#1711] reduce context unpleasantness

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

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

  Log Message:
  -----------
  [#1711] group_dict_save: save extras before session.commit+rebuild

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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/read_base.html

  Log Message:
  -----------
  Merge branch '1592-pkg-org-img'

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

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

  Log Message:
  -----------
  Merge branch '1674-new-code-shouldnt-lower-coverage'

  Commit: 33d1971b2ebf3e95523f58a99c12e65bfb590783
      https://github.com/ckan/ckan/commit/33d1971b2ebf3e95523f58a99c12e65bfb590783
  Author: amercader <amercadero at gmail.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M README.rst
    M ckan/config/middleware.py
    M ckan/lib/helpers.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/factories.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    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/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/templates/footer.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckanext/stats/__init__.py
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/images/add_dataset_3.jpg
    M doc/maintaining/installing/deployment.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' into 1652-datastore-resources-auth

  Commit: 31dcb2cbbd09eab1cf30a0d6632fd814f285431c
      https://github.com/ckan/ckan/commit/31dcb2cbbd09eab1cf30a0d6632fd814f285431c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#1652] Fix dodgy test

  Commit: e8c7443b65289b2eb06e554a961d8fd7b979f3f0
      https://github.com/ckan/ckan/commit/e8c7443b65289b2eb06e554a961d8fd7b979f3f0
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  [#1684] Wrap error message in _

  Commit: 418d45cc4abb7d67e4e55039f2e57f0cf65746ba
      https://github.com/ckan/ckan/commit/418d45cc4abb7d67e4e55039f2e57f0cf65746ba
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/custom-fields.js

  Log Message:
  -----------
  Merge pull request #1716 from rparrapy/1708-use-data-module-attribute-in-custom-fields

[#1708] Use data-module attribute in custom-fields JavaScript module

  Commit: e0f1ab407d5294731965605636d6b300c4e8bbc6
      https://github.com/ckan/ckan/commit/e0f1ab407d5294731965605636d6b300c4e8bbc6
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  import _

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

  Changed paths:
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  Merge branch 'resource-proxy-404'

  Commit: 15a71ab82308b50058cb387e98b5ce6b9b2f9af8
      https://github.com/ckan/ckan/commit/15a71ab82308b50058cb387e98b5ce6b9b2f9af8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Merge pull request #1711 from wardi/1711-organization-update-notfound-package

 prevent packages update in organization_update

  Commit: f7e9b6927a4dd1a1f1aed6acacc52e564fbc2a1a
      https://github.com/ckan/ckan/commit/f7e9b6927a4dd1a1f1aed6acacc52e564fbc2a1a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M README.rst
    M ckan/config/middleware.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.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/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    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/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/templates/footer.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/images/add_dataset_3.jpg
    M doc/maintaining/installing/deployment.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/ckan/ckan into 1656-fix-paster-db-clean

  Commit: 12744924e254e52a5722e89a4d495a612f282c4a
      https://github.com/ckan/ckan/commit/12744924e254e52a5722e89a4d495a612f282c4a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

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

  Log Message:
  -----------
  Merge branch '1656-fix-paster-db-clean'

  Commit: 47fe67aaaf93811bebefad5f07041865092db25a
      https://github.com/ckan/ckan/commit/47fe67aaaf93811bebefad5f07041865092db25a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M .coveragerc
    M README.rst
    M bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.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/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/test_converters.py
    M ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    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/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/templates/footer.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckanext/datapusher/plugin.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M dev-requirements.txt
    A doc/api.rst
    M doc/contributing/documentation.rst
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/images/add_dataset_3.jpg
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/deployment.rst
    M doc/user-guide.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1617-detached-instance

  Commit: 060d5c6eb48067ade66c3dfa551a69b2b2623bd6
      https://github.com/ckan/ckan/commit/060d5c6eb48067ade66c3dfa551a69b2b2623bd6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/templates/footer.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M doc/contributing/pull-requests.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 790-idatasetform-tutorial

  Commit: a95a44db285ec33d2ca3cee05c555c10ab41e82a
      https://github.com/ckan/ckan/commit/a95a44db285ec33d2ca3cee05c555c10ab41e82a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/templates/package/search.html
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A doc/extensions/adding-custom-fields.rst
    M doc/extensions/index.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '790-idatasetform-tutorial'

  Commit: 3c61c253a036ebb7ae040b832e90ed37b446041c
      https://github.com/ckan/ckan/commit/3c61c253a036ebb7ae040b832e90ed37b446041c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1193] Deprecate helpers.get_action()

Fixes #1193

  Commit: 2c512b187c4dbc2ce1980d066bfc1f921f6d12b8
      https://github.com/ckan/ckan/commit/2c512b187c4dbc2ce1980d066bfc1f921f6d12b8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ckan/controllers/related.py
    M ckan/templates/package/related_list.html

  Log Message:
  -----------
  Merge branch '1617-detached-instance'

  Commit: cff83a8c58a2c35725c3389a3ab4fa41c090b413
      https://github.com/ckan/ckan/commit/cff83a8c58a2c35725c3389a3ab4fa41c090b413
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M doc/theming/best-practices.rst

  Log Message:
  -----------
  [#1694] Document using extra_vars over c

  Commit: 1f16dfa5783a95496b6703695badbc905fcda684
      https://github.com/ckan/ckan/commit/1f16dfa5783a95496b6703695badbc905fcda684
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

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

  Log Message:
  -----------
  [#1503] Clarify data vs metadata licenses

Fixes #1503

  Commit: e24f6a07f1451d6ed23a9f2825cc0677e51d3acb
      https://github.com/ckan/ckan/commit/e24f6a07f1451d6ed23a9f2825cc0677e51d3acb
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-05-22 (Thu, 22 May 2014)

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

  Log Message:
  -----------
  Merge pull request #1728 from ckan/1503-two-licenses-second-try

[#1503] Clarify data vs metadata licenses

  Commit: 760a7791105ccbc8dd6738162fdc8dcbd9ac1947
      https://github.com/ckan/ckan/commit/760a7791105ccbc8dd6738162fdc8dcbd9ac1947
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M ckan/controllers/related.py
    M ckan/templates/package/related_list.html
    M ckan/templates/package/snippets/package_form.html

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1193-deprecate-get-action-helper-second-try

  Commit: c932bb1be3100a770690eba5ff5336ee956217a5
      https://github.com/ckan/ckan/commit/c932bb1be3100a770690eba5ff5336ee956217a5
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1193] Move long deprecation message to changelog

Also add "deprecated" to docstring, needed to prevent warnings and test
fails.

  Commit: f0c87283f42af0a39ab7570d31babdcab5c99388
      https://github.com/ckan/ckan/commit/f0c87283f42af0a39ab7570d31babdcab5c99388
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M doc/contributing/architecture.rst

  Log Message:
  -----------
  [#1193] Improve doc on how to deprecate functions

  Commit: 5f4d52872111bee7143086e7daa2df7d02db564d
      https://github.com/ckan/ckan/commit/5f4d52872111bee7143086e7daa2df7d02db564d
  Author: Ian Ward <ian at excess.org>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '1697-dont-validate-e501-on-tests'

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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1697] Simplify _is_test() a bit

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

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1697] Remove ckanext/resourceproxy/tests/test_proxy.py from blacklist

It's passing now.

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

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#1697] Fix PEP8's E303 on ckanext/resourceproxy/tests/test_proxy.py

  Commit: 973d982b30c2fddd6243aafbfb2986366e03fc6e
      https://github.com/ckan/ckan/commit/973d982b30c2fddd6243aafbfb2986366e03fc6e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '1697-dont-validate-e501-on-tests'

  Commit: 0ea13e88b3709555fb25422783a08c096dd3ff00
      https://github.com/ckan/ckan/commit/0ea13e88b3709555fb25422783a08c096dd3ff00
  Author: Brenda J. Butler <bjb at sourcerer.ca>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M ckanext/datastore/bin/datastore_setup.py

  Log Message:
  -----------
  add argument for postgresql port in datastore_setup.py

  Commit: 0f57bdc9830b2076681a367dd74aedfbb60f7582
      https://github.com/ckan/ckan/commit/0f57bdc9830b2076681a367dd74aedfbb60f7582
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

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

  Log Message:
  -----------
  [#1740] Support ignore_auth in group_ and organization_member_create

So we can call them from new-style action function tests, which depend
on ignore_auth.

  Commit: 3b1062632c89ddec13e87bcd7203e63156262ca3
      https://github.com/ckan/ckan/commit/3b1062632c89ddec13e87bcd7203e63156262ca3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  [#1738] Cover the case when calling via paster.

  Commit: e82d96c48d1dd77bb324cde033a4b31cdf6ed80e
      https://github.com/ckan/ckan/commit/e82d96c48d1dd77bb324cde033a4b31cdf6ed80e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  Merge pull request #1742 from ckan/1738-datastore-setup-postgresql-port

1738 datastore setup postgresql port

  Commit: f3558a8f1c3659bf8c4f4c8b5062343a9e55d533
      https://github.com/ckan/ckan/commit/f3558a8f1c3659bf8c4f4c8b5062343a9e55d533
  Author: Alice Heaton <a.heaton at nhm.ac.uk>
  Date:   2014-06-05 (Thu, 05 Jun 2014)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1743] Fetch list of flash messages from the loop itself to avoid issues with variables and block scopes.

  Commit: 4ee9278f0298f46ea65efa81cbc55491fb5349bc
      https://github.com/ckan/ckan/commit/4ee9278f0298f46ea65efa81cbc55491fb5349bc
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-06-06 (Fri, 06 Jun 2014)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  Merge remote-tracking branch 'aliceh75/1743-flash-message-not-displayed'

  Commit: c18f2cfa8c0cb08bc63fe789a615b019c3319a12
      https://github.com/ckan/ckan/commit/c18f2cfa8c0cb08bc63fe789a615b019c3319a12
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-06-09 (Mon, 09 Jun 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/helpers.py
    M doc/contributing/architecture.rst

  Log Message:
  -----------
  Merge pull request #1727 from ckan/1193-deprecate-get-action-helper-second-try

[#1193] Deprecate helpers.get_action()

  Commit: 861e1e1b8922669f6c70d5a484537dc3fd842331
      https://github.com/ckan/ckan/commit/861e1e1b8922669f6c70d5a484537dc3fd842331
  Author: tlacoyodefrijol <miguel.montiel at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M doc/theming/static-files.rst

  Log Message:
  -----------
  Update the complete route for "promoted-image.jpg"

  Commit: 39168fb75225c7b6f35ac0a037ab3cb96e2126ba
      https://github.com/ckan/ckan/commit/39168fb75225c7b6f35ac0a037ab3cb96e2126ba
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Merge branch '1740-group-and-org-member-create-support-ignore-auth'

  Commit: af6684275be326b2e64714c5fb995bcd7519d54b
      https://github.com/ckan/ckan/commit/af6684275be326b2e64714c5fb995bcd7519d54b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M doc/theming/static-files.rst

  Log Message:
  -----------
  Merge branch 'patch-1' of https://github.com/tlacoyodefrijol/ckan into tlacoyodefrijol-patch-1

  Commit: 0f7676feefe36382b1349a7cee9fb4e5cabdedb4
      https://github.com/ckan/ckan/commit/0f7676feefe36382b1349a7cee9fb4e5cabdedb4
  Author: amercader <amercadero at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M doc/theming/static-files.rst

  Log Message:
  -----------
  Add missing colon

  Commit: 25782d3bdc0e6cc61a195f4e5cbae0f6f5b09b4b
      https://github.com/ckan/ckan/commit/25782d3bdc0e6cc61a195f4e5cbae0f6f5b09b4b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M doc/theming/static-files.rst

  Log Message:
  -----------
  Merge branch 'tlacoyodefrijol-patch-1'

  Commit: 37aba0fd86a70e64474a1d39d437d959c16eb0ef
      https://github.com/ckan/ckan/commit/37aba0fd86a70e64474a1d39d437d959c16eb0ef
  Author: Jari Voutilainen <jari.voutilainen at iki.fi>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M ckan/public/base/vendor/jquery.min.js

  Log Message:
  -----------
  Upgrade minified jquery to 1.10.2, for issue #1750

  Commit: d60d6e574f3a62b6afd358bd9739ce3949511b8e
      https://github.com/ckan/ckan/commit/d60d6e574f3a62b6afd358bd9739ce3949511b8e
  Author: Jari Voutilainen <jari.voutilainen at iki.fi>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M ckan/public/base/vendor/jquery.min.js

  Log Message:
  -----------
  [#1750] Upgrade minified jquery to 1.10.2

  Commit: 343b6f0f74a42510945ff4ddcb0ded4548d18275
      https://github.com/ckan/ckan/commit/343b6f0f74a42510945ff4ddcb0ded4548d18275
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M ckan/public/base/vendor/jquery.min.js

  Log Message:
  -----------
  Merge pull request #1762 from yhteentoimivuuspalvelut/1750-upgrade_minified_jquery

Upgrade minified jquery to 1.10.2, for issue #1750

  Commit: 070325076ad65dc9ac21b01f4a02550646beb425
      https://github.com/ckan/ckan/commit/070325076ad65dc9ac21b01f4a02550646beb425
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Merge pull request #1652 from ckan/1652-datastore-resources-auth

Creating a DataStore resource with the package_id fails for a normal user

  Commit: baca61be40b506c9b1ad9e9bdee3bd5a2b7a6878
      https://github.com/ckan/ckan/commit/baca61be40b506c9b1ad9e9bdee3bd5a2b7a6878
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M doc/theming/best-practices.rst

  Log Message:
  -----------
  Merge pull request #1694 from ckan/1694-document-extra-vars-over-c

Document using extra_vars instead of c

  Commit: 1fba75f61f5ab98c165c8b811e5709424961adc5
      https://github.com/ckan/ckan/commit/1fba75f61f5ab98c165c8b811e5709424961adc5
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M CHANGELOG.rst
    M README.rst
    M ckan/config/middleware.py
    M ckan/controllers/related.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.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/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/vendor/jquery.min.js
    A ckan/public/base/vendor/select2/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/templates/footer.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/page.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/test_tracking.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/bin/datastore_setup.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/plugin_v1.py
    A ckanext/example_idatasetform/plugin_v2.py
    A ckanext/example_idatasetform/plugin_v3.py
    A ckanext/example_idatasetform/plugin_v4.py
    A ckanext/example_idatasetform/templates/package/search.html
    A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
    A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
    A ckanext/example_idatasetform/tests/__init__.py
    A ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M doc/contributing/architecture.rst
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    A doc/extensions/adding-custom-fields.rst
    M doc/extensions/index.rst
    M doc/images/add_dataset_3.jpg
    M doc/maintaining/installing/deployment.rst
    M doc/theming/best-practices.rst
    M doc/theming/static-files.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1412-generate-apikey

  Commit: 9daaa36f38c9d40905748be8ccc5f405d052262c
      https://github.com/ckan/ckan/commit/9daaa36f38c9d40905748be8ccc5f405d052262c
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  Test the action and auth functions thoroughly

Compare: https://github.com/ckan/ckan/compare/47de288529fd...9daaa36f38c9