[ckan-changes] [okfn/ckan] cea08c: [#382] Remove keys from extras when using convert_...

GitHub noreply at github.com
Tue Jun 11 14:36:58 UTC 2013


  Branch: refs/heads/547-plugins-love
  Home:   https://github.com/okfn/ckan
  Commit: cea08c4192095c3069440c49826628cf456a3ee4
      https://github.com/okfn/ckan/commit/cea08c4192095c3069440c49826628cf456a3ee4
  Author: amercader <amercadero at gmail.com>
  Date:   2013-02-22 (Fri, 22 Feb 2013)

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

  Log Message:
  -----------
  [#382] Remove keys from extras when using convert_from_extras

If fields are moved to the top level, they should be removed from
extras. See #376 for discussion. Added test.

Basically adapt the converter for transforming this:

```
 ('extras', 1, '__extras'): {u'package_id': u'9fbddea7-31bf-4bf2-9595-ae7b5d9c1102',
                       u'revision_id': u'a13e1cf5-6ecb-4ea4-a4c2-f5c0d865e401'},
 ('extras', 1, 'deleted'): <ckan.lib.navl.dictization_functions.Missing object at 0x3c4a050>,
 ('extras', 1, u'id'): u'871cbb3c-8c93-4afa-bf2a-8f2123a7b365',
 ('extras', 1, u'key'): u'frequency',
 ('extras', 1, u'revision_timestamp'): '2013-02-22T17:33:11.577374',
 ('extras', 1, u'state'): u'active',
 ('extras', 1, u'value'): u'DAILY',
```
to this:

```
 ('frequency',): u'DAILY'
```


  Commit: 752bea2f5ae36f0f17815ecd1b396759726a7b81
      https://github.com/okfn/ckan/commit/752bea2f5ae36f0f17815ecd1b396759726a7b81
  Author: amercader <amercadero at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

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

  Log Message:
  -----------
  [#674] More descriptive Solr exceptions when indexing


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

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

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


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

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

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


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

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

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


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

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

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


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

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

  Log Message:
  -----------
  [#674] Capture socket error as well when contacting Solr


  Commit: aef190aac73b7cb1cea199686f9b9a66956e4118
      https://github.com/okfn/ckan/commit/aef190aac73b7cb1cea199686f9b9a66956e4118
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

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

  Log Message:
  -----------
  [#652] Require resource_show permissions to read datastore resources


  Commit: db1d6a69f341b21a24b466acb75404c60aba8a73
      https://github.com/okfn/ckan/commit/db1d6a69f341b21a24b466acb75404c60aba8a73
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-17 (Wed, 17 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#652] Fix auth test in action, use the normal user in the search tests instead of the sysadmin user


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

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

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


  Commit: c3f3e0bc6cdf2f857ef5aa2bd7e4866d2f65c7ff
      https://github.com/okfn/ckan/commit/c3f3e0bc6cdf2f857ef5aa2bd7e4866d2f65c7ff
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

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

  Log Message:
  -----------
  [#652][wip] Add test for search for private datasets


  Commit: aa6e38c8750b294445064b96ac9d2ed4dcc291ed
      https://github.com/okfn/ckan/commit/aa6e38c8750b294445064b96ac9d2ed4dcc291ed
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M doc/datastore-api.rst

  Log Message:
  -----------
  [#652] Only allow aliases in search to simplify checks. Also make this clear in the docs.


  Commit: 3f4363e8a2807d75e39533e68dfe13cfbeb971f7
      https://github.com/okfn/ckan/commit/3f4363e8a2807d75e39533e68dfe13cfbeb971f7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-18 (Thu, 18 Apr 2013)

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

  Log Message:
  -----------
  [#652] Make the private dataset test work


  Commit: 738c2fbd919e839c6f4d190840bfe86a6d320fc3
      https://github.com/okfn/ckan/commit/738c2fbd919e839c6f4d190840bfe86a6d320fc3
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#652] Provide more useful information if sql search goes wrong


  Commit: e8287b30da5fa64e4f8c127b342cfa7e5ad66605
      https://github.com/okfn/ckan/commit/e8287b30da5fa64e4f8c127b342cfa7e5ad66605
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  Clean up test code


  Commit: 04cb3f297759ec47ec8af7ff6580af2058a37158
      https://github.com/okfn/ckan/commit/04cb3f297759ec47ec8af7ff6580af2058a37158
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#652][wip] Add actions to make datastore resources private or public


  Commit: 091e16472e98c4bc2bff5c77629a1a58e27ce6a8
      https://github.com/okfn/ckan/commit/091e16472e98c4bc2bff5c77629a1a58e27ce6a8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

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

  Log Message:
  -----------
  [#652] Refactor checks whether resources exist


  Commit: 54d7a952f6c3fc1dc4bbbe7a389101049fc34304
      https://github.com/okfn/ckan/commit/54d7a952f6c3fc1dc4bbbe7a389101049fc34304
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

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

  Log Message:
  -----------
  [#652] Close connection, fix missing data_dict['connection_url']


  Commit: 87de3abbacff98ebd2acba106faba9468c9794ec
      https://github.com/okfn/ckan/commit/87de3abbacff98ebd2acba106faba9468c9794ec
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

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

  Log Message:
  -----------
  [#652] Automatically make resources private or public when the permissions change


  Commit: 198719e13301d818d3bb4f7e71c63a571cf9321d
      https://github.com/okfn/ckan/commit/198719e13301d818d3bb4f7e71c63a571cf9321d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  More helpful information about errors


  Commit: 9e68bca5b8528748840e8601c69af9d6f3e59ea0
      https://github.com/okfn/ckan/commit/9e68bca5b8528748840e8601c69af9d6f3e59ea0
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

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

  Log Message:
  -----------
  [#652] Fix missing connection_url


  Commit: e286f48bf6c8f30d3e220de5a5c5da5bdf53a70b
      https://github.com/okfn/ckan/commit/e286f48bf6c8f30d3e220de5a5c5da5bdf53a70b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#652] Refactor validation of possible methods


  Commit: 71dd1592885f4d7bc750ca7e0da95f52c36d7930
      https://github.com/okfn/ckan/commit/71dd1592885f4d7bc750ca7e0da95f52c36d7930
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#652] Properly report permission denied error in sql search


  Commit: fc14e37b79192ee690e355e74ca2f2e0b72be89c
      https://github.com/okfn/ckan/commit/fc14e37b79192ee690e355e74ca2f2e0b72be89c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#652] Get spelling right


  Commit: c626c001d70069017459cbc25b2a0907149c1246
      https://github.com/okfn/ckan/commit/c626c001d70069017459cbc25b2a0907149c1246
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

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

  Log Message:
  -----------
  [#652] Make sure that we have a connection url


  Commit: 43c578ec67dea9fcf7f78e13de44fdff15949f12
      https://github.com/okfn/ckan/commit/43c578ec67dea9fcf7f78e13de44fdff15949f12
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#652] We have to wrap the GRANT/REVOKE in a transaction to make it work


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#580] Fix resource edit errors losing info


  Commit: eb06a956b135cbb8aee26020f124556e9fbe2ece
      https://github.com/okfn/ckan/commit/eb06a956b135cbb8aee26020f124556e9fbe2ece
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

  Log Message:
  -----------
  [#652] Make private resources compatible with legacy mode


  Commit: d7414f432462966359e3f39dbfa9a12041a0c185
      https://github.com/okfn/ckan/commit/d7414f432462966359e3f39dbfa9a12041a0c185
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

  Log Message:
  -----------
  [#652] Test whether a new datastore resource is private if the CKAN resource is private


  Commit: 5a276670b0269e3f9eaae138785794b134556795
      https://github.com/okfn/ckan/commit/5a276670b0269e3f9eaae138785794b134556795
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  Clean up imports in datastore tests


  Commit: 4c926d393f2b73579d91fa43aaa293746500937e
      https://github.com/okfn/ckan/commit/4c926d393f2b73579d91fa43aaa293746500937e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

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

  Log Message:
  -----------
  [#652] Test whether the updates to the datastore resources work correctly


  Commit: 5724497f3cf48972280c76e620890a7b52790917
      https://github.com/okfn/ckan/commit/5724497f3cf48972280c76e620890a7b52790917
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Properly close the connection in permission checks and also flush create command to make sure that it's finished


  Commit: b7990696770aa0409162f683a33ba34d9f5b355b
      https://github.com/okfn/ckan/commit/b7990696770aa0409162f683a33ba34d9f5b355b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#652] Clean up


  Commit: bad48e66f7ee2511ffdee58481bcdaff11e52490
      https://github.com/okfn/ckan/commit/bad48e66f7ee2511ffdee58481bcdaff11e52490
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M doc/datastore-api.rst
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#652] Update docs concerning private resources


  Commit: b344381617c8270dca1597a053d5988f0f5d7eac
      https://github.com/okfn/ckan/commit/b344381617c8270dca1597a053d5988f0f5d7eac
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/public/base/less/homepage.less
    M ckan/templates/home/index.html
    M ckan/templates/snippets/group_item.html

  Log Message:
  -----------
  [#698] Makes group listing on homepage consistant height and length and such

Simply adds max-height to content to ensure list items are all of the same
height, also adds truncation to the title, decreases the truncation length of
the group description to make sure it's always on one line and adds a
min-height to the box to ensure that it's always the same height (even if there
is only 1 result)


  Commit: 02e01d6b79133b193a708aba6cb7cbfde50801c7
      https://github.com/okfn/ckan/commit/02e01d6b79133b193a708aba6cb7cbfde50801c7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#831] Remove unused authz action from package controller


  Commit: 3b6863eea377bde4995a08570be622637801c98f
      https://github.com/okfn/ckan/commit/3b6863eea377bde4995a08570be622637801c98f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

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

  Log Message:
  -----------
  [#831] Remove old commented out code


  Commit: d1fd00eb35c3846181809c6650c8533bd0f06622
      https://github.com/okfn/ckan/commit/d1fd00eb35c3846181809c6650c8533bd0f06622
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  IAuthenticator Improve docetrings a little


  Commit: fb5c1d73793916053aead934ac37189132b672c8
      https://github.com/okfn/ckan/commit/fb5c1d73793916053aead934ac37189132b672c8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

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

  Log Message:
  -----------
  Merge branch 'IAuthenticator-feature' of github.com:okfn/ckan into IAuthenticator-feature


  Commit: b452752f4a665eda819ee04eea11de1c824872cd
      https://github.com/okfn/ckan/commit/b452752f4a665eda819ee04eea11de1c824872cd
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

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

  Log Message:
  -----------
  @auth_sysadmins_check auth function decorator


  Commit: 597afb71ce0282830f3419e2df4fe5f5f88fb153
      https://github.com/okfn/ckan/commit/597afb71ce0282830f3419e2df4fe5f5f88fb153
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  [#864] Makes media-list items and media-grid much better looking and more functional

Includes:
- `.media-grid` now stacks nicely on top of each other and each item is it's
own box
- Also `.media-item`s now have a single thing to click on which makes it alot
easier to get to the related item
- Updates to media.less to decrease the amount of noise within the CSS
- Snippets for group_item, organization_item and related_item have been
simplified and a few blocks have been added to them for extendability
- Small fixes to related items index and sub pages


  Commit: 9ddfef527e627d20939fe27dcacbac5d7fe0d57e
      https://github.com/okfn/ckan/commit/9ddfef527e627d20939fe27dcacbac5d7fe0d57e
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-03 (Fri, 03 May 2013)

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

  Log Message:
  -----------
  [#864] Fix for removed class


  Commit: 79d437518271d974e88b3fe563b9d2f3e46d2aac
      https://github.com/okfn/ckan/commit/79d437518271d974e88b3fe563b9d2f3e46d2aac
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group_item.html

  Log Message:
  -----------
  [#864] Few small tweaks to the templates


  Commit: 5328891a112f90a439c43f3ab4464db4bdebb513
      https://github.com/okfn/ckan/commit/5328891a112f90a439c43f3ab4464db4bdebb513
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

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

  Log Message:
  -----------
  [#] Only copy the content encoding and type, not all headers to fix issues with chunked responses. Improve overall performance and error reporting.


  Commit: fd12b0c7122b13eb8378ceede95411ded5bdb928
      https://github.com/okfn/ckan/commit/fd12b0c7122b13eb8378ceede95411ded5bdb928
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckanext/jsonpreview/theme/public/preview_json.js

  Log Message:
  -----------
  [#896] Make json preview ajax request async to prevent blocked ui


  Commit: e318599852fd3ae2e280a405a09726325673b786
      https://github.com/okfn/ckan/commit/e318599852fd3ae2e280a405a09726325673b786
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ckanext/jsonpreview/theme/public/preview_json.js

  Log Message:
  -----------
  [#896] Show the original error from the response instead of limited message.


  Commit: 11beb83be4f26ffb1ac5fe56eb047477e0dfafc2
      https://github.com/okfn/ckan/commit/11beb83be4f26ffb1ac5fe56eb047477e0dfafc2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M pip-requirements-test.txt

  Log Message:
  -----------
  [#896] Require latest httpretty in tests to fix proxy tests


  Commit: a707cf5cb5e9005674da1966f6a35831af2dd8ff
      https://github.com/okfn/ckan/commit/a707cf5cb5e9005674da1966f6a35831af2dd8ff
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-22 (Wed, 22 May 2013)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  [#896] Do a GET request if HEAD is not supported


  Commit: 385be8572887fc80a21b02c7d9f867b7020c7f4c
      https://github.com/okfn/ckan/commit/385be8572887fc80a21b02c7d9f867b7020c7f4c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M README.rst
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    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/tag.py
    M ckan/controllers/user.py
    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/check_po_files.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/render.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M doc/_templates/footer.html
    M doc/apps-ideas.rst
    M doc/architecture.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    R doc/commenting.rst
    M doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/database-dumps.rst
    M doc/datastore-api.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    M doc/extensions.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    A doc/importing-datasets.rst
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    M doc/post-installation.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    R doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into IAuthenticator-feature

Conflicts:
	ckan/new_authz.py

    trivial merge


  Commit: 3711ef445cc80e8db95532cdd7130fec3ebd2e89
      https://github.com/okfn/ckan/commit/3711ef445cc80e8db95532cdd7130fec3ebd2e89
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  IAuthenticator:  Coding standards fixes


  Commit: a02a1b17c2784171e5a442e88dca3c3963a957b4
      https://github.com/okfn/ckan/commit/a02a1b17c2784171e5a442e88dca3c3963a957b4
  Author: Ian Ward <ian at excess.org>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Fix login flash message language


  Commit: 7f46200d75a082fc338d18b97b935509726638a7
      https://github.com/okfn/ckan/commit/7f46200d75a082fc338d18b97b935509726638a7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Revert "Fix login flash message language"

This reverts commit a02a1b17c2784171e5a442e88dca3c3963a957b4.

should never have got in this branch or anywhere


  Commit: 4411e748ae88ef47f229ae1c2576d69d039743ed
      https://github.com/okfn/ckan/commit/4411e748ae88ef47f229ae1c2576d69d039743ed
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M .tx/config
    M ckan/config/install.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/prose.less
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    A ckan/tests/test_coding_standards.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M doc/datastore-api.rst
    M doc/release-process.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 896-resource-proxy-fixes


  Commit: 463a94f96ee70dd62e944946cc7c41c3d0e1ea09
      https://github.com/okfn/ckan/commit/463a94f96ee70dd62e944946cc7c41c3d0e1ea09
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

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

  Log Message:
  -----------
  [#896] Fix failing test, fix PEP8 issues


  Commit: 98b4b04b136677b9bf6c2a0160367bb4b50de838
      https://github.com/okfn/ckan/commit/98b4b04b136677b9bf6c2a0160367bb4b50de838
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/travis-build
    A dev-requirements.txt
    M doc/install-from-source.rst
    M doc/test.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  [#491] Pin every dependency's exact version.

To create these files, I've used pip-dump from the pip-tools package.

All requirements in *-requirements.txt have their versions pinned, and in
setup.py we keep only our direct dependencies and with the versions that
should work (i.e. >=0.11).

We did this so we can guarantee that everyone is using the exact same
version as everybody else, including our deployments.

For more info, check http://nvie.com/posts/pin-your-packages/.


  Commit: 5f62ced8f9e4765eabf6672b69117684a5ab70f7
      https://github.com/okfn/ckan/commit/5f62ced8f9e4765eabf6672b69117684a5ab70f7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  [#952] Create site user at startup


  Commit: 98c48ef35453233390d1ae526ec85391040abcee
      https://github.com/okfn/ckan/commit/98c48ef35453233390d1ae526ec85391040abcee
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-30 (Thu, 30 May 2013)

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

  Log Message:
  -----------
  [#798] Adds proper background black to IE7 media-overlay


  Commit: a313c65f61d5205c802614c0b2eaa7edf9690e9d
      https://github.com/okfn/ckan/commit/a313c65f61d5205c802614c0b2eaa7edf9690e9d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-30 (Thu, 30 May 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#913] Fix url creation of qualified sub dirs


  Commit: 9feb7532d61e32ee59751580dc9aac119687bfab
      https://github.com/okfn/ckan/commit/9feb7532d61e32ee59751580dc9aac119687bfab
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#952] Add try for when db is not initialised


  Commit: 0290e08a779ef7b0572512439889c96fdbca4a31
      https://github.com/okfn/ckan/commit/0290e08a779ef7b0572512439889c96fdbca4a31
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M ckan/templates/group/about.html
    M ckan/templates/organization/about.html
    A ckan/templates/snippets/additional_info.html

  Log Message:
  -----------
  [#477] Show additional info on group/org about pages


  Commit: e47a4c6f3cf1173b8eb21dc43abe502f174bf901
      https://github.com/okfn/ckan/commit/e47a4c6f3cf1173b8eb21dc43abe502f174bf901
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/new_authz.py
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/tests/lib/test_solr_package_search.py
    M doc/configuration.rst

  Log Message:
  -----------
  [951] Make license consistent across CKAN

* Replace most instances of licence with license. The instances in js
  vendor files have been ignored.
* Setup clean_action_name to convert licence to license.


  Commit: caa016eabe470223d19d1db0dce6480b26856bdb
      https://github.com/okfn/ckan/commit/caa016eabe470223d19d1db0dce6480b26856bdb
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#873] Show upload option if filestore enabled

* Add a check_filestore helper that checks the config if filestore is
  enabled.
* Check if filestore is enabled and user is logged in before showing
  upload button.


  Commit: c932debed020c8f99bde152d11ca568d75e72a67
      https://github.com/okfn/ckan/commit/c932debed020c8f99bde152d11ca568d75e72a67
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/prose.less
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    R doc/CHANGELOG.rst
    M doc/api.rst
    R doc/architecture.rst
    M doc/background-tasks.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    A doc/getting-started.rst
    A doc/images/admin-page.png
    R doc/importing-datasets.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    A doc/releases.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    M doc/theming.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    A doc/writing-extensions.rst
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into IAuthenticator-feature


  Commit: 007c1036ed3124301725126d5a0bad1f8922ba62
      https://github.com/okfn/ckan/commit/007c1036ed3124301725126d5a0bad1f8922ba62
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#414] Prevent callback parameter breaking action api and search


  Commit: d50dbbf7a38f8fcee6b60d8195c4ef8eba0e87cc
      https://github.com/okfn/ckan/commit/d50dbbf7a38f8fcee6b60d8195c4ef8eba0e87cc
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch '913-fix-url-creation'


  Commit: 23008420ec10e58915201add0e6c5e629434bacb
      https://github.com/okfn/ckan/commit/23008420ec10e58915201add0e6c5e629434bacb
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  Merge branch '952-create-site-user-at-startup'


  Commit: 20af1804b56abf95ce4cb8c70e427935ec49069b
      https://github.com/okfn/ckan/commit/20af1804b56abf95ce4cb8c70e427935ec49069b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#965] No testing of coding standards in hidden dirs/files


  Commit: 308b628361f3c48dd71e53236ff0136ef5fea272
      https://github.com/okfn/ckan/commit/308b628361f3c48dd71e53236ff0136ef5fea272
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/helpers.py
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


  Commit: c1ab09c320ef4e62f3cea64ba554d3243710b7b5
      https://github.com/okfn/ckan/commit/c1ab09c320ef4e62f3cea64ba554d3243710b7b5
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M README.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    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/check_po_files.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    A ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_item.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    A ckan/templates/package/history.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/data_api_button.html
    A ckan/templates/package/snippets/history_revisions.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    A ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/sort_by.html
    A ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    R doc/CHANGELOG.rst
    M doc/_templates/footer.html
    R doc/about.rst
    R doc/administrative-dashboard.rst
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/commenting.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    M doc/legacy-api.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publisher-profile.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    A doc/releases.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 674-better-solr-exceptions


  Commit: ed9369860b18967ff3d648a130f7e68ef3a99cea
      https://github.com/okfn/ckan/commit/ed9369860b18967ff3d648a130f7e68ef3a99cea
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/templates/home/index.html
    M ckan/templates_legacy/package/resource_read.html

  Log Message:
  -----------
  [#951] Fix more instance of licence, deprecate c.licences

* Fix instances of licence spelled in Title case.
* Add deprecation warning for c.licences.


  Commit: c3e080cfd04a09919206acd045eb351430362fc0
      https://github.com/okfn/ckan/commit/c3e080cfd04a09919206acd045eb351430362fc0
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#951] Import deprecate_context_item in plugins.py


  Commit: f3d66d6d21f82a6e2a139a7c16e953a9277becdd
      https://github.com/okfn/ckan/commit/f3d66d6d21f82a6e2a139a7c16e953a9277becdd
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M doc/install-from-package.rst

  Log Message:
  -----------
  [#968] Follow Debian convention for naming the CKAN package


  Commit: 4ff0e07162966b6dc482b9b4524ac44e7f0a335b
      https://github.com/okfn/ckan/commit/4ff0e07162966b6dc482b9b4524ac44e7f0a335b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M doc/install-from-package.rst

  Log Message:
  -----------
  Merge pull request #968 from okfn/968-deb-package-name

Follow Debian convention for naming the CKAN package


  Commit: ae9c19493b23de1ce0bb487d306a7d044573a0aa
      https://github.com/okfn/ckan/commit/ae9c19493b23de1ce0bb487d306a7d044573a0aa
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/new_authz.py
    M ckan/templates/home/index.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/lib/test_solr_package_search.py
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch '951-make-license-consistent'


  Commit: 8fe7ca0788c6caa00ffe936160f7a0e19a7dc1dc
      https://github.com/okfn/ckan/commit/8fe7ca0788c6caa00ffe936160f7a0e19a7dc1dc
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/templates/group/about.html
    M ckan/templates/organization/about.html
    A ckan/templates/snippets/additional_info.html

  Log Message:
  -----------
  Merge pull request #477 from okfn/477-show-org-group-extras

No display of Organisation key value pair info


  Commit: ecb66307f63906301a28e22740b093519a94ff5b
      https://github.com/okfn/ckan/commit/ecb66307f63906301a28e22740b093519a94ff5b
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/less/layout.less

  Log Message:
  -----------
  [#828] Fixes the positioning of generic modals vs. confirm action modals


  Commit: 45ae2ec72198fb6c72f0e594f610c0c882d6781b
      https://github.com/okfn/ckan/commit/45ae2ec72198fb6c72f0e594f610c0c882d6781b
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M doc/upgrading-a-package-install.rst

  Log Message:
  -----------
  [#969] Add instructions for package patch upgrades


  Commit: 2225596bc48b83e5ae59a236a69aa0bfcf7c52b1
      https://github.com/okfn/ckan/commit/2225596bc48b83e5ae59a236a69aa0bfcf7c52b1
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M .travis.yml
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M README.rst
    M bin/osx-postgres-mem.sh
    A bin/travis-build
    A ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    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/check_po_files.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/dumper.py
    M ckan/lib/email_notifications.py
    M ckan/lib/field_types.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    R ckan/public/base/css/fuchsia.min.css
    R ckan/public/base/css/green.min.css
    M ckan/public/base/css/main.css
    R ckan/public/base/css/main.min.css
    R ckan/public/base/css/maroon.min.css
    R ckan/public/base/css/red.min.css
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckan/public/base/i18n/bg.min.js
    R ckan/public/base/i18n/ca.min.js
    R ckan/public/base/i18n/cs_CZ.min.js
    R ckan/public/base/i18n/de.min.js
    R ckan/public/base/i18n/el.min.js
    R ckan/public/base/i18n/es.min.js
    R ckan/public/base/i18n/fi.min.js
    R ckan/public/base/i18n/fr.min.js
    R ckan/public/base/i18n/hu.min.js
    R ckan/public/base/i18n/it.min.js
    R ckan/public/base/i18n/lt.min.js
    R ckan/public/base/i18n/lv.min.js
    R ckan/public/base/i18n/nl.min.js
    R ckan/public/base/i18n/no.min.js
    R ckan/public/base/i18n/pl.min.js
    R ckan/public/base/i18n/pt_BR.min.js
    R ckan/public/base/i18n/ro.min.js
    R ckan/public/base/i18n/ru.min.js
    R ckan/public/base/i18n/sk.min.js
    R ckan/public/base/i18n/sl.min.js
    R ckan/public/base/i18n/sq.min.js
    R ckan/public/base/i18n/sr.min.js
    R ckan/public/base/i18n/sr_Latn.min.js
    R ckan/public/base/i18n/sv.min.js
    R ckan/public/base/i18n/zh_TW.min.js
    R ckan/public/base/images/flags.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    A ckan/public/base/images/table-seperator.png
    M ckan/public/base/javascript/client.js
    R ckan/public/base/javascript/client.min.js
    R ckan/public/base/javascript/i18n.min.js
    M ckan/public/base/javascript/main.js
    R ckan/public/base/javascript/main.min.js
    R ckan/public/base/javascript/module.min.js
    R ckan/public/base/javascript/modules/api-info.min.js
    M ckan/public/base/javascript/modules/autocomplete.js
    R ckan/public/base/javascript/modules/autocomplete.min.js
    M ckan/public/base/javascript/modules/basic-form.js
    R ckan/public/base/javascript/modules/basic-form.min.js
    R ckan/public/base/javascript/modules/confirm-action.min.js
    R ckan/public/base/javascript/modules/custom-fields.min.js
    R ckan/public/base/javascript/modules/dashboard.min.js
    R ckan/public/base/javascript/modules/data-viewer.min.js
    R ckan/public/base/javascript/modules/follow.min.js
    R ckan/public/base/javascript/modules/related-item.min.js
    R ckan/public/base/javascript/modules/resource-form.min.js
    R ckan/public/base/javascript/modules/resource-upload-field.min.js
    R ckan/public/base/javascript/modules/select-switch.min.js
    R ckan/public/base/javascript/modules/slug-preview.min.js
    A ckan/public/base/javascript/modules/table-selectable-rows.js
    A ckan/public/base/javascript/modules/table-toggle-more.js
    R ckan/public/base/javascript/notify.min.js
    R ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
    R ckan/public/base/javascript/plugins/jquery.form-warning.min.js
    R ckan/public/base/javascript/plugins/jquery.inherit.min.js
    R ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
    R ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
    R ckan/public/base/javascript/plugins/jquery.slug.min.js
    R ckan/public/base/javascript/plugins/jquery.truncator.min.js
    R ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
    R ckan/public/base/javascript/pubsub.min.js
    M ckan/public/base/javascript/resource.config
    R ckan/public/base/javascript/sandbox.min.js
    M ckan/public/base/javascript/tracking.js
    R ckan/public/base/javascript/tracking.min.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/prose.less
    A ckan/public/base/less/tables.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    M ckan/public/base/test/index.html
    R ckan/public/base/test/spec/ckan.spec.min.js
    M ckan/public/base/test/spec/client.spec.js
    R ckan/public/base/test/spec/client.spec.min.js
    R ckan/public/base/test/spec/module.spec.min.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    R ckan/public/base/test/spec/modules/autocomplete.spec.min.js
    R ckan/public/base/test/spec/modules/basic-form.spec.min.js
    R ckan/public/base/test/spec/modules/confirm-action.spec.min.js
    R ckan/public/base/test/spec/modules/custom-fields.spec.min.js
    R ckan/public/base/test/spec/modules/related-item.spec.min.js
    R ckan/public/base/test/spec/modules/resource-form.spec.min.js
    R ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
    R ckan/public/base/test/spec/notify.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
    R ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
    R ckan/public/base/test/spec/pubsub.spec.min.js
    R ckan/public/base/test/spec/sandbox.spec.min.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    A ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    M ckan/templates/organization/about.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    A ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    A ckan/templates/package/history.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/data_api_button.html
    A ckan/templates/package/snippets/history_revisions.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    A ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    A ckan/templates/snippets/search_result_text.html
    A ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates/snippets/subscribe.html
    A ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/templates_legacy/package/search.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_licenses.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_ratings.py
    M ckan/tests/functional/api/model/test_relationships.py
    M ckan/tests/functional/api/model/test_revisions.py
    M ckan/tests/functional/api/model/test_tag.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_api.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_misc.py
    M ckan/tests/functional/api/test_package_search.py
    M ckan/tests/functional/api/test_resource_search.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M ckan/tests/models/test_package.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckan/tests/test_dumper.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/css/json.min.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/preview_json.min.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/multilingual/plugin.py
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    M ckanext/pdfpreview/tests/test_preview.py
    R ckanext/pdfpreview/theme/public/css/pdf.min.css
    R ckanext/pdfpreview/theme/public/css/recline.min.css
    R ckanext/pdfpreview/theme/public/preview_pdf.min.js
    R ckanext/publisher_form/__init__.py
    R ckanext/publisher_form/forms.py
    R ckanext/publisher_form/templates/dataset_form.html
    R ckanext/publisher_form/templates/publisher_form.html
    R ckanext/publisher_form/templates/publisher_index.html
    R ckanext/publisher_form/templates/publisher_layout.html
    R ckanext/publisher_form/templates/publisher_new.html
    R ckanext/publisher_form/templates/publisher_read.html
    M ckanext/reclinepreview/tests/test_preview.py
    R ckanext/reclinepreview/theme/public/css/recline.min.css
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/controller.py
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    R doc/CHANGELOG.rst
    M doc/_templates/footer.html
    R doc/about.rst
    R doc/administrative-dashboard.rst
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/commenting.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    R doc/forms.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    A doc/legacy-api.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publisher-profile.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    A doc/releases.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 382-convert_from_extras-remove-extras


  Commit: 9e5843e62304aaeac18a7c227d04eeed9a0c38a1
      https://github.com/okfn/ckan/commit/9e5843e62304aaeac18a7c227d04eeed9a0c38a1
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/logic/converters.py

  Log Message:
  -----------
  fix for extras not found


  Commit: 6842fff3d1c7220afbbacb735b7580878e76c632
      https://github.com/okfn/ckan/commit/6842fff3d1c7220afbbacb735b7580878e76c632
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/tests/schema/test_schema.py

  Log Message:
  -----------
  [#382] Update failing test


  Commit: e7f3daa53838e91f63ac7b4ffac7f7511df89a5c
      https://github.com/okfn/ckan/commit/e7f3daa53838e91f63ac7b4ffac7f7511df89a5c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/test_dump.py

  Log Message:
  -----------
  [#972] Do not error if the resource does not exist for datastore dumps


  Commit: 9f7c8ca0be86e4f04c17eb4e7d7b77d78148e2b5
      https://github.com/okfn/ckan/commit/9f7c8ca0be86e4f04c17eb4e7d7b77d78148e2b5
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  [#972] and [#628] Add docs for datastore dumps again (they have been written for #628 but removed by docs reorganisation).


  Commit: a386bc37a5ddd3f3b813825cfd870fba05f40048
      https://github.com/okfn/ckan/commit/a386bc37a5ddd3f3b813825cfd870fba05f40048
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge pull request #965 from okfn/965-ignore-hidden-files-in-coding-standards

pep8 tests should ignore .git folder


  Commit: f45c09ca44eb0083113ad8ee4d448aacd7cff0e1
      https://github.com/okfn/ckan/commit/f45c09ca44eb0083113ad8ee4d448aacd7cff0e1
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [#972] After a discussion with @vitorbaptista, we decided to stick with datastore resource instead of datastore table


  Commit: c96bed7b902b68ed4cb4b779e515eab48276f807
      https://github.com/okfn/ckan/commit/c96bed7b902b68ed4cb4b779e515eab48276f807
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/test_dump.py
    M doc/datastore.rst

  Log Message:
  -----------
  Merge pull request #972 from okfn/972-datastore-dump-fixes

Datastore dump raises 500 if resource does not exist


  Commit: 54c89f67fcdaf2db2653b2a1bacee41235c86e40
      https://github.com/okfn/ckan/commit/54c89f67fcdaf2db2653b2a1bacee41235c86e40
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  Merge branch '382-convert_from_extras-remove-extras'


  Commit: 8fca53ede4e13c26fa1963d8c4bc4e26d4fcb491
      https://github.com/okfn/ckan/commit/8fca53ede4e13c26fa1963d8c4bc4e26d4fcb491
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/lib/helpers.py
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#873] Use a g.ofs_impl to check filestore status

* Remove the helper function check_datastore
* Create a global varibale called ofs_impl that stores
  the value of the config option


  Commit: 93272c59acade18d2fa40db6da9ecec9923ab107
      https://github.com/okfn/ckan/commit/93272c59acade18d2fa40db6da9ecec9923ab107
  Author: Sam Smith <sam at mintcanary.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  Merge pull request #798 from okfn/798-homepage-ie7-overlay-bg

Homepage Featured Box Heading Background (IE)


  Commit: 8c0985775098bf3c738b9c1d11e11ec7456f9c45
      https://github.com/okfn/ckan/commit/8c0985775098bf3c738b9c1d11e11ec7456f9c45
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M README.rst
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    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/check_po_files.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/misc.py
    M ckan/model/package.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/revision/read.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    R doc/CHANGELOG.rst
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/commenting.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publisher-profile.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    A doc/releases.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    M doc/tracking.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 652-secure-datastore

Conflicts:
	ckanext/datastore/db.py
	ckanext/datastore/logic/action.py
	ckanext/datastore/plugin.py
	doc/datastore-api.rst
	doc/datastore-setup.rst


  Commit: 09318adad17da769bc8204f979c85186cf204f52
      https://github.com/okfn/ckan/commit/09318adad17da769bc8204f979c85186cf204f52
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  Recompile css


  Commit: b97e67536ac07339af552671de804053b942de46
      https://github.com/okfn/ckan/commit/b97e67536ac07339af552671de804053b942de46
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M pip-requirements-test.txt

  Log Message:
  -----------
  Merge branch '896-resource-proxy-fixes'

Conflicts:
	ckanext/jsonpreview/theme/public/preview_json.js


  Commit: b06e58d2a861f65327a4961478acc1615b04cc55
      https://github.com/okfn/ckan/commit/b06e58d2a861f65327a4961478acc1615b04cc55
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  [#652] Fix issues caused by wrong merge


  Commit: 7ced50e7708db8cb819f9c3a24adb7ca3a5089ae
      https://github.com/okfn/ckan/commit/7ced50e7708db8cb819f9c3a24adb7ca3a5089ae
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M doc/conf.py
    M doc/upgrading-a-package-install.rst

  Log Message:
  -----------
  [#969] Edit the upgrading to a patch release docs

- Group the *Upgrading to a patch version* and *Upgrading a 1.X Package
  Install to CKAN 2.0* section headings under a top-level *Upgrading a
  package install* heading (this is just so that only one *Upgrading a
  package install* heading appears in the table of contents)

- Edit the first couple of paragraphs of *Upgrading to a patch version*
  a little

- Say CKAN config file not ini file

- Use |apache| and |nginx| to get correct capitalisation of those names


  Commit: d4279e715603c5193ac14f5c7e2c96ec2eae16f3
      https://github.com/okfn/ckan/commit/d4279e715603c5193ac14f5c7e2c96ec2eae16f3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  Fix a broken ref in the docs


  Commit: 670a1845016ab6282e4ecb5968c2ea3b55b498b9
      https://github.com/okfn/ckan/commit/670a1845016ab6282e4ecb5968c2ea3b55b498b9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M doc/documentation-guidelines.rst

  Log Message:
  -----------
  Doc guidelines: combine Section titles and Headings sections

Combine these two sections into one as they're both about section
titles.


  Commit: 17b4ef867170cf1010f27817a1307d4324018405
      https://github.com/okfn/ckan/commit/17b4ef867170cf1010f27817a1307d4324018405
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M doc/documentation-guidelines.rst

  Log Message:
  -----------
  Add docs guideline about Sphinx warnings


  Commit: 7c735fcfb5fa213a90601d3f6d3bf31e9e5be425
      https://github.com/okfn/ckan/commit/7c735fcfb5fa213a90601d3f6d3bf31e9e5be425
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    R ckan/model/test_user.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  [#652] Move test file to tests folder to try and make Travis happy


  Commit: 37ce15bfbd883ec92f08128654bac75f5e436a4a
      https://github.com/okfn/ckan/commit/37ce15bfbd883ec92f08128654bac75f5e436a4a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    R ckan/model/test_user.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M doc/_themes/sphinx-theme-okfn
    A doc/datastore-api.rst
    A doc/datastore-setup.rst

  Log Message:
  -----------
  Merge branch '652-secure-datastore'


  Commit: cd97793c4822d8b199f409fdcfa4c29860119cff
      https://github.com/okfn/ckan/commit/cd97793c4822d8b199f409fdcfa4c29860119cff
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M doc/documentation-guidelines.rst

  Log Message:
  -----------
  Add full toc to top of documentation guidelines

Add a complete table of contents to the top of the Documentation
guidelines page, makes it quicker to find sections within the page,
as the page gets longer.


  Commit: c7138345c2efe51229af88a2683af9f22efd9d83
      https://github.com/okfn/ckan/commit/c7138345c2efe51229af88a2683af9f22efd9d83
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    R ckan/model/test_user.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M doc/_themes/sphinx-theme-okfn
    A doc/datastore-api.rst
    A doc/datastore-setup.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


  Commit: abbeb4407f34ac341b76110fe36f09e09dff35eb
      https://github.com/okfn/ckan/commit/abbeb4407f34ac341b76110fe36f09e09dff35eb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M doc/conf.py
    M doc/upgrading-a-package-install.rst

  Log Message:
  -----------
  Merge branch '969-upgrade-patch-instructions'


  Commit: 43bb392d5c44b8714a6771081ea435ed28916ef6
      https://github.com/okfn/ckan/commit/43bb392d5c44b8714a6771081ea435ed28916ef6
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  [#963] Adds return false to 'click' on select2 elements to prevent window.onbeforeunload events firing in IE


  Commit: 650cde95e4d320ec367aa48dccb8bc9baa1228f9
      https://github.com/okfn/ckan/commit/650cde95e4d320ec367aa48dccb8bc9baa1228f9
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add CHANGELOG so far for 2.0.1


  Commit: 6dc9b28eb5b18eaac26663426e80aaf55792ae69
      https://github.com/okfn/ckan/commit/6dc9b28eb5b18eaac26663426e80aaf55792ae69
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  Merge branch '963-ie-select2-return-false'


  Commit: 56ac131d07cbf2c8f0d1a9429ae2e7d9f336a54a
      https://github.com/okfn/ckan/commit/56ac131d07cbf2c8f0d1a9429ae2e7d9f336a54a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/less/layout.less

  Log Message:
  -----------
  Merge pull request #828 from okfn/828-modal-positioning

Data API popup vertically misaligned


  Commit: baa838a67955f390173a1967c25da0dd45ea3ad1
      https://github.com/okfn/ckan/commit/baa838a67955f390173a1967c25da0dd45ea3ad1
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/prose.less
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/revision/read.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    M dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    M doc/datastore-api.rst
    M doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    R doc/importing-datasets.rst
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    A doc/releases.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    M doc/tracking.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    M doc/writing-extensions.rst
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into 491

Conflicts:
	CONTRIBUTING.rst
	doc/install-from-source.rst
	doc/test.rst
	pip-requirements-test.txt
	pip-requirements.txt


  Commit: baafb081b3ae9aef4cecc312baaf7aa5c44cc576
      https://github.com/okfn/ckan/commit/baafb081b3ae9aef4cecc312baaf7aa5c44cc576
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

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

  Log Message:
  -----------
  Merge pull request #831 from okfn/831-remove-old-auth-code

There still exist references to removed "package_edit_permissions" authorization level


  Commit: dad3b5d144c073388134ae0e02be712ae8d4b580
      https://github.com/okfn/ckan/commit/dad3b5d144c073388134ae0e02be712ae8d4b580
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  [#491] Add remaining requirements and fix bug in setup.py

There was a typo, extra_requires should have been extras_require.


  Commit: 49bbd15892355d1ad5d5deff8f07ad8762bfd8be
      https://github.com/okfn/ckan/commit/49bbd15892355d1ad5d5deff8f07ad8762bfd8be
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    A .pipignore

  Log Message:
  -----------
  [#491] Never add CKAN itself to the requirements file


  Commit: b2a531d0f7dbce602670ebb90c6b5b8bda0adbd6
      https://github.com/okfn/ckan/commit/b2a531d0f7dbce602670ebb90c6b5b8bda0adbd6
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

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

  Log Message:
  -----------
  [#491] Ordering requirements files

pip-dump, after adding any new requirement that it finds, sorts it.
As ours were unsorted, it would create noise when you upgraded. I'm
separating that noise in this commit.


  Commit: 4670a6da2e27de90baf80936454310d347b0eb0a
      https://github.com/okfn/ckan/commit/4670a6da2e27de90baf80936454310d347b0eb0a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

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

  Log Message:
  -----------
  Update to a newer version of the Sphinx theme

Update the sphinx-theme-okfn git submodule to a newer commit. It looks
like it accidentally got reverted to an older commit recently. We can't
use the latest version of sphinx-theme-okfn because it breaks a bunch of
stuff, this commit looks like the newest version that 'just works' for
CKAN.


  Commit: 9b6adc8dc9b15cbb187499db4392fa74b8a9196b
      https://github.com/okfn/ckan/commit/9b6adc8dc9b15cbb187499db4392fa74b8a9196b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/logic/action/update.py
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/less/layout.less

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


  Commit: 7771d4e7c06f6f91eed85451d6016fa876551f7c
      https://github.com/okfn/ckan/commit/7771d4e7c06f6f91eed85451d6016fa876551f7c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    R doc/datastore-api.rst
    R doc/datastore-setup.rst

  Log Message:
  -----------
  Fix some Sphinx warnings

These two datastore-*.rst files got merged into sections within
datastore.rst, but apparently the files weren't deleted, or a merge
brought them back.


  Commit: 85ad0c73db0ece6723e287c912d079de6a391373
      https://github.com/okfn/ckan/commit/85ad0c73db0ece6723e287c912d079de6a391373
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    A .pipignore
    M LICENSE.txt
    M bin/travis-build
    A dev-requirements.txt
    M doc/install-from-source.rst
    M doc/test.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'vitorbaptista/491'


  Commit: 79c0f732c7679fd30d3cfcd9542a8134985baf78
      https://github.com/okfn/ckan/commit/79c0f732c7679fd30d3cfcd9542a8134985baf78
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  Merge pull request #414 from okfn/414-api-callback-fixes

JSONP API problems


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

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#454] Add polib to dev-requirements.txt


  Commit: 767ce2670424719ac602535cdbe10b6e6bbd255e
      https://github.com/okfn/ckan/commit/767ce2670424719ac602535cdbe10b6e6bbd255e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch '580-resource-edit-error'


  Commit: 1ba2b857da14743e49497a0d47e92b981c9849cd
      https://github.com/okfn/ckan/commit/1ba2b857da14743e49497a0d47e92b981c9849cd
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/logic/action/update.py
    R ckan/model/test_user.py
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/less/layout.less
    M ckan/tests/models/test_user.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    M doc/install-from-source.rst
    M doc/test.rst
    M doc/upgrading-a-package-install.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


  Commit: 13393b528d5816e2e2948a0ee54ffb6633303b9b
      https://github.com/okfn/ckan/commit/13393b528d5816e2e2948a0ee54ffb6633303b9b
  Author: John Glover <j at johnglover.net>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #991 from okfn/454-polib-dev-req

[#454] Add polib to dev-requirements.txt


  Commit: cd13da57e283084bcf6d6626dfb9205a93e0fab2
      https://github.com/okfn/ckan/commit/cd13da57e283084bcf6d6626dfb9205a93e0fab2
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/public/base/less/homepage.less
    M ckan/templates/home/index.html
    M ckan/templates/snippets/group_item.html

  Log Message:
  -----------
  Merge branch '698-groups-height'


  Commit: 4014acd7493599054a0b50eb7b76bf0af702c6c8
      https://github.com/okfn/ckan/commit/4014acd7493599054a0b50eb7b76bf0af702c6c8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

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

  Log Message:
  -----------
  Recompile css


  Commit: 16bc4ba5ea88064316fa38287c7301045a339c32
      https://github.com/okfn/ckan/commit/16bc4ba5ea88064316fa38287c7301045a339c32
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html

  Log Message:
  -----------
  Merge branch '873-upload-button-check'


  Commit: fcda749cec634b191984bcfd611e4ba3b2c3b985
      https://github.com/okfn/ckan/commit/fcda749cec634b191984bcfd611e4ba3b2c3b985
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A ckan/migration/versions/068_add_package_extras_index.py

  Log Message:
  -----------
  [#982] Add new index to package_extra_revision to aid performance


  Commit: ed5fe85a2f71488a465cbad2d6b5a469dee261c4
      https://github.com/okfn/ckan/commit/ed5fe85a2f71488a465cbad2d6b5a469dee261c4
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html

  Log Message:
  -----------
  [#864] Adds better state for JS disabled on media listings


  Commit: 825a6da2a3cf98974df74cd90fc99b00e639860f
      https://github.com/okfn/ckan/commit/825a6da2a3cf98974df74cd90fc99b00e639860f
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html

  Log Message:
  -----------
  [#864] Add clearfix for related lists


  Commit: 9792a96a340634573bf0cc8a707a3046a8e2a256
      https://github.com/okfn/ckan/commit/9792a96a340634573bf0cc8a707a3046a8e2a256
  Author: John Martin <me at johnmart.in>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A .pipignore
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    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/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A 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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/068_add_package_extras_index.py
    M ckan/model/package.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/prose.less
    M ckan/templates/group/about.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/revision/read.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    R doc/importing-datasets.rst
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/multilingual.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    M doc/release-process.rst
    A doc/releases.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    M doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py
    M test-core.ini

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


  Commit: f8474a2e85403d9b696e9e778df431310ce2249a
      https://github.com/okfn/ckan/commit/f8474a2e85403d9b696e9e778df431310ce2249a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

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

  Log Message:
  -----------
  Recompile css


  Commit: a865639677e6542bbfe8fef293f6a8681fa44fc5
      https://github.com/okfn/ckan/commit/a865639677e6542bbfe8fef293f6a8681fa44fc5
  Author: amercader <amercadero at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update CHANGELOG


  Commit: 1e3f7d565847036b450972b23acc1e03ad4aad29
      https://github.com/okfn/ckan/commit/1e3f7d565847036b450972b23acc1e03ad4aad29
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.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/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    A ckan/migration/versions/068_add_package_extras_index.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/test.rst
    M doc/upgrading-a-package-install.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love

Conflicts:
	ckan/config/environment.py
	ckan/lib/plugins.py

    trivial fixes


Compare: https://github.com/okfn/ckan/compare/e4b2c2c5a0d0...1e3f7d565847


More information about the ckan-changes mailing list