[ckan-changes] [ckan/ckan] 1f4f03: [#1301] Adds skip to content accessibility block

GitHub noreply at github.com
Mon Apr 7 13:06:05 UTC 2014


  Branch: refs/heads/1503-two-licenses
  Home:   https://github.com/ckan/ckan
  Commit: 1f4f03515e19a6cc857029ac6987b173b2128128
      https://github.com/ckan/ckan/commit/1f4f03515e19a6cc857029ac6987b173b2128128
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1301] Adds skip to content accessibility block


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

  Changed paths:
    M ckan/templates/header.html
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1301] Adds header label block and flash message inner


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

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#1301] Added a couple of template blocks to the activity_streams snippet


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

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

  Log Message:
  -----------
  [#1301] Added template blocks to group_item.html


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

  Changed paths:
    M ckan/templates/snippets/package_list.html

  Log Message:
  -----------
  [#1301] Adds template blocks to package_list.html


  Commit: 011973d67a5da5e03761ffd2a506b2389e84fab2
      https://github.com/ckan/ckan/commit/011973d67a5da5e03761ffd2a506b2389e84fab2
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  [#1301] Added a few template blocks to the facet lists


  Commit: b3a154ec11838702a90430e75ecbdfb1cfc974ca
      https://github.com/ckan/ckan/commit/b3a154ec11838702a90430e75ecbdfb1cfc974ca
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M ckan/templates/snippets/package_item.html

  Log Message:
  -----------
  [#1301] Added more template blocks to package_item.html snippet


  Commit: 0a3f179c109d5d003ef92a0fb45b074e31e387a9
      https://github.com/ckan/ckan/commit/0a3f179c109d5d003ef92a0fb45b074e31e387a9
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M ckan/templates/snippets/follow_button.html

  Log Message:
  -----------
  [#1301] Adds blocks for follow button classes


  Commit: 98628d1833175f77c1dabbdfc9c3e870262cc7df
      https://github.com/ckan/ckan/commit/98628d1833175f77c1dabbdfc9c3e870262cc7df
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

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

  Log Message:
  -----------
  [#1301] Adds a load of template blocks to the package info template


  Commit: d8bad906f0b07a49da9a8ba4761dac5adf45214e
      https://github.com/ckan/ckan/commit/d8bad906f0b07a49da9a8ba4761dac5adf45214e
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/social.html

  Log Message:
  -----------
  [#1301] Improves the package read page snippets


  Commit: 40058569eea84f8b57f07f6f6b54de0ec94f9e57
      https://github.com/ckan/ckan/commit/40058569eea84f8b57f07f6f6b54de0ec94f9e57
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckan/templates/snippets/tag_list.html

  Log Message:
  -----------
  [#1301] Adds template blocks to tag_list


  Commit: 570f7fc252092c6ba19606671d14adf2de44c414
      https://github.com/ckan/ckan/commit/570f7fc252092c6ba19606671d14adf2de44c414
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html

  Log Message:
  -----------
  [#1301] Adds template blocks to resource listings


  Commit: 1b3261d1bca98c65451ef712745356acd57b995b
      https://github.com/ckan/ckan/commit/1b3261d1bca98c65451ef712745356acd57b995b
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

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

  Log Message:
  -----------
  [#1301] Adds more blocks to the resources snippet


  Commit: 5bb5a071be73a0095f1344bc5727f01dc2d60065
      https://github.com/ckan/ckan/commit/5bb5a071be73a0095f1344bc5727f01dc2d60065
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

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

  Log Message:
  -----------
  [#1301] Adds template blocks to the resource_read template


  Commit: fd92e56a70fc0ffa1a01a75a7a1831d790d620b1
      https://github.com/ckan/ckan/commit/fd92e56a70fc0ffa1a01a75a7a1831d790d620b1
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckan/templates/package/search.html
    M ckan/templates/snippets/search_form.html

  Log Message:
  -----------
  [#1301] Adds template blocks to the package search and search form


  Commit: 6ed01fd4ef95ee517e2d2f77f8478349e4ed3ca8
      https://github.com/ckan/ckan/commit/6ed01fd4ef95ee517e2d2f77f8478349e4ed3ca8
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  [#1301] Adds more template blocks to sidebar on the user profile


  Commit: 8cf8d40f21111d25b8c7b90d77e2260e1a6a4ff2
      https://github.com/ckan/ckan/commit/8cf8d40f21111d25b8c7b90d77e2260e1a6a4ff2
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

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

  Log Message:
  -----------
  [#1301] Adds blocks to group and org based templates


  Commit: 1d7771f3e9d9f4c136dae94113dc59547c73b749
      https://github.com/ckan/ckan/commit/1d7771f3e9d9f4c136dae94113dc59547c73b749
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

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

  Log Message:
  -----------
  [#1301] Adds blocks to the package form buttons


  Commit: ad7c4d3291778de6cf1cb588fe761a9f1d51ae27
      https://github.com/ckan/ckan/commit/ad7c4d3291778de6cf1cb588fe761a9f1d51ae27
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

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

  Log Message:
  -----------
  [#1301] Adds hanging enblock


  Commit: 82f1447ecb6951b8db019cdaf207c2f628df312b
      https://github.com/ckan/ckan/commit/82f1447ecb6951b8db019cdaf207c2f628df312b
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html

  Log Message:
  -----------
  [#1301] Adds more template blocks to the user forms


  Commit: 9fadea50e08379164ab1b1070544f9795c80a669
      https://github.com/ckan/ckan/commit/9fadea50e08379164ab1b1070544f9795c80a669
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    A ckan/config/resource_formats.json
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/resource.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/templates/package/snippets/resource_form.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/lib/test_resource_search.py
    M doc/configuration.rst

  Log Message:
  -----------
  [#1350] resource format change


  Commit: a18781d3ad326698d8b4e5d73fb218c966f1e068
      https://github.com/ckan/ckan/commit/a18781d3ad326698d8b4e5d73fb218c966f1e068
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-09 (Mon, 09 Dec 2013)

  Changed paths:
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py

  Log Message:
  -----------
  [#1377] Add __init__.py file to example plugin


  Commit: 619cc271138a209a3de0fa9bd095d4a0a4ad6b02
      https://github.com/ckan/ckan/commit/619cc271138a209a3de0fa9bd095d4a0a4ad6b02
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Tidy up first javascript example


  Commit: 11f5cb0fb370f87a1825d5bf9442bdec8a8625ac
      https://github.com/ckan/ckan/commit/11f5cb0fb370f87a1825d5bf9442bdec8a8625ac
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M setup.py

  Log Message:
  -----------
  [#1377] Add this.options and this.el javascript example


  Commit: b1c12f74b09c4703407563861e089e37ec0e19e2
      https://github.com/ckan/ckan/commit/b1c12f74b09c4703407563861e089e37ec0e19e2
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1374] fix datastore _read_connection_has_correct_privileges

remove the read connection, and use the write connection with the
username of the read connection to test if the priviliges are correct


  Commit: 28e92031be5bb4fce3e0c1be16fc98b868d112a9
      https://github.com/ckan/ckan/commit/28e92031be5bb4fce3e0c1be16fc98b868d112a9
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1374] refactor datastore _read_connection_has_correct_privileges()

 * remove nested try statement
 * use make_url instead of splicing the string for _get_db_url()


  Commit: 74943812fdfd5ef4f107a9cad0fba77b22718540
      https://github.com/ckan/ckan/commit/74943812fdfd5ef4f107a9cad0fba77b22718540
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1374] add host and port to _get_db_from_url


  Commit: 8bc88c2279290e070979a22d5e40ec55f84b5a93
      https://github.com/ckan/ckan/commit/8bc88c2279290e070979a22d5e40ec55f84b5a93
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1374] datastore:rename variable to avoid confusing name clash


  Commit: f124bb9283f2b15f819609b33be7a1e415480499
      https://github.com/ckan/ckan/commit/f124bb9283f2b15f819609b33be7a1e415480499
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1374] datastore:use bind params instead of string formatting


  Commit: 3b788ac004cf9d701e93848adba75698e9f675fb
      https://github.com/ckan/ckan/commit/3b788ac004cf9d701e93848adba75698e9f675fb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M setup.py

  Log Message:
  -----------
  [#1377] Add a snippet API javascript example

This example could be improved by passing only the package id to the
snippet, the snippet can then use h.get_action('package_show')(...) to
get the full package dict.


  Commit: 01ca6e9eda4e1216342cb876806b245a357d31f4
      https://github.com/ckan/ckan/commit/01ca6e9eda4e1216342cb876806b245a357d31f4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M doc/theming/index.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Add docs for snippet API example


  Commit: e46df2a6e2cab4326080d50b958b9554284a5bc2
      https://github.com/ckan/ckan/commit/e46df2a6e2cab4326080d50b958b9554284a5bc2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

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

  Log Message:
  -----------
  [#1377] Add pubsub example and docs


  Commit: da55e8a082c26db06241eb7b2f128cc03828d1be
      https://github.com/ckan/ckan/commit/da55e8a082c26db06241eb7b2f128cc03828d1be
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Add stubs for remaining sections of js tutorial


  Commit: 4c50edc2e1ef04461080b2c3a52e7667031e75c7
      https://github.com/ckan/ckan/commit/4c50edc2e1ef04461080b2c3a52e7667031e75c7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Fix the case of a title


  Commit: 508ce970ed5abf9468f08fe67f06ce89972f16f5
      https://github.com/ckan/ckan/commit/508ce970ed5abf9468f08fe67f06ce89972f16f5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

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

  Log Message:
  -----------
  [#1377] Add best practice about not overusing pubsub


  Commit: e524a07242ac90d821289e054aeaf498407b95eb
      https://github.com/ckan/ckan/commit/e524a07242ac90d821289e054aeaf498407b95eb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    A __init__.py b/ckanext/example_theme/v19_pubsub/__init__.py
    A ckanext/example_theme/v19_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_pubsub/plugin.py
    A ckanext/example_theme/v19_pubsub/templates
    M setup.py

  Log Message:
  -----------
  [#1377] Add pubsub working example

This should have been in commit e46df2a6e2cab4326080d50b958b9554284a5bc2


  Commit: b4005ff21da1dbcc99e3a60176707cdd151a3178
      https://github.com/ckan/ckan/commit/b4005ff21da1dbcc99e3a60176707cdd151a3178
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Add overview to top of js tutorial


  Commit: c7e759c4b439cf825422d0f16cc866fe22d60604
      https://github.com/ckan/ckan/commit/c7e759c4b439cf825422d0f16cc866fe22d60604
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Add note about when js modules are initialized


  Commit: 13f5b26a3c9c8d10da42f45db71f3e29bcd8779a
      https://github.com/ckan/ckan/commit/13f5b26a3c9c8d10da42f45db71f3e29bcd8779a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    R ckanext/example_theme/v19_pubsub/__init__.py
    R ckanext/example_theme/v19_pubsub/fanstatic/example_theme_popover.css
    R ckanext/example_theme/v19_pubsub/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v19_pubsub/plugin.py
    R ckanext/example_theme/v19_pubsub/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    M doc/theming/javascript.rst
    M setup.py

  Log Message:
  -----------
  [#1377] Add js error handling example and docs


  Commit: bc437bcd26eb239bed83b57ac001c9f46e64503b
      https://github.com/ckan/ckan/commit/bc437bcd26eb239bed83b57ac001c9f46e64503b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst

  Log Message:
  -----------
  [#1377] Add stub page for jQuery plugins docs


  Commit: 8daf611a487c9f26ddd76d57abcfd3ba2fe055fb
      https://github.com/ckan/ckan/commit/8daf611a487c9f26ddd76d57abcfd3ba2fe055fb
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#1400] allow overriding dataset, group, org validation


  Commit: e403ba0418db510f63c7a3e97b8a4bcd96faa181
      https://github.com/ckan/ckan/commit/e403ba0418db510f63c7a3e97b8a4bcd96faa181
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1400] fix import


  Commit: 21da1ece8aa83c18a3ebcbe887fb579709e3e2ee
      https://github.com/ckan/ckan/commit/21da1ece8aa83c18a3ebcbe887fb579709e3e2ee
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#1400] remove leading _ from validate()


  Commit: e77e3dee1b6b40a5344ff5e0320106479e2a7f42
      https://github.com/ckan/ckan/commit/e77e3dee1b6b40a5344ff5e0320106479e2a7f42
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

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

  Log Message:
  -----------
  [#1400] pass actual action name to pluigin.validate method


  Commit: 2d1215324e790fbabe795bfc760e2a3c933e8ddc
      https://github.com/ckan/ckan/commit/2d1215324e790fbabe795bfc760e2a3c933e8ddc
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#1400] add navl_validate to plugins.toolkit


  Commit: 7c166563274c2beaae64090082fb821a665ac8c7
      https://github.com/ckan/ckan/commit/7c166563274c2beaae64090082fb821a665ac8c7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M doc/theming/javascript.rst
    M setup.py

  Log Message:
  -----------
  [#1377] Add jQuery plugin example and docs


  Commit: 71a7421521f2f5f95fde92da296883220d40ab89
      https://github.com/ckan/ckan/commit/71a7421521f2f5f95fde92da296883220d40ab89
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1400] remove leading _ from the other validate()


  Commit: bedfdcbf3fa95588c2dcaa87fab0a93ca1aae0b5
      https://github.com/ckan/ckan/commit/bedfdcbf3fa95588c2dcaa87fab0a93ca1aae0b5
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#1400] plugin backwards compatibility


  Commit: ca05e99b45ed50aa7599328f271a8d786c39550a
      https://github.com/ckan/ckan/commit/ca05e99b45ed50aa7599328f271a8d786c39550a
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#1400] add validate() to IDatasetForm and IGroupForm


  Commit: 29395751f36380bed848ed937eae89ab4936b748
      https://github.com/ckan/ckan/commit/29395751f36380bed848ed937eae89ab4936b748
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#1400] use context, data_dict param order


  Commit: 45a70811afc24e1979d1e1316b6439a03af5fc8d
      https://github.com/ckan/ckan/commit/45a70811afc24e1979d1e1316b6439a03af5fc8d
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1400] validate() now part of interface, returns None if not defined


  Commit: d757e90d0938f3fb99610f44ac211beedf8e4c02
      https://github.com/ckan/ckan/commit/d757e90d0938f3fb99610f44ac211beedf8e4c02
  Author: Ian Ward <ian at excess.org>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1400] belt and suspenders


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

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

  Log Message:
  -----------
  [#1332] Makes markdown link a popover with context of CKAN flavoured markdown


  Commit: 1ef65879004ae308845896060c0ee418b06a674b
      https://github.com/ckan/ckan/commit/1ef65879004ae308845896060c0ee418b06a674b
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  Add a new factory for related items


  Commit: 594d170fc641aac2ae920f5de823f9d740c8d061
      https://github.com/ckan/ckan/commit/594d170fc641aac2ae920f5de823f9d740c8d061
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

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

  Log Message:
  -----------
  tests for related_list


  Commit: 482fa53a26552b6f5d8d89fe6ca0359581cd170e
      https://github.com/ckan/ckan/commit/482fa53a26552b6f5d8d89fe6ca0359581cd170e
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

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

  Log Message:
  -----------
  Fix pep error


  Commit: 49de093fc097255518bbc6ec4726937459052e58
      https://github.com/ckan/ckan/commit/49de093fc097255518bbc6ec4726937459052e58
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

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

  Log Message:
  -----------
  Break down the tests into multiple tests


  Commit: 1b572e8a34a00353e9348955bfb3caf2bf028fb9
      https://github.com/ckan/ckan/commit/1b572e8a34a00353e9348955bfb3caf2bf028fb9
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-10 (Fri, 10 Jan 2014)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/validators.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/layout.less
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.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/resource_read.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/tests/functional/test_related.py
    A doc/.gitignore
    M doc/conf.py
    M doc/install-from-package.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch 'master' into related-list-tests


  Commit: 23bd1c64ea21ea09695a7e08ec6594dfa0b7d760
      https://github.com/ckan/ckan/commit/23bd1c64ea21ea09695a7e08ec6594dfa0b7d760
  Author: Ian Ward <ian at excess.org>
  Date:   2014-01-13 (Mon, 13 Jan 2014)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/home.py
    M ckan/controllers/related.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/validators.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/layout.less
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/home/layout1.html
    M ckan/templates/home/layout2.html
    M ckan/templates/home/layout3.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/tests/functional/test_related.py
    R ckan_deb/DEBIAN/control.template
    R ckan_deb/usr/bin/ckan-create-instance
    R ckan_deb/usr/bin/ckan-instance-maintenance
    R ckan_deb/usr/bin/ckan-setup-solr
    R ckan_deb/usr/lib/ckan/common.sh
    R ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v4.py
    A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_theme/__init__.py
    A ckanext/example_theme/custom_config_setting/__init__.py
    A ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
    A ckanext/example_theme/custom_config_setting/templates/snippets
    A ckanext/example_theme/v01_empty_extension/__init__.py
    A ckanext/example_theme/v01_empty_extension/plugin.py
    A ckanext/example_theme/v02_empty_template/__init__.py
    A ckanext/example_theme/v02_empty_template/plugin.py
    A ckanext/example_theme/v02_empty_template/templates/home/index.html
    A ckanext/example_theme/v03_jinja/__init__.py
    A ckanext/example_theme/v03_jinja/plugin.py
    A ckanext/example_theme/v03_jinja/templates/home/index.html
    A ckanext/example_theme/v04_ckan_extends/__init__.py
    A ckanext/example_theme/v04_ckan_extends/plugin.py
    A ckanext/example_theme/v04_ckan_extends/templates/home/index.html
    A ckanext/example_theme/v05_block/__init__.py
    A ckanext/example_theme/v05_block/plugin.py
    A ckanext/example_theme/v05_block/templates/home/layout1.html
    A ckanext/example_theme/v06_super/__init__.py
    A ckanext/example_theme/v06_super/plugin.py
    A ckanext/example_theme/v06_super/templates/home/layout1.html
    A ckanext/example_theme/v07_helper_function/__init__.py
    A ckanext/example_theme/v07_helper_function/plugin.py
    A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v08_custom_helper_function/__init__.py
    A ckanext/example_theme/v08_custom_helper_function/plugin.py
    A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v09_snippet/__init__.py
    A ckanext/example_theme/v09_snippet/plugin.py
    A ckanext/example_theme/v09_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/__init__.py
    A ckanext/example_theme/v10_custom_snippet/plugin.py
    A ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
    A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
    A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
    A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v12_extra_public_dir/__init__.py
    A ckanext/example_theme/v12_extra_public_dir/plugin.py
    A ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
    A ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html
    A ckanext/example_theme/v12_extra_public_dir/templates/snippets
    A ckanext/example_theme/v13_custom_css/__init__.py
    A ckanext/example_theme/v13_custom_css/plugin.py
    A ckanext/example_theme/v13_custom_css/public/example_theme.css
    A ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v13_custom_css/templates/base.html
    A ckanext/example_theme/v13_custom_css/templates/home
    A ckanext/example_theme/v13_custom_css/templates/snippets
    A ckanext/example_theme/v14_more_custom_css/__init__.py
    A ckanext/example_theme/v14_more_custom_css/plugin.py
    A ckanext/example_theme/v14_more_custom_css/public/example_theme.css
    A ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v14_more_custom_css/templates
    A ckanext/example_theme/v15_fanstatic/__init__.py
    A ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
    A ckanext/example_theme/v15_fanstatic/plugin.py
    A ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
    A ckanext/example_theme/v15_fanstatic/templates/base.html
    A ckanext/example_theme/v15_fanstatic/templates/home
    A ckanext/example_theme/v15_fanstatic/templates/snippets
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    A ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/public
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A doc/.gitignore
    R doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/contents.rst
    R doc/contributing.rst
    A doc/contributing/architecture.rst
    A doc/contributing/commit-messages.rst
    A doc/contributing/css.rst
    A doc/contributing/database-migrations.rst
    A doc/contributing/documentation.rst
    A doc/contributing/frontend/index.rst
    A doc/contributing/frontend/javascript-module-tutorial.rst
    A doc/contributing/frontend/resources.rst
    A doc/contributing/frontend/template-blocks.rst
    A doc/contributing/frontend/template-tutorial.rst
    A doc/contributing/frontend/templating.rst
    A doc/contributing/html.rst
    A doc/contributing/i18n.rst
    A doc/contributing/index.rst
    A doc/contributing/issues.rst
    A doc/contributing/javascript.rst
    A doc/contributing/pull-requests.rst
    A doc/contributing/python.rst
    A doc/contributing/release-process.rst
    A doc/contributing/reviewing.rst
    A doc/contributing/testing.rst
    A doc/contributing/upgrading-dependencies.rst
    R doc/css-coding-standards.rst
    R doc/documentation-guidelines.rst
    M doc/extensions/best-practices.rst
    A doc/extensions/custom-config-settings.rst
    M doc/extensions/index.rst
    M doc/extensions/tutorial.rst
    R doc/frontend-development.rst
    R doc/html-coding-standards.rst
    R doc/i18n.rst
    A doc/images/custom-css.png
    A doc/images/debug-footer.png
    A doc/images/extra-public-dir.png
    A doc/images/html_and_css.png
    A doc/images/more-custom-css.png
    A doc/images/most-popular-groups-custom-snippet.png
    A doc/images/most-popular-groups-snippet.png
    A doc/images/most-popular-groups.png
    A doc/images/recently-changed-packages-activity-stream.png
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    R doc/javascript-coding-standards.rst
    R doc/javascript-module-tutorial.rst
    R doc/migration.rst
    M doc/multilingual.rst
    R doc/python-coding-standards.rst
    R doc/release-process.rst
    R doc/resources.rst
    M doc/sysadmin-guide.rst
    M doc/tag-vocabularies.rst
    R doc/template-blocks.rst
    R doc/template-tutorial.rst
    R doc/templating.rst
    R doc/testing-coding-standards.rst
    R doc/theming.rst
    A doc/theming/best-practices.rst
    A doc/theming/css.rst
    A doc/theming/fanstatic.rst
    A doc/theming/index.rst
    A doc/theming/javascript.rst
    A doc/theming/jinja-tags.rst
    A doc/theming/static-files.rst
    A doc/theming/substitutions.rst
    A doc/theming/template-helper-functions.rst
    A doc/theming/template-snippets.rst
    A doc/theming/templates.rst
    A doc/theming/variables-and-functions.rst
    M doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrading-dependencies.rst
    M doc/upgrading.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into more-flexible-schemas


  Commit: b78a0978a6cc51c37640557f4503b6b75cb9ce47
      https://github.com/ckan/ckan/commit/b78a0978a6cc51c37640557f4503b6b75cb9ce47
  Author: Ian Ward <ian at excess.org>
  Date:   2014-01-14 (Tue, 14 Jan 2014)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#1430] show package/resource revision_ids, disallow setting them


  Commit: 0f63dcc286258dd44f575259bf89aa913f91eff7
      https://github.com/ckan/ckan/commit/0f63dcc286258dd44f575259bf89aa913f91eff7
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  [#1330] Get user ids from a list of ids or names


  Commit: 001d7c6a36de08f7c520f009ce695ef943c1d276
      https://github.com/ckan/ckan/commit/001d7c6a36de08f7c520f009ce695ef943c1d276
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

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

  Log Message:
  -----------
  [#1330] Filter activity from specified users


  Commit: d6486a1c936a3faa037b6a8e2d34d8c52ab7e4d3
      https://github.com/ckan/ckan/commit/d6486a1c936a3faa037b6a8e2d34d8c52ab7e4d3
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

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

  Log Message:
  -----------
  [#1330] Update documentation


  Commit: 48b95baf3539fef336c4d45b558763cc600c7d28
      https://github.com/ckan/ckan/commit/48b95baf3539fef336c4d45b558763cc600c7d28
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#1330] Use actual value of site_id for default


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

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

  Log Message:
  -----------
  [#1330] Fix test failures


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

  Changed paths:
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  pep8 fix for test failure


  Commit: f74dc89c2177ca03661553820f6f45c81928c8ec
      https://github.com/ckan/ckan/commit/f74dc89c2177ca03661553820f6f45c81928c8ec
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Use $ and _ param names in JavaScript modules


  Commit: 915912292d1ee078be0f52e63c577b0bd753810f
      https://github.com/ckan/ckan/commit/915912292d1ee078be0f52e63c577b0bd753810f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Clarify use of window in JavaScript modules


  Commit: 600e9c7cde4512f91126d8ae97ecd01118649562
      https://github.com/ckan/ckan/commit/600e9c7cde4512f91126d8ae97ecd01118649562
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js

  Log Message:
  -----------
  [#1733] Add 'use strict' to example JavaScript


  Commit: 34fcae6295fad016205eed6ed0db2f2b2b5451f6
      https://github.com/ckan/ckan/commit/34fcae6295fad016205eed6ed0db2f2b2b5451f6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Fix a few little typos etc


  Commit: 0ddf06b86797916ae1e41706ed4da3248426b622
      https://github.com/ckan/ckan/commit/0ddf06b86797916ae1e41706ed4da3248426b622
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Use this.$ not this.sandbox.jQuery


  Commit: 55799c578eae624f5f46e3a2dd5b84eb1cafa088
      https://github.com/ckan/ckan/commit/55799c578eae624f5f46e3a2dd5b84eb1cafa088
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M doc/theming/index.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Move objects and methods available to JavaScript modules onto its own page

And tidy it up a little and finish it off


  Commit: 86194246c3ba5368b54517e1e566d142aa595088
      https://github.com/ckan/ckan/commit/86194246c3ba5368b54517e1e566d142aa595088
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M doc/conf.py
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Add some links to js tutorial


  Commit: 4031e22552313f60100447ebf878bd20333b45a8
      https://github.com/ckan/ckan/commit/4031e22552313f60100447ebf878bd20333b45a8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Add some links to js tutorial


  Commit: aca6a6903344a31ec1fcd8136a2e2f153815b181
      https://github.com/ckan/ckan/commit/aca6a6903344a31ec1fcd8136a2e2f153815b181
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#1377] Add images to JS tutorial


  Commit: 570fb1a58171d29fc3faae1f5c22d0b1a2ae9967
      https://github.com/ckan/ckan/commit/570fb1a58171d29fc3faae1f5c22d0b1a2ae9967
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.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/group.py
    M ckan/new_authz.py
    M ckan/new_tests/factories.py
    A ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/vendor/jquery.ui.core.js
    A ckan/public/base/vendor/jquery.ui.mouse.js
    A ckan/public/base/vendor/jquery.ui.sortable.js
    M ckan/public/base/vendor/jquery.ui.widget.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_coding_standards.py
    R ckan_deb/DEBIAN/control.template
    R ckan_deb/usr/bin/ckan-create-instance
    R ckan_deb/usr/bin/ckan-instance-maintenance
    R ckan_deb/usr/bin/ckan-setup-solr
    R ckan_deb/usr/lib/ckan/common.sh
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    R ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v4.py
    A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_theme/custom_config_setting/__init__.py
    A ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
    A ckanext/example_theme/custom_config_setting/templates/snippets
    M ckanext/example_theme/v02_empty_template/plugin.py
    M ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
    M ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    M ckanext/textpreview/tests/test_preview.py
    A doc/.gitignore
    M doc/_templates/footer.html
    M doc/background-tasks.rst
    R doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/contents.rst
    R doc/contributing.rst
    A doc/contributing/architecture.rst
    A doc/contributing/commit-messages.rst
    A doc/contributing/css.rst
    A doc/contributing/database-migrations.rst
    A doc/contributing/documentation.rst
    A doc/contributing/frontend/index.rst
    A doc/contributing/frontend/javascript-module-tutorial.rst
    A doc/contributing/frontend/resources.rst
    A doc/contributing/frontend/template-blocks.rst
    A doc/contributing/frontend/template-tutorial.rst
    A doc/contributing/frontend/templating.rst
    A doc/contributing/html.rst
    A doc/contributing/i18n.rst
    A doc/contributing/index.rst
    A doc/contributing/issues.rst
    A doc/contributing/javascript.rst
    A doc/contributing/pull-requests.rst
    A doc/contributing/python.rst
    A doc/contributing/release-process.rst
    A doc/contributing/reviewing.rst
    A doc/contributing/testing.rst
    A doc/contributing/upgrading-dependencies.rst
    R doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    R doc/documentation-guidelines.rst
    M doc/extensions/best-practices.rst
    A doc/extensions/custom-config-settings.rst
    M doc/extensions/index.rst
    M doc/extensions/tutorial.rst
    M doc/features.rst
    M doc/filestore.rst
    R doc/frontend-development.rst
    R doc/html-coding-standards.rst
    R doc/i18n.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    R doc/javascript-coding-standards.rst
    R doc/javascript-module-tutorial.rst
    R doc/migration.rst
    M doc/multilingual.rst
    R doc/python-coding-standards.rst
    R doc/release-process.rst
    R doc/resources.rst
    M doc/stats.rst
    R doc/template-blocks.rst
    R doc/template-tutorial.rst
    R doc/templating.rst
    R doc/testing-coding-standards.rst
    M doc/theming/best-practices.rst
    M doc/theming/css.rst
    M doc/theming/fanstatic.rst
    M doc/theming/javascript.rst
    M doc/theming/static-files.rst
    M doc/theming/templates.rst
    M doc/tracking.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst
    R doc/upgrading-dependencies.rst
    M doc/upgrading.rst
    M requirements.txt
    M setup.py

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

Conflicts:
	doc/theming/javascript.rst
	setup.py


  Commit: 6d578a7cf53097c6f8ecd275bdb8800418571589
      https://github.com/ckan/ckan/commit/6d578a7cf53097c6f8ecd275bdb8800418571589
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M doc/theming/index.rst

  Log Message:
  -----------
  [#1377] Add jQuery plugins doc to index


  Commit: 8cea2b7bdd1d1043c314776d6e29c71748d8fbf7
      https://github.com/ckan/ckan/commit/8cea2b7bdd1d1043c314776d6e29c71748d8fbf7
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M doc/extensions/testing-extensions.rst

  Log Message:
  -----------
  [#1483] add extension writing tip about avoiding plugin importing


  Commit: 4f59da03d62b1c8f0e1a024949a99ba0046ca44c
      https://github.com/ckan/ckan/commit/4f59da03d62b1c8f0e1a024949a99ba0046ca44c
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

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

  Log Message:
  -----------
  Update factory and related tests

* Delete unnecessary comments from factory.
* Change related factory to accept user parameter.
* Add better docstrings and comments to the related tests.
* Add test to check for invalid sort option.


  Commit: 66232326b15066c57478cf3aa7dc01ab5a367a15
      https://github.com/ckan/ckan/commit/66232326b15066c57478cf3aa7dc01ab5a367a15
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M doc/configuration.rst

  Log Message:
  -----------
  Update action function and documentation

* Split the helper function into two functions.
* Add better docstrings.
* Improve the documentation and explain about site user.


  Commit: 24258d27613ea1032f98ec52f88aec5b6052ce30
      https://github.com/ckan/ckan/commit/24258d27613ea1032f98ec52f88aec5b6052ce30
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

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

  Log Message:
  -----------
  Fix tiny error.


  Commit: 85ec5302b7a68243c033d83ee7a22364089f51be
      https://github.com/ckan/ckan/commit/85ec5302b7a68243c033d83ee7a22364089f51be
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Enable `hide_activity_from_users` by default


  Commit: 99ededda93d178a6d25e2cc4b62c0a0335079eb2
      https://github.com/ckan/ckan/commit/99ededda93d178a6d25e2cc4b62c0a0335079eb2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M doc/contributing/documentation.rst

  Log Message:
  -----------
  Documentation guidelines tweaks

Various small changes that we discussed at the CKAN summit.


  Commit: 15dc0488196907eb5592c771c0cbd4a04f20d90e
      https://github.com/ckan/ckan/commit/15dc0488196907eb5592c771c0cbd4a04f20d90e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/new_tests/helpers.py

  Log Message:
  -----------
  Tweak call_action docstring

Make it clear that it skips auth


  Commit: f02622b9f31b2807190147436d335b4e50ca6aca
      https://github.com/ckan/ckan/commit/f02622b9f31b2807190147436d335b4e50ca6aca
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

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

  Log Message:
  -----------
  Fix a couple of broken Sphinx includes


  Commit: 8ed79fec17eb1438df511d8ed13915546b821b92
      https://github.com/ckan/ckan/commit/8ed79fec17eb1438df511d8ed13915546b821b92
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-06 (Thu, 06 Feb 2014)

  Changed paths:
    R .gitmodules
    M CHANGELOG.rst
    M ckan/__init__.py
    M ckan/lib/navl/validators.py
    M ckan/logic/__init__.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/plugins/interfaces.py
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/tests/functional/test_package.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/appendices/solr-multicore.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    M doc/conf.py
    R doc/configuration.rst
    M doc/contents.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/index.rst
    M doc/contributing/release-process.rst
    A doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/email-notifications.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/getting-started.rst
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    M doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    M doc/theming/index.rst
    M doc/theming/templates.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    M doc/user-guide.rst

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


  Commit: 79dfd8df5fd4d6bf9805f88ca3c6a9622465684d
      https://github.com/ckan/ckan/commit/79dfd8df5fd4d6bf9805f88ca3c6a9622465684d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#1502] Remove "{User} has been logged in" flash message

Fixes #1502.


  Commit: 806826796c57bf4e997890043ef5877d9d6408c1
      https://github.com/ckan/ckan/commit/806826796c57bf4e997890043ef5877d9d6408c1
  Author: John Martin <me at johnmart.in>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M MANIFEST.in
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/__init__.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    A ckan/lib/uploader.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/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/group.py
    M ckan/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/vendor/jquery.ui.core.js
    A ckan/public/base/vendor/jquery.ui.mouse.js
    A ckan/public/base/vendor/jquery.ui.sortable.js
    M ckan/public/base/vendor/jquery.ui.widget.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/layout1.html
    M ckan/templates/home/layout2.html
    M ckan/templates/home/layout3.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/activity.html
    R ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_base.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.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_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/search_result_text.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/login.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    R ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_schema_version.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_coding_standards.py
    R ckan_deb/DEBIAN/control.template
    R ckan_deb/usr/bin/ckan-create-instance
    R ckan_deb/usr/bin/ckan-instance-maintenance
    R ckan_deb/usr/bin/ckan-setup-solr
    R ckan_deb/usr/lib/ckan/common.sh
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    R ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v4.py
    A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_theme/__init__.py
    A ckanext/example_theme/custom_config_setting/__init__.py
    A ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
    A ckanext/example_theme/custom_config_setting/templates/snippets
    A ckanext/example_theme/v01_empty_extension/__init__.py
    A ckanext/example_theme/v01_empty_extension/plugin.py
    A ckanext/example_theme/v02_empty_template/__init__.py
    A ckanext/example_theme/v02_empty_template/plugin.py
    A ckanext/example_theme/v02_empty_template/templates/home/index.html
    A ckanext/example_theme/v03_jinja/__init__.py
    A ckanext/example_theme/v03_jinja/plugin.py
    A ckanext/example_theme/v03_jinja/templates/home/index.html
    A ckanext/example_theme/v04_ckan_extends/__init__.py
    A ckanext/example_theme/v04_ckan_extends/plugin.py
    A ckanext/example_theme/v04_ckan_extends/templates/home/index.html
    A ckanext/example_theme/v05_block/__init__.py
    A ckanext/example_theme/v05_block/plugin.py
    A ckanext/example_theme/v05_block/templates/home/layout1.html
    A ckanext/example_theme/v06_super/__init__.py
    A ckanext/example_theme/v06_super/plugin.py
    A ckanext/example_theme/v06_super/templates/home/layout1.html
    A ckanext/example_theme/v07_helper_function/__init__.py
    A ckanext/example_theme/v07_helper_function/plugin.py
    A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v08_custom_helper_function/__init__.py
    A ckanext/example_theme/v08_custom_helper_function/plugin.py
    A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v09_snippet/__init__.py
    A ckanext/example_theme/v09_snippet/plugin.py
    A ckanext/example_theme/v09_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/__init__.py
    A ckanext/example_theme/v10_custom_snippet/plugin.py
    A ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
    A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
    A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
    A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v12_extra_public_dir/__init__.py
    A ckanext/example_theme/v12_extra_public_dir/plugin.py
    A ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
    A ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html
    A ckanext/example_theme/v12_extra_public_dir/templates/snippets
    A ckanext/example_theme/v13_custom_css/__init__.py
    A ckanext/example_theme/v13_custom_css/plugin.py
    A ckanext/example_theme/v13_custom_css/public/example_theme.css
    A ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v13_custom_css/templates/base.html
    A ckanext/example_theme/v13_custom_css/templates/home
    A ckanext/example_theme/v13_custom_css/templates/snippets
    A ckanext/example_theme/v14_more_custom_css/__init__.py
    A ckanext/example_theme/v14_more_custom_css/plugin.py
    A ckanext/example_theme/v14_more_custom_css/public/example_theme.css
    A ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v14_more_custom_css/templates
    A ckanext/example_theme/v15_fanstatic/__init__.py
    A ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
    A ckanext/example_theme/v15_fanstatic/plugin.py
    A ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
    A ckanext/example_theme/v15_fanstatic/templates/base.html
    A ckanext/example_theme/v15_fanstatic/templates/home
    A ckanext/example_theme/v15_fanstatic/templates/snippets
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    A ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/public
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    A doc/.gitignore
    A doc/_static/ckanlogo.png
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    R doc/ckan-coding-standards.rst
    M doc/conf.py
    R doc/configuration.rst
    A doc/contents.rst
    R doc/contributing.rst
    A doc/contributing/architecture.rst
    A doc/contributing/commit-messages.rst
    A doc/contributing/css.rst
    A doc/contributing/database-migrations.rst
    A doc/contributing/documentation.rst
    A doc/contributing/frontend/index.rst
    A doc/contributing/frontend/javascript-module-tutorial.rst
    A doc/contributing/frontend/resources.rst
    A doc/contributing/frontend/template-blocks.rst
    A doc/contributing/frontend/template-tutorial.rst
    A doc/contributing/frontend/templating.rst
    A doc/contributing/html.rst
    A doc/contributing/i18n.rst
    A doc/contributing/index.rst
    A doc/contributing/issues.rst
    A doc/contributing/javascript.rst
    A doc/contributing/pull-requests.rst
    A doc/contributing/python.rst
    A doc/contributing/release-process.rst
    A doc/contributing/reviewing.rst
    A doc/contributing/test.rst
    A doc/contributing/testing.rst
    A doc/contributing/upgrading-dependencies.rst
    R doc/css-coding-standards.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/documentation-guidelines.rst
    R doc/email-notifications.rst
    M doc/extensions/best-practices.rst
    A doc/extensions/custom-config-settings.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/frontend-development.rst
    R doc/getting-started.rst
    R doc/html-coding-standards.rst
    R doc/i18n.rst
    A doc/images/add_dataset_1.jpg
    A doc/images/add_dataset_2.jpg
    A doc/images/add_dataset_3.jpg
    R doc/images/admin-page.png
    R doc/images/ckan_logo_box.png
    A doc/images/create_organization.jpg
    A doc/images/custom-css.png
    A doc/images/customize_look_and_feel.jpg
    A doc/images/debug-footer.png
    A doc/images/edit_dataset.jpg
    A doc/images/exploring_datasets.jpg
    A doc/images/extra-public-dir.png
    A doc/images/html_and_css.png
    A doc/images/manage_news_feed.jpg
    A doc/images/manage_organization.jpg
    A doc/images/manage_user_profile.jpg
    A doc/images/manage_users.jpg
    A doc/images/more-custom-css.png
    A doc/images/most-popular-groups-custom-snippet.png
    A doc/images/most-popular-groups-snippet.png
    A doc/images/most-popular-groups.png
    A doc/images/move_dataset_between_organizations.jpg
    A doc/images/recently-changed-packages-activity-stream.png
    A doc/images/register_account.jpg
    A doc/images/search_the_site.jpg
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/javascript-coding-standards.rst
    R doc/javascript-module-tutorial.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    R doc/migration.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/python-coding-standards.rst
    R doc/release-process.rst
    R doc/resources.rst
    R doc/stats.rst
    R doc/template-blocks.rst
    R doc/template-tutorial.rst
    R doc/templating.rst
    R doc/test.rst
    R doc/testing-coding-standards.rst

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


  Commit: b1172949872ccff39201afe434ee337b86cfa420
      https://github.com/ckan/ckan/commit/b1172949872ccff39201afe434ee337b86cfa420
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-19 (Wed, 19 Feb 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  Improve the group test factory

Generate a different name for each test group, and require the user who
will create the group as a param.

This will break some existing tests...


  Commit: 7b77f6bd96ea42c986f4fe32ee2efe4add220e30
      https://github.com/ckan/ckan/commit/7b77f6bd96ea42c986f4fe32ee2efe4add220e30
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M ckan/templates/user/request_reset.html

  Log Message:
  -----------
  [#1508] Make 'Request Reset' button smaller


  Commit: db86dceb57f9677982b06132e07f134db103482b
      https://github.com/ckan/ckan/commit/db86dceb57f9677982b06132e07f134db103482b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M ckan/templates/user/request_reset.html

  Log Message:
  -----------
  [#1508] Correct case of text on password reset page


  Commit: 7f3717be39b7bf1ba4b3f62cccd1f534b38af8fa
      https://github.com/ckan/ckan/commit/7f3717be39b7bf1ba4b3f62cccd1f534b38af8fa
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M doc/extensions/testing-extensions.rst

  Log Message:
  -----------
  Merge pull request #1483 from ckan/1483-writing-ext-tip

Add a tip about testing extensions


  Commit: bbc3c05e148911729a096b6d1ec02f970fe6405e
      https://github.com/ckan/ckan/commit/bbc3c05e148911729a096b6d1ec02f970fe6405e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M README.rst
    M bin/travis-install-dependencies
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.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/custom-fields.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/appendices/solr-multicore.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    M doc/conf.py
    R doc/configuration.rst
    M doc/contents.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/release-process.rst
    A doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/email-notifications.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/getting-started.rst
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    M doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    M doc/theming/index.rst
    M doc/theming/templates.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into related-list-tests


  Commit: ae7231267ca7e01b59c99503e6010887201d522f
      https://github.com/ckan/ckan/commit/ae7231267ca7e01b59c99503e6010887201d522f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

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

  Log Message:
  -----------
  [#1526] Fix some tests broken by commit b117294987


  Commit: 95b854cb77bdf031f8708a02ffb886fc8851fe0b
      https://github.com/ckan/ckan/commit/95b854cb77bdf031f8708a02ffb886fc8851fe0b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M .tx/config
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M doc/extensions/testing-extensions.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into improved-group-factory


  Commit: 23022ab44adf54e90281ea7a4eb5259def5d09e0
      https://github.com/ckan/ckan/commit/23022ab44adf54e90281ea7a4eb5259def5d09e0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

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

  Log Message:
  -----------
  Merge branch 'related-list-tests'


  Commit: 5459bcab0c7c95d03137ba350bddce1d4c6ebd9c
      https://github.com/ckan/ckan/commit/5459bcab0c7c95d03137ba350bddce1d4c6ebd9c
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/auth/__init__.py
    M doc/contributing/documentation.rst

  Log Message:
  -----------
  Merge pull request #1489 from ckan/docs-tweaks-from-ckan-summit-winter-2014

Docs tweaks from ckan summit winter 2014


  Commit: 1d7ea5130a13c96d02bac17e492355071b3a69b3
      https://github.com/ckan/ckan/commit/1d7ea5130a13c96d02bac17e492355071b3a69b3
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

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

  Log Message:
  -----------
  Merge pull request #1526 from ckan/improved-group-factory

Improve the group test factory


  Commit: bf9402162b152d5671fba8cf856afd1dab4b5741
      https://github.com/ckan/ckan/commit/bf9402162b152d5671fba8cf856afd1dab4b5741
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_get.py

  Log Message:
  -----------
  [#1507] Use package_search API for current_packages

Switch to using the package_search API for current_package_list_with_resources
endpoint. This limits the strain on the database and also limits private
datasets being shown publically


  Commit: f03a2d13839f49563b12d63180f345ee32008389
      https://github.com/ckan/ckan/commit/f03a2d13839f49563b12d63180f345ee32008389
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

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

  Log Message:
  -----------
  pep8 fixes for tests


  Commit: d660edb8c3e9c362818f7360a59ef10c99869523
      https://github.com/ckan/ckan/commit/d660edb8c3e9c362818f7360a59ef10c99869523
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

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

  Log Message:
  -----------
  [#1556] Change 'Popular Tags' to sentence case


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

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

  Log Message:
  -----------
  Merge pull request #1558 from ckan/1556-popular-tags

[#1556] Change 'Popular Tags' to sentence case


  Commit: 6f20147b2138db1db95732c84d7ebdf19bae81f2
      https://github.com/ckan/ckan/commit/6f20147b2138db1db95732c84d7ebdf19bae81f2
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  Fixes extraneous "Logo" test in alt and title attributes as described in #1540


  Commit: 403d4267775d9c571e44ff449c647ee3b64b8231
      https://github.com/ckan/ckan/commit/403d4267775d9c571e44ff449c647ee3b64b8231
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-02-27 (Thu, 27 Feb 2014)

  Changed paths:
    M ckan/templates/admin/index.html

  Log Message:
  -----------
  Fixes description in sidebar of ckan-admin


  Commit: 16230468d308b64873b9caad78dc141fd677d795
      https://github.com/ckan/ckan/commit/16230468d308b64873b9caad78dc141fd677d795
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-02-28 (Fri, 28 Feb 2014)

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

  Log Message:
  -----------
  Delete old tests and old helper function


  Commit: 1a22abbe7c66e803ef0e72e6158ce0a572efcb79
      https://github.com/ckan/ckan/commit/1a22abbe7c66e803ef0e72e6158ce0a572efcb79
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-28 (Fri, 28 Feb 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1534] if mimetype is none then fall back to provided mimetype


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1500] Mock pylons context object on paster commands

When calling a paster command, we create and register a Pylons context
object (c), and add to site user to it (c.user and c.auth_user_object).
This ensures that the auth will work in exactly the same way as in a web
request. Otherwise you can find problems like the harvest and DataPusher
incompatibility.

We already did a similar thing registering a MockTranslator for the
thread.


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

  Changed paths:
    M ckan/templates/user/request_reset.html

  Log Message:
  -----------
  [#1508] Add type to input to match styling


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

  Changed paths:
    M ckan/templates/user/request_reset.html

  Log Message:
  -----------
  Merge branch '1508-oversized-forgot-password-button'


  Commit: af65d2a13df64860ae18126ffabf0e157e3f808f
      https://github.com/ckan/ckan/commit/af65d2a13df64860ae18126ffabf0e157e3f808f
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  Merge pull request #1561 from ckan/1540-fix-logo-alt-text

Fixes extraneous "Logo" test in alt and title attributes


  Commit: 4e77c3ad5cce1a9b2c28f71f346466add4db7bda
      https://github.com/ckan/ckan/commit/4e77c3ad5cce1a9b2c28f71f346466add4db7bda
  Author: amercader <amercadero at gmail.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M doc/maintaining/filestore.rst

  Log Message:
  -----------
  [#1571] Add note about custom mimetypes


  Commit: 81d2302e3d9ddaaebca62eddac9cf7569fa4ae7c
      https://github.com/ckan/ckan/commit/81d2302e3d9ddaaebca62eddac9cf7569fa4ae7c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M ckan/templates/admin/index.html

  Log Message:
  -----------
  Merge branch '1546-fix-sysadmin-text'


  Commit: 0b366c207932f21a08d6cf3d4a5ec0faa3d588b6
      https://github.com/ckan/ckan/commit/0b366c207932f21a08d6cf3d4a5ec0faa3d588b6
  Author: Ian Ward <ian at excess.org>
  Date:   2014-03-05 (Wed, 05 Mar 2014)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1507-current-package-list'


  Commit: 546f80881e14b992a03c52e940cdea0c84ed10c6
      https://github.com/ckan/ckan/commit/546f80881e14b992a03c52e940cdea0c84ed10c6
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

  Changed paths:
    M .travis.yml
    M .tx/config
    M bin/travis-install-dependencies
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/model/license.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/templates/admin/index.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/user/request_reset.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M doc/contributing/documentation.rst
    M doc/extensions/testing-extensions.rst
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1502-remove-logged-in-flash-message


  Commit: 5997ecf47e2acee48b9cf2d712d538c19e48714c
      https://github.com/ckan/ckan/commit/5997ecf47e2acee48b9cf2d712d538c19e48714c
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

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

  Log Message:
  -----------
  [#1502] Delete breaking asserts


  Commit: 7588f45183f6fef98bad70152be821191186cfd0
      https://github.com/ckan/ckan/commit/7588f45183f6fef98bad70152be821191186cfd0
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

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

  Log Message:
  -----------
  Merge pull request #1502 from ckan/1502-remove-logged-in-flash-message

"{User} has been logged in" flash message is pointless


  Commit: 73bb2578c9ad912fae391836c865b70d289acafc
      https://github.com/ckan/ckan/commit/73bb2578c9ad912fae391836c865b70d289acafc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  Fix bug: Sysadmin factory creates two users


  Commit: 21d434e17b1ea943921f5a19bf650df6bcc85f77
      https://github.com/ckan/ckan/commit/21d434e17b1ea943921f5a19bf650df6bcc85f77
  Author: Ian Ward <ian at excess.org>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#1583] don't replace action functions with calls to get_action


  Commit: c054d3be7aba38d5bfa98d1d52baa7c04efbae17
      https://github.com/ckan/ckan/commit/c054d3be7aba38d5bfa98d1d52baa7c04efbae17
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  [#1584] Don't lowercase names of uploaded files


  Commit: fdfc4cffa1812da2ce853c294c3c2069074a9e82
      https://github.com/ckan/ckan/commit/fdfc4cffa1812da2ce853c294c3c2069074a9e82
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #1500 from ckan/1500-mock-web-request-on-paster-commands

datapusher and harvester collision


  Commit: b1e78752484dffe54d41d3e35316436659dce541
      https://github.com/ckan/ckan/commit/b1e78752484dffe54d41d3e35316436659dce541
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M doc/conf.py
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #1482 from ckan/1377-javascript-tutorial

1377 javascript tutorial


  Commit: 49d1306789eaa16f863469752c27034ab0e4d6b8
      https://github.com/ckan/ckan/commit/49d1306789eaa16f863469752c27034ab0e4d6b8
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M ckan/new_tests/factories.py

  Log Message:
  -----------
  Merge pull request #1582 from ckan/bug-sysadmin-factory-creates-two-users

[#1582] Sysadmin factory creates two users


  Commit: a499b3472e27c7ece3a739c88ac553478a7c3ecb
      https://github.com/ckan/ckan/commit/a499b3472e27c7ece3a739c88ac553478a7c3ecb
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge pull request #1397 from ckan/1374-datastore-use-temp-table

1374 Fix Datastore loading/startup bug


  Commit: cd85bff7032fccb44b29ddefbc2e9adfc1317cba
      https://github.com/ckan/ckan/commit/cd85bff7032fccb44b29ddefbc2e9adfc1317cba
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M .travis.yml
    M .tx/config
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M bin/travis-install-dependencies
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/model/license.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/templates/admin/index.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/user/request_reset.html
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M doc/conf.py
    M doc/contributing/documentation.rst
    M doc/extensions/testing-extensions.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/maintaining/datastore.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M setup.py

  Log Message:
  -----------
  fix basic merge conflicts


  Commit: fc1edfd27fa2d5d598a225d4ef234a3664bfeeec
      https://github.com/ckan/ckan/commit/fc1edfd27fa2d5d598a225d4ef234a3664bfeeec
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html

  Log Message:
  -----------
  Merge branch '1301-template-blocks'


  Commit: 05cfeedcc9dcd7ae3dbbebc7b2041272baa76d90
      https://github.com/ckan/ckan/commit/05cfeedcc9dcd7ae3dbbebc7b2041272baa76d90
  Author: Ian Ward <ian at excess.org>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M README.rst
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M bin/travis-install-dependencies
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.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/custom-fields.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/appendices/solr-multicore.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    M doc/conf.py
    R doc/configuration.rst
    M doc/contents.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/release-process.rst
    A doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/email-notifications.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/getting-started.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    M doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M doc/theming/templates.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into fix-package-schema-revision_id


  Commit: 4753adc9718d09ab5cd5e0e81ee3bbca001773c5
      https://github.com/ckan/ckan/commit/4753adc9718d09ab5cd5e0e81ee3bbca001773c5
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M README.rst
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M bin/travis-install-dependencies
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.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/custom-fields.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/appendices/solr-multicore.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    M doc/conf.py
    R doc/configuration.rst
    M doc/contents.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/release-process.rst
    A doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/email-notifications.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/getting-started.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    M doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M doc/theming/templates.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  fix merge issue


  Commit: 5c76e7867207e880b197ce032c2092315a9d5c25
      https://github.com/ckan/ckan/commit/5c76e7867207e880b197ce032c2092315a9d5c25
  Author: RouxRC <b.ooghe at gmail.com>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M ckan/controllers/revision.py

  Log Message:
  -----------
  Add missing controller to fix broken rss links


  Commit: 248a2cc2d63377e7cf5688fa922bad871cd82f1a
      https://github.com/ckan/ckan/commit/248a2cc2d63377e7cf5688fa922bad871cd82f1a
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M ckan/controllers/revision.py

  Log Message:
  -----------
  Merge pull request #1589 from regardscitoyens/pr-fix-rss-links

Fix broken links in RSS feed


  Commit: 09645d1c98f6285619d746edb9279fb2cc5ee4b8
      https://github.com/ckan/ckan/commit/09645d1c98f6285619d746edb9279fb2cc5ee4b8
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M ckan/controllers/revision.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  Merge branch 'master' into fix-package-schema-revision_id


  Commit: 36513ad1e44b3fe044efb47e3e18395bce995e77
      https://github.com/ckan/ckan/commit/36513ad1e44b3fe044efb47e3e18395bce995e77
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/lib/helpers.py
    M ckan/logic/validators.py
    M ckan/templates/package/snippets/resource_form.html
    M doc/configuration.rst

  Log Message:
  -----------
  [#1350] change format of input file and fix some typos


  Commit: f295486e0d6f6d27c772b09bf3c3c502f93ef1dd
      https://github.com/ckan/ckan/commit/f295486e0d6f6d27c772b09bf3c3c502f93ef1dd
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/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/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/accept.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/vendor/jquery.ui.core.js
    A ckan/public/base/vendor/jquery.ui.mouse.js
    A ckan/public/base/vendor/jquery.ui.sortable.js
    M ckan/public/base/vendor/jquery.ui.widget.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/about.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/layout1.html
    M ckan/templates/home/layout2.html
    M ckan/templates/home/layout3.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/edit_base.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_schema_version.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_coding_standards.py
    R ckan_deb/DEBIAN/control.template
    R ckan_deb/usr/bin/ckan-create-instance
    R ckan_deb/usr/bin/ckan-instance-maintenance
    R ckan_deb/usr/bin/ckan-setup-solr
    R ckan_deb/usr/lib/ckan/common.sh
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    R ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v4.py
    A ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_theme/__init__.py
    A ckanext/example_theme/custom_config_setting/__init__.py
    A ckanext/example_theme/custom_config_setting/plugin.py
    A ckanext/example_theme/custom_config_setting/templates/home/layout1.html
    A ckanext/example_theme/custom_config_setting/templates/snippets
    A ckanext/example_theme/v01_empty_extension/__init__.py
    A ckanext/example_theme/v01_empty_extension/plugin.py
    A ckanext/example_theme/v02_empty_template/__init__.py
    A ckanext/example_theme/v02_empty_template/plugin.py
    A ckanext/example_theme/v02_empty_template/templates/home/index.html
    A ckanext/example_theme/v03_jinja/__init__.py
    A ckanext/example_theme/v03_jinja/plugin.py
    A ckanext/example_theme/v03_jinja/templates/home/index.html
    A ckanext/example_theme/v04_ckan_extends/__init__.py
    A ckanext/example_theme/v04_ckan_extends/plugin.py
    A ckanext/example_theme/v04_ckan_extends/templates/home/index.html
    A ckanext/example_theme/v05_block/__init__.py
    A ckanext/example_theme/v05_block/plugin.py
    A ckanext/example_theme/v05_block/templates/home/layout1.html
    A ckanext/example_theme/v06_super/__init__.py
    A ckanext/example_theme/v06_super/plugin.py
    A ckanext/example_theme/v06_super/templates/home/layout1.html
    A ckanext/example_theme/v07_helper_function/__init__.py
    A ckanext/example_theme/v07_helper_function/plugin.py
    A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v08_custom_helper_function/__init__.py
    A ckanext/example_theme/v08_custom_helper_function/plugin.py
    A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    A ckanext/example_theme/v09_snippet/__init__.py
    A ckanext/example_theme/v09_snippet/plugin.py
    A ckanext/example_theme/v09_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/__init__.py
    A ckanext/example_theme/v10_custom_snippet/plugin.py
    A ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
    A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
    A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
    A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
    A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v12_extra_public_dir/__init__.py
    A ckanext/example_theme/v12_extra_public_dir/plugin.py
    A ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
    A ckanext/example_theme/v12_extra_public_dir/templates/home/snippets/promoted.html
    A ckanext/example_theme/v12_extra_public_dir/templates/snippets
    A ckanext/example_theme/v13_custom_css/__init__.py
    A ckanext/example_theme/v13_custom_css/plugin.py
    A ckanext/example_theme/v13_custom_css/public/example_theme.css
    A ckanext/example_theme/v13_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v13_custom_css/templates/base.html
    A ckanext/example_theme/v13_custom_css/templates/home
    A ckanext/example_theme/v13_custom_css/templates/snippets
    A ckanext/example_theme/v14_more_custom_css/__init__.py
    A ckanext/example_theme/v14_more_custom_css/plugin.py
    A ckanext/example_theme/v14_more_custom_css/public/example_theme.css
    A ckanext/example_theme/v14_more_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v14_more_custom_css/templates
    A ckanext/example_theme/v15_fanstatic/__init__.py
    A ckanext/example_theme/v15_fanstatic/fanstatic/example_theme.css
    A ckanext/example_theme/v15_fanstatic/plugin.py
    A ckanext/example_theme/v15_fanstatic/public/promoted-image.jpg
    A ckanext/example_theme/v15_fanstatic/templates/base.html
    A ckanext/example_theme/v15_fanstatic/templates/home
    A ckanext/example_theme/v15_fanstatic/templates/snippets
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html

  Log Message:
  -----------
  [#1350] merge conflicts


  Commit: 82c6b071281601f7671d133cf5d0c02ea5edab9b
      https://github.com/ckan/ckan/commit/82c6b071281601f7671d133cf5d0c02ea5edab9b
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #1534 from ckan/1534-fix-none-mimetype

Can't download resources with geojson extension


  Commit: b0769693af387540f344389b31896727131059a9
      https://github.com/ckan/ckan/commit/b0769693af387540f344389b31896727131059a9
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M doc/maintaining/filestore.rst

  Log Message:
  -----------
  Merge pull request #1571 from ckan/1571-docs-mimetypes-and-tweaks

Add mention about custom mimetypes in docs


  Commit: c241483798aee79ab3f38cd5737d1cb9aae1af44
      https://github.com/ckan/ckan/commit/c241483798aee79ab3f38cd5737d1cb9aae1af44
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M ckan/config/resource_formats.json

  Log Message:
  -----------
  [#1350]  Fix typos and add geojson type


  Commit: 3e16411bdf9ab07f93f86a0195cc9abdc8a905ae
      https://github.com/ckan/ckan/commit/3e16411bdf9ab07f93f86a0195cc9abdc8a905ae
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M ckan/controllers/package.py
    M doc/maintaining/filestore.rst

  Log Message:
  -----------
  Merge branch 'master' into 1350-resource-format-change


  Commit: d06cfbe35caeed15db8e9e611fe6d3ff81942e0e
      https://github.com/ckan/ckan/commit/d06cfbe35caeed15db8e9e611fe6d3ff81942e0e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M README.rst
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M bin/travis-install-dependencies
    M ckan/__init__.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/appendices/solr-multicore.rst
    R doc/apps-ideas.rst
    R doc/authorization.rst
    R doc/background-tasks.rst
    M doc/conf.py
    R doc/configuration.rst
    M doc/contents.rst
    M doc/contributing/architecture.rst
    M doc/contributing/documentation.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/contributing/release-process.rst
    A doc/contributing/test.rst
    M doc/contributing/upgrading-dependencies.rst
    R doc/data-viewer.rst
    R doc/datastore.rst
    R doc/deployment.rst
    R doc/email-notifications.rst
    M doc/extensions/index.rst
    M doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst
    R doc/features.rst
    R doc/filestore.rst
    R doc/form-integration.rst
    R doc/getting-started.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/index.rst
    R doc/install-from-package.rst
    R doc/install-from-source.rst
    R doc/installing.rst
    R doc/legacy-api.rst
    R doc/linked-data-and-rdf.rst
    A doc/maintaining/apps-ideas.rst
    A doc/maintaining/authorization.rst
    A doc/maintaining/background-tasks.rst
    A doc/maintaining/configuration.rst
    A doc/maintaining/data-viewer.rst
    A doc/maintaining/datastore.rst
    A doc/maintaining/email-notifications.rst
    A doc/maintaining/filestore.rst
    A doc/maintaining/form-integration.rst
    A doc/maintaining/getting-started.rst
    A doc/maintaining/index.rst
    A doc/maintaining/installing/deployment.rst
    A doc/maintaining/installing/index.rst
    A doc/maintaining/installing/install-from-package.rst
    A doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/linked-data-and-rdf.rst
    A doc/maintaining/multilingual.rst
    A doc/maintaining/paster.rst
    A doc/maintaining/solr-multicore.rst
    A doc/maintaining/stats.rst
    A doc/maintaining/tag-vocabularies.rst
    A doc/maintaining/tracking.rst
    A doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
    A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    A doc/maintaining/upgrading/upgrade-source.rst
    R doc/multilingual.rst
    R doc/paster.rst
    R doc/stats.rst
    M doc/sysadmin-guide.rst
    R doc/tag-vocabularies.rst
    R doc/test.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M doc/theming/templates.rst
    R doc/tracking.rst
    R doc/upgrade-package-ckan-1-to-2.rst
    R doc/upgrade-package-to-minor-release.rst
    R doc/upgrade-package-to-patch-release.rst
    R doc/upgrade-source.rst
    R doc/upgrading.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1330-hide-activity-stream

Conflicts:
	ckan/logic/action/get.py
	ckanext/textpreview/tests/test_preview.py


  Commit: edb771e17e842fd422e8e6d4fd2f52acb32d0c24
      https://github.com/ckan/ckan/commit/edb771e17e842fd422e8e6d4fd2f52acb32d0c24
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/action/get.py
    M ckan/model/user.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch '1330-hide-activity-stream'


  Commit: 690a21ee961752058254f118ed9c64f3d34f8d24
      https://github.com/ckan/ckan/commit/690a21ee961752058254f118ed9c64f3d34f8d24
  Author: Rishi Verma <riverma at gmail.com>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Update paster.rst

Added tip on using 'sudo' to overcome permission denied error when invoking 'paster db clean ..'.


  Commit: 018923948da08c10c4473926ae692e597d2daa71
      https://github.com/ckan/ckan/commit/018923948da08c10c4473926ae692e597d2daa71
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  [#1609] extra blocks broke facets, add another with block to fix


  Commit: b7d15314b0c6acf2cb87fd64c882103adca23bf5
      https://github.com/ckan/ckan/commit/b7d15314b0c6acf2cb87fd64c882103adca23bf5
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  Merge pull request #1584 from ckan/1584-dont-lowercase-names-of-uploaded-files

Don't lowercase the names of uploaded files


  Commit: e78413e25fef4285280a460964672098e830071d
      https://github.com/ckan/ckan/commit/e78413e25fef4285280a460964672098e830071d
  Author: kindly <kindly at gmail.com>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Merge pull request #1583 from wardi/dont-replace-action-functions

don't replace action functions with calls to get_action


  Commit: aebc52ca8bf9e4384b6171478923e19b178012a6
      https://github.com/ckan/ckan/commit/aebc52ca8bf9e4384b6171478923e19b178012a6
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-03-21 (Fri, 21 Mar 2014)

  Changed paths:
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  Merge pull request #1609 from ckan/1609-facets-not-showing

[#1609] Fix Regression on facets


  Commit: 32c1153a8c6ce06baa59ab4508ff780e7a82946b
      https://github.com/ckan/ckan/commit/32c1153a8c6ce06baa59ab4508ff780e7a82946b
  Author: Mika Wahlroos <mika.wahlroos at csc.fi>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1419] Move URL locality checking to helpers

This allows the function to be also used for similar purposes outside
the user controller.

Also rename the function to be more descriptive in this general
setting.


  Commit: 6c99806708194447d69fc4f4d16bc70340055f66
      https://github.com/ckan/ckan/commit/6c99806708194447d69fc4f4d16bc70340055f66
  Author: Mika Wahlroos <mika.wahlroos at csc.fi>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M ckan/controllers/util.py

  Log Message:
  -----------
  [#1419] Check that redirection target is local


  Commit: e18a24dbaf4570c611dfaf29025b1016646a3af0
      https://github.com/ckan/ckan/commit/e18a24dbaf4570c611dfaf29025b1016646a3af0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_resource_search.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1350] Added uniqueness constraint to mimetypes to avoid ambiguity.


  Commit: 7587c6e8fe49c809ef7357b6f88496bd06ac93b9
      https://github.com/ckan/ckan/commit/7587c6e8fe49c809ef7357b6f88496bd06ac93b9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    A ckan/config/resource_formats.json
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/resource.py
    M ckan/new_tests/logic/test_validators.py
    M ckan/templates/package/snippets/resource_form.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/lib/test_resource_search.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge pull request #1350 from ckan/1350-resource-format-change

[#1350] Resource format not guessed automatically


  Commit: 43d42dede2a376b0d65afb850b49065708d4f257
      https://github.com/ckan/ckan/commit/43d42dede2a376b0d65afb850b49065708d4f257
  Author: Mika Wahlroos <mika.wahlroos at csc.fi>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M ckan/controllers/util.py

  Log Message:
  -----------
  [#1419] Abort with 403 when attempting external redirect


  Commit: e6c567c3918972feb0484967a0ee03551415787f
      https://github.com/ckan/ckan/commit/e6c567c3918972feb0484967a0ee03551415787f
  Author: Samuele Santi <redshadow at hackzine.org>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Now installing *.json files from configuration too

Otherwise, ``resource_formats.json`` wouldn't get installed by ``pip install``, causing this kind of issues: http://paste.pound-python.org/show/OlykESJdUBcEw3SgJ7aA/


  Commit: 92b5fea9a5c7c54367bac4fc55fa6338a18f6e81
      https://github.com/ckan/ckan/commit/92b5fea9a5c7c54367bac4fc55fa6338a18f6e81
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ckan/controllers/util.py
    M ckan/lib/helpers.py
    A ckan/new_tests/controllers/test_util.py

  Log Message:
  -----------
  [#1419] Better status for when no param supplied. Added test.


  Commit: a97c90bfc5f134391c2dc3a8ee39ad24185a6abb
      https://github.com/ckan/ckan/commit/a97c90bfc5f134391c2dc3a8ee39ad24185a6abb
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/lib/helpers.py
    A ckan/new_tests/controllers/test_util.py

  Log Message:
  -----------
  Merge branch 'pr/1613'


  Commit: 894a3c46906da9d7a2445c0eb79d4edc353a6c9e
      https://github.com/ckan/ckan/commit/894a3c46906da9d7a2445c0eb79d4edc353a6c9e
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Merge pull request #1618 from rshk/patch-1

Now installing *.json files from configuration too


  Commit: 0be7c69fbf100df7f641dc0affe69be07a11b751
      https://github.com/ckan/ckan/commit/0be7c69fbf100df7f641dc0affe69be07a11b751
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

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

  Log Message:
  -----------
  [#1332] Not sure it is a flavour unique to CKAN - just said HTML is stripped. Added link example.


  Commit: 0aedc7273cacb15830181d2a044682a3d04c6551
      https://github.com/ckan/ckan/commit/0aedc7273cacb15830181d2a044682a3d04c6551
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

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

  Log Message:
  -----------
  Merge branch '1332-markdown'


  Commit: f5475e4a43e39eac7420ce0aaee3cdd5f98869c0
      https://github.com/ckan/ckan/commit/f5475e4a43e39eac7420ce0aaee3cdd5f98869c0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ckan/new_tests/controllers/test_util.py

  Log Message:
  -----------
  [#1332] Fix bad import in test.


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

  Changed paths:
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'riverma/patch-1' into 1607-paster-doc


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

  Changed paths:
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Move the docs to Troubleshooting

Fixes #1607


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

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

  Log Message:
  -----------
  [#1576] Change api doc url to new one


  Commit: e7775a3c8a68c1621c86d972a509383af3c236cf
      https://github.com/ckan/ckan/commit/e7775a3c8a68c1621c86d972a509383af3c236cf
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

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

  Log Message:
  -----------
  Merge pull request #1621 from ckan/1576-api-link

[#1576] Change api doc url to new one


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

  Changed paths:
    M doc/images/manage_users.jpg
    M doc/sysadmin-guide.rst

  Log Message:
  -----------
  [#1602] Fix sysadmin guide adding that the users can be deleted since 2.2

The feature was added in 7c60ba4.


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

  Changed paths:
    M doc/sysadmin-guide.rst

  Log Message:
  -----------
  [#1602] The link to manage users is named "Manage", not "Edit"


  Commit: 5825ecc27a3d41607e37c97af8b10037b828c816
      https://github.com/ckan/ckan/commit/5825ecc27a3d41607e37c97af8b10037b828c816
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M doc/contributing/index.rst
    A doc/contributing/simple-code-contributions.rst

  Log Message:
  -----------
  [#1564] Add beginner contribution docs on 'Good for Contribution'


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

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1503-two-licenses


Compare: https://github.com/ckan/ckan/compare/9e8c5b1d2726...8156fe272574


More information about the ckan-changes mailing list