[ckan-changes] [ckan/ckan] 1e7b07: First work on theming docs and example

GitHub noreply at github.com
Fri Apr 11 20:58:36 UTC 2014


  Branch: refs/heads/1386-improve-factories
  Home:   https://github.com/ckan/ckan
  Commit: 1e7b07bb9624e975f88715a00388f84db74d4da3
      https://github.com/ckan/ckan/commit/1e7b07bb9624e975f88715a00388f84db74d4da3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    A ckanext/example_theme/__init__.py
    A ckanext/example_theme/plugin.py
    M doc/theming.rst
    M setup.py

  Log Message:
  -----------
  First work on theming docs and example


  Commit: 9a70373bdaa2626ba1a0f476fc1b6fc1f06c5764
      https://github.com/ckan/ckan/commit/9a70373bdaa2626ba1a0f476fc1b6fc1f06c5764
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Add a TODO


  Commit: 524a187af87e2e7d0102bceb8b47c83ab706291e
      https://github.com/ckan/ckan/commit/524a187af87e2e7d0102bceb8b47c83ab706291e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

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

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

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


  Commit: 1fce2cc1d499c3cb5421732b08c3ee518ca18be9
      https://github.com/ckan/ckan/commit/1fce2cc1d499c3cb5421732b08c3ee518ca18be9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    R ckanext/example_theme/plugin.py
    A ckanext/example_theme/v1/__init__.py
    A ckanext/example_theme/v1/plugin.py
    A ckanext/example_theme/v2/__init__.py
    A ckanext/example_theme/v2/plugin.py
    A ckanext/example_theme/v2/templates/home/index.html
    A ckanext/example_theme/v3/__init__.py
    A ckanext/example_theme/v3/plugin.py
    A ckanext/example_theme/v3/templates/home/index.html
    A ckanext/example_theme/v4/__init__.py
    A ckanext/example_theme/v4/plugin.py
    A ckanext/example_theme/v4/templates/home/index.html
    A ckanext/example_theme/v6/__init__.py
    A ckanext/example_theme/v6/plugin.py
    A ckanext/example_theme/v6/templates/home/index.html
    A ckanext/example_theme/v7/__init__.py
    A ckanext/example_theme/v7/plugin.py
    A ckanext/example_theme/v7/templates/home/index.html
    A ckanext/example_theme/v8/__init__.py
    A ckanext/example_theme/v8/plugin.py
    A ckanext/example_theme/v8/templates/home/index.html
    A ckanext/example_theme/v9/__init__.py
    A ckanext/example_theme/v9/plugin.py
    A ckanext/example_theme/v9/templates/home/index.html
    A ckanext/example_theme/v9/templates/snippets/example_theme_dataset_of_the_day.html
    A doc/template-helper-functions.rst
    M doc/theming.rst
    M setup.py

  Log Message:
  -----------
  [#847] More work on the new theming docs

Completed first draft of most of the templates stuff.
Still needs a lot of work.


  Commit: decc420532ffadfb55c6cc3116eaf89916c96e1b
      https://github.com/ckan/ckan/commit/decc420532ffadfb55c6cc3116eaf89916c96e1b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/model/activity.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/snippets/activity_item.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/python-coding-standards.rst
    A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs


  Commit: 751871f467b84b41918fc7ae0c79f96d755c8239
      https://github.com/ckan/ckan/commit/751871f467b84b41918fc7ae0c79f96d755c8239
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Remove a TODO that doesn't belong


  Commit: 0cbea1d1e35aa310a7aad724e97838791234c8dc
      https://github.com/ckan/ckan/commit/0cbea1d1e35aa310a7aad724e97838791234c8dc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Docs: add ckanext-example_theme Sphinx substitution


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

  Changed paths:
    M ckanext/example_theme/v2/plugin.py

  Log Message:
  -----------
  [#847] example_theme plugin_v2 tweaks

Comments, add a missing import


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

  Changed paths:
    M ckanext/example_theme/v7/plugin.py

  Log Message:
  -----------
  [#847] example_theme plugin_v7 tweaks

Comments, etc.


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

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Lots of theming docs tweaks

Use substitutions for lots of things, and also lots of text tweaks, new
stuff about how to find out which template a page uses, global
variables, etc.


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

  Changed paths:
    A ckanext/example_theme/v5/templates/home/index.html

  Log Message:
  -----------
  [#847] Add templating {{ super() }} example


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

  Changed paths:
    R ckanext/example_theme/v1/__init__.py
    R ckanext/example_theme/v1/plugin.py
    A ckanext/example_theme/v1_empty_extension/__init__.py
    A ckanext/example_theme/v1_empty_extension/plugin.py
    R ckanext/example_theme/v2/__init__.py
    R ckanext/example_theme/v2/plugin.py
    R ckanext/example_theme/v2/templates/home/index.html
    A ckanext/example_theme/v2_empty_template/__init__.py
    A ckanext/example_theme/v2_empty_template/plugin.py
    A ckanext/example_theme/v2_empty_template/templates/home/index.html
    R ckanext/example_theme/v3/__init__.py
    R ckanext/example_theme/v3/plugin.py
    R ckanext/example_theme/v3/templates/home/index.html
    A ckanext/example_theme/v3_ckan_extends/__init__.py
    A ckanext/example_theme/v3_ckan_extends/plugin.py
    A ckanext/example_theme/v3_ckan_extends/templates/home/index.html
    R ckanext/example_theme/v4/__init__.py
    R ckanext/example_theme/v4/plugin.py
    R ckanext/example_theme/v4/templates/home/index.html
    A ckanext/example_theme/v4_block/__init__.py
    A ckanext/example_theme/v4_block/plugin.py
    A ckanext/example_theme/v4_block/templates/home/index.html
    R ckanext/example_theme/v5/templates/home/index.html
    A ckanext/example_theme/v5_super/__init__.py
    A ckanext/example_theme/v5_super/plugin.py
    A ckanext/example_theme/v5_super/templates/home/index.html
    R ckanext/example_theme/v6/__init__.py
    R ckanext/example_theme/v6/plugin.py
    R ckanext/example_theme/v6/templates/home/index.html
    A ckanext/example_theme/v6_helper_function/__init__.py
    A ckanext/example_theme/v6_helper_function/plugin.py
    A ckanext/example_theme/v6_helper_function/templates/home/index.html
    R ckanext/example_theme/v7/__init__.py
    R ckanext/example_theme/v7/plugin.py
    R ckanext/example_theme/v7/templates/home/index.html
    A ckanext/example_theme/v7_custom_helper_function/__init__.py
    A ckanext/example_theme/v7_custom_helper_function/plugin.py
    A ckanext/example_theme/v7_custom_helper_function/templates/home/index.html
    R ckanext/example_theme/v8/__init__.py
    R ckanext/example_theme/v8/plugin.py
    R ckanext/example_theme/v8/templates/home/index.html
    A ckanext/example_theme/v8_snippet/__init__.py
    A ckanext/example_theme/v8_snippet/plugin.py
    A ckanext/example_theme/v8_snippet/templates/home/index.html
    R ckanext/example_theme/v9/__init__.py
    R ckanext/example_theme/v9/plugin.py
    R ckanext/example_theme/v9/templates/home/index.html
    R ckanext/example_theme/v9/templates/snippets/example_theme_dataset_of_the_day.html
    A ckanext/example_theme/v9_custom_snippet/__init__.py
    A ckanext/example_theme/v9_custom_snippet/plugin.py
    A ckanext/example_theme/v9_custom_snippet/templates/home/index.html
    A ckanext/example_theme/v9_custom_snippet/templates/snippets/example_theme_dataset_of_the_day.html
    M doc/theming.rst
    M setup.py

  Log Message:
  -----------
  [#847] Rename all the theming example dirs

This just makes it a little easier to keep track of which example is
which


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

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Add missing templates_dir substitution


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

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    M doc/theming.rst
    R doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs

Conflicts:
	setup.py


  Commit: 655d56fbcfc19abd0a343ed590506ec50a191ab0
      https://github.com/ckan/ckan/commit/655d56fbcfc19abd0a343ed590506ec50a191ab0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckanext/example_theme/v8_snippet/templates/home/index.html

  Log Message:
  -----------
  [#847] Tweak a theming example


  Commit: d6abcde76efde9659f88a518ebe5b8db9a0eefe5
      https://github.com/ckan/ckan/commit/d6abcde76efde9659f88a518ebe5b8db9a0eefe5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckanext/example_theme/v9_custom_snippet/templates/home/index.html
    M ckanext/example_theme/v9_custom_snippet/templates/snippets/example_theme_dataset_of_the_day.html
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Improve custom snippet example


  Commit: 7de4aac693b77bb89e8b0a4590858cb1a40c5609
      https://github.com/ckan/ckan/commit/7de4aac693b77bb89e8b0a4590858cb1a40c5609
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Correct a couple of typos


  Commit: a56c231fef21f6aee297af356da378ace568f2fc
      https://github.com/ckan/ckan/commit/a56c231fef21f6aee297af356da378ace568f2fc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Tweak warning about snippet overriding


  Commit: f8fe2d84c28776c61f0d9b15bd71f259f03258dc
      https://github.com/ckan/ckan/commit/f8fe2d84c28776c61f0d9b15bd71f259f03258dc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Add note about snippet filenames


  Commit: 30653190c8146cd995385d5a55517589de95f324
      https://github.com/ckan/ckan/commit/30653190c8146cd995385d5a55517589de95f324
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Correct note about snippets and global variables


  Commit: 40ef2f95a7cbd5c48a88d8446490f1a4c8bbd12c
      https://github.com/ckan/ckan/commit/40ef2f95a7cbd5c48a88d8446490f1a4c8bbd12c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Add a note to the theming docs


  Commit: 0af3d0df4df9d24b61be5d83adf204911bf34732
      https://github.com/ckan/ckan/commit/0af3d0df4df9d24b61be5d83adf204911bf34732
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M doc/theming.rst
    A doc/theming/variables-and-functions.rst

  Log Message:
  -----------
  [#847] Add basic intro to Jinja

Expressions, tags, and what's available in the  global namespace.


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

  Changed paths:
    M ckanext/example_theme/v8_snippet/templates/home/index.html
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Clarify about variables passed into snippets


  Commit: 389f65d66324a03c8fff7414105c0f686da1459b
      https://github.com/ckan/ckan/commit/389f65d66324a03c8fff7414105c0f686da1459b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Add a TODO


  Commit: 855418f2097802e9ddc4e2ba4986e64dfcef9d38
      https://github.com/ckan/ckan/commit/855418f2097802e9ddc4e2ba4986e64dfcef9d38
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M ckanext/example_theme/v7_custom_helper_function/plugin.py
    M ckanext/example_theme/v7_custom_helper_function/templates/home/index.html
    M ckanext/example_theme/v8_snippet/templates/home/index.html
    M ckanext/example_theme/v9_custom_snippet/templates/home/index.html
    R ckanext/example_theme/v9_custom_snippet/templates/snippets/example_theme_dataset_of_the_day.html
    A ckanext/example_theme/v9_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Change dataset of the day example to most popular groups

Change the dataset of the day example in the theming docs to a most
popular groups example.


  Commit: 19057c75ecc938864c2f14a51244bb4557cbb885
      https://github.com/ckan/ckan/commit/19057c75ecc938864c2f14a51244bb4557cbb885
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Update a Sphinx reference


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#847] Add limit param to recently_changed_packages_activity_list template helper function


  Commit: 0745c0ead2729d10a8786d88b75d4ab8ce81a3b9
      https://github.com/ckan/ckan/commit/0745c0ead2729d10a8786d88b75d4ab8ce81a3b9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    A ckanext/example_theme/v10_HTML_and_CSS/__init__.py
    A ckanext/example_theme/v10_HTML_and_CSS/plugin.py
    A ckanext/example_theme/v10_HTML_and_CSS/templates/home/index.html
    A ckanext/example_theme/v10_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    M doc/theming.rst
    M setup.py

  Log Message:
  -----------
  [#847] Add an HTML and CSS example to the theming tutorial

Also remove a duplicated section about global template variables.


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

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Remove a duplicated section from theming docs


  Commit: 96aee947eb28a16edc9a375132539ef692f65c9d
      https://github.com/ckan/ckan/commit/96aee947eb28a16edc9a375132539ef692f65c9d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.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/update.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.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/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs


  Commit: 068d0e06de48e0e0863ad32cc65557fb34b30cdd
      https://github.com/ckan/ckan/commit/068d0e06de48e0e0863ad32cc65557fb34b30cdd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/logic/action/create.py
    M ckan/logic/validators.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.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/homepage.less
    M ckan/templates/admin/config.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/logic/test_action.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/i18n.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs


  Commit: 3c7f6c8e4048cb6dddb34263aabd58e41934e27d
      https://github.com/ckan/ckan/commit/3c7f6c8e4048cb6dddb34263aabd58e41934e27d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/templates/home/snippets/promoted.html
    A ckanext/example_theme/v11_extra_public_directory/__init__.py
    A ckanext/example_theme/v11_extra_public_directory/plugin.py
    A ckanext/example_theme/v11_extra_public_directory/public/promoted-image.jpg
    A ckanext/example_theme/v11_extra_public_directory/templates/home/index.html
    A ckanext/example_theme/v11_extra_public_directory/templates/home/snippets/promoted.html
    A ckanext/example_theme/v11_extra_public_directory/templates/snippets
    M doc/theming.rst
    M setup.py

  Log Message:
  -----------
  [#847] Add extra_public_paths example


  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: 8c0e6341e45ac40c488b5cecb3807073091a5447
      https://github.com/ckan/ckan/commit/8c0e6341e45ac40c488b5cecb3807073091a5447
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/plugins/interfaces.py
    R doc/ckan-coding-standards.rst
    M doc/configuration.rst
    R doc/contributing.rst
    A doc/contributing/coding-standards/ckan-code-architecture.rst
    A doc/contributing/coding-standards/css-coding-standards.rst
    A doc/contributing/coding-standards/database-migrations.rst
    A doc/contributing/coding-standards/html-coding-standards.rst
    A doc/contributing/coding-standards/index.rst
    A doc/contributing/coding-standards/javascript-coding-standards.rst
    A doc/contributing/coding-standards/python-coding-standards.rst
    A doc/contributing/coding-standards/testing-coding-standards.rst
    A doc/contributing/coding-standards/upgrading-dependencies.rst
    A doc/contributing/documentation-guidelines.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/i18n.rst
    A doc/contributing/index.rst
    A doc/contributing/issues.rst
    A doc/contributing/pull-requests.rst
    R doc/css-coding-standards.rst
    R doc/documentation-guidelines.rst
    M doc/extensions/best-practices.rst
    R doc/frontend-development.rst
    R doc/html-coding-standards.rst
    R doc/i18n.rst
    M doc/index.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/resources.rst
    R doc/template-blocks.rst
    R doc/template-tutorial.rst
    R doc/templating.rst
    R doc/testing-coding-standards.rst
    R doc/upgrading-dependencies.rst

  Log Message:
  -----------
  Reorganize the contributing docs


  Commit: 08ce5224f029aedfb4892ff998ac481e13ae9b94
      https://github.com/ckan/ckan/commit/08ce5224f029aedfb4892ff998ac481e13ae9b94
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    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
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    A ckan/lib/uploader.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/schema.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/new_tests/helpers.py
    M ckan/plugins/core.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
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/base.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/read_base.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    A ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/resources.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/package/snippets/resource_help.html
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/facet_list.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/user/edit_user_form.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    A ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M dev-requirements.txt
    A doc/_static/ckanlogo.png
    M doc/_themes/sphinx-theme-okfn
    M doc/authorization.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/images/ckan_logo_box.png
    M doc/index.rst
    M doc/legacy-api.rst
    M doc/test.rst
    M doc/upgrade-source.rst
    A doc/upgrading-dependencies.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs

Conflicts:
	setup.py


  Commit: 9beb8cb18b528bc0caba609db72368bf1d29b1f0
      https://github.com/ckan/ckan/commit/9beb8cb18b528bc0caba609db72368bf1d29b1f0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#847] Add draft Fanstatic tutorial


  Commit: d9873cd68339f72304ee97fffcb6694bc2942fc6
      https://github.com/ckan/ckan/commit/d9873cd68339f72304ee97fffcb6694bc2942fc6
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

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

  Log Message:
  -----------
  [#1255] make package_search results match package_show


  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: 356ee3981ef914242eaf0e201206811f38cf9f0a
      https://github.com/ckan/ckan/commit/356ee3981ef914242eaf0e201206811f38cf9f0a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    A ckanext/example_theme/v12_custom_css/__init__.py
    A ckanext/example_theme/v12_custom_css/plugin.py
    A ckanext/example_theme/v12_custom_css/public/example_theme.css
    A ckanext/example_theme/v12_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v12_custom_css/templates/base.html
    A ckanext/example_theme/v12_custom_css/templates/home
    A ckanext/example_theme/v12_custom_css/templates/snippets
    A ckanext/example_theme/v13_more_custom_css/__init__.py
    A ckanext/example_theme/v13_more_custom_css/plugin.py
    A ckanext/example_theme/v13_more_custom_css/public/example_theme.css
    A ckanext/example_theme/v13_more_custom_css/public/promoted-image.jpg
    A ckanext/example_theme/v13_more_custom_css/templates
    M doc/theming.rst
    M setup.py

  Log Message:
  -----------
  [#847] Add extensions CSS tutorial


  Commit: 542a72d547642f529bad5bc8b8bc0a4d8cd5b9ca
      https://github.com/ckan/ckan/commit/542a72d547642f529bad5bc8b8bc0a4d8cd5b9ca
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs


  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: 983bb024157e2846465a568623055da7fb06e9cf
      https://github.com/ckan/ckan/commit/983bb024157e2846465a568623055da7fb06e9cf
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    A ckanext/example_theme/v14_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v14_initialize_a_javascript_module/fanstatic/favorite.js
    A ckanext/example_theme/v14_initialize_a_javascript_module/plugin.py
    A ckanext/example_theme/v14_initialize_a_javascript_module/templates/home/index.html
    A ckanext/example_theme/v14_initialize_a_javascript_module/templates/snippets/package_item.html
    M doc/theming.rst
    M setup.py

  Log Message:
  -----------
  [#847] Add draft of first JavaScript tutorial


  Commit: ea7b28ad93c75c6944cb4a6992a196789f4a9c4c
      https://github.com/ckan/ckan/commit/ea7b28ad93c75c6944cb4a6992a196789f4a9c4c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs


  Commit: 9c4387e187384a53952e5a2deecd49b9b9a79d9f
      https://github.com/ckan/ckan/commit/9c4387e187384a53952e5a2deecd49b9b9a79d9f
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

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

  Log Message:
  -----------
  [#1255] package_search: add use_default_schema parameter


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M doc/conf.py
    M doc/configuration.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    R doc/template-helper-functions.rst
    R doc/theming.rst
    A doc/theming/css.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/templates.rst
    M doc/upgrade-package-ckan-1-to-2.rst

  Log Message:
  -----------
  [#847] Break up theming tutorial into multiple pages


  Commit: 4266fdc396908a27b7b38433e684615c8bbc9cb1
      https://github.com/ckan/ckan/commit/4266fdc396908a27b7b38433e684615c8bbc9cb1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#847] Fix Sphinx errors in helpers.py


  Commit: 0420072bed0fccad0237392398f6960e6ea610a0
      https://github.com/ckan/ckan/commit/0420072bed0fccad0237392398f6960e6ea610a0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M doc/api.rst
    M doc/background-tasks.rst
    M doc/conf.py
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/getting-started.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
    A doc/images/create_organization.jpg
    A doc/images/customize_look_and_feel.jpg
    A doc/images/edit_dataset.jpg
    A doc/images/exploring_datasets.jpg
    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/move_dataset_between_organizations.jpg
    A doc/images/register_account.jpg
    A doc/images/search_the_site.jpg
    M doc/index.rst
    A doc/sysadmin-guide.rst
    A doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs


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

  Changed paths:
    M doc/theming/index.rst

  Log Message:
  -----------
  [#847] Typo


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

  Changed paths:
    M doc/theming/index.rst

  Log Message:
  -----------
  [#847] Add pre-reqs to theming tutorial


  Commit: 86b794e4fca3c593400ac3d2c6de1421b5ef3645
      https://github.com/ckan/ckan/commit/86b794e4fca3c593400ac3d2c6de1421b5ef3645
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M doc/theming/substitutions.rst

  Log Message:
  -----------
  [#847] Fix a broken comment


  Commit: 6da32416be0c10e3959ec6ed759b08945c55e9fb
      https://github.com/ckan/ckan/commit/6da32416be0c10e3959ec6ed759b08945c55e9fb
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

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

  Log Message:
  -----------
  [#1255] package_show: add use_default_schema parameter


  Commit: d12617fa9f5eda4d5c7c9eba8a339f7930d74b6b
      https://github.com/ckan/ckan/commit/d12617fa9f5eda4d5c7c9eba8a339f7930d74b6b
  Author: Ian Ward <ian at excess.org>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#1255] add changelog entry


  Commit: caa5c4cbc482869c4da69faad2f335d6e554760d
      https://github.com/ckan/ckan/commit/caa5c4cbc482869c4da69faad2f335d6e554760d
  Author: Samuele Santi <redshadow at hackzine.org>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

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

  Log Message:
  -----------
  pep8 cleanup in ckan/logic/action -- __init__.py and create.py


  Commit: a128a9c7e70ad6a787c6cf4ea080a63c06f6b214
      https://github.com/ckan/ckan/commit/a128a9c7e70ad6a787c6cf4ea080a63c06f6b214
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    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/index.html
    A ckanext/example_theme/v06_super/plugin.py
    A ckanext/example_theme/v06_super/templates/home/index.html
    A ckanext/example_theme/v07_helper_function/plugin.py
    A ckanext/example_theme/v07_helper_function/templates/home/index.html
    A ckanext/example_theme/v08_custom_helper_function/plugin.py
    A ckanext/example_theme/v08_custom_helper_function/templates/home/index.html
    A ckanext/example_theme/v09_snippet/plugin.py
    A ckanext/example_theme/v09_snippet/templates/home/index.html
    R ckanext/example_theme/v10_HTML_and_CSS/__init__.py
    R ckanext/example_theme/v10_HTML_and_CSS/plugin.py
    R ckanext/example_theme/v10_HTML_and_CSS/templates/home/index.html
    R ckanext/example_theme/v10_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v10_custom_snippet/plugin.py
    A ckanext/example_theme/v10_custom_snippet/templates/home/index.html
    A ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v11_HTML_and_CSS/plugin.py
    A ckanext/example_theme/v11_HTML_and_CSS/templates/home/index.html
    A ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    R ckanext/example_theme/v11_extra_public_directory/__init__.py
    R ckanext/example_theme/v11_extra_public_directory/plugin.py
    R ckanext/example_theme/v11_extra_public_directory/public/promoted-image.jpg
    R ckanext/example_theme/v11_extra_public_directory/templates/home/index.html
    R ckanext/example_theme/v11_extra_public_directory/templates/home/snippets/promoted.html
    R ckanext/example_theme/v11_extra_public_directory/templates/snippets
    R ckanext/example_theme/v12_custom_css/__init__.py
    R ckanext/example_theme/v12_custom_css/plugin.py
    R ckanext/example_theme/v12_custom_css/public/example_theme.css
    R ckanext/example_theme/v12_custom_css/public/promoted-image.jpg
    R ckanext/example_theme/v12_custom_css/templates/base.html
    R ckanext/example_theme/v12_custom_css/templates/home
    R ckanext/example_theme/v12_custom_css/templates/snippets
    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/index.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/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
    R ckanext/example_theme/v13_more_custom_css/__init__.py
    R ckanext/example_theme/v13_more_custom_css/plugin.py
    R ckanext/example_theme/v13_more_custom_css/public/example_theme.css
    R ckanext/example_theme/v13_more_custom_css/public/promoted-image.jpg
    R ckanext/example_theme/v13_more_custom_css/templates
    R ckanext/example_theme/v14_initialize_a_javascript_module/__init__.py
    R ckanext/example_theme/v14_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v14_initialize_a_javascript_module/plugin.py
    R ckanext/example_theme/v14_initialize_a_javascript_module/templates/home/index.html
    R ckanext/example_theme/v14_initialize_a_javascript_module/templates/snippets/package_item.html
    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_initialize_a_javascript_module/fanstatic/favorite.js
    A ckanext/example_theme/v15_initialize_a_javascript_module/plugin.py
    A ckanext/example_theme/v15_initialize_a_javascript_module/public
    A ckanext/example_theme/v15_initialize_a_javascript_module/templates/home/index.html
    A ckanext/example_theme/v15_initialize_a_javascript_module/templates/snippets/package_item.html
    R ckanext/example_theme/v1_empty_extension/__init__.py
    R ckanext/example_theme/v1_empty_extension/plugin.py
    R ckanext/example_theme/v2_empty_template/__init__.py
    R ckanext/example_theme/v2_empty_template/plugin.py
    R ckanext/example_theme/v2_empty_template/templates/home/index.html
    R ckanext/example_theme/v3_ckan_extends/__init__.py
    R ckanext/example_theme/v3_ckan_extends/plugin.py
    R ckanext/example_theme/v3_ckan_extends/templates/home/index.html
    R ckanext/example_theme/v4_block/__init__.py
    R ckanext/example_theme/v4_block/plugin.py
    R ckanext/example_theme/v4_block/templates/home/index.html
    R ckanext/example_theme/v5_super/__init__.py
    R ckanext/example_theme/v5_super/plugin.py
    R ckanext/example_theme/v5_super/templates/home/index.html
    R ckanext/example_theme/v6_helper_function/__init__.py
    R ckanext/example_theme/v6_helper_function/plugin.py
    R ckanext/example_theme/v6_helper_function/templates/home/index.html
    R ckanext/example_theme/v7_custom_helper_function/__init__.py
    R ckanext/example_theme/v7_custom_helper_function/plugin.py
    R ckanext/example_theme/v7_custom_helper_function/templates/home/index.html
    R ckanext/example_theme/v8_snippet/__init__.py
    R ckanext/example_theme/v8_snippet/plugin.py
    R ckanext/example_theme/v8_snippet/templates/home/index.html
    R ckanext/example_theme/v9_custom_snippet/__init__.py
    R ckanext/example_theme/v9_custom_snippet/plugin.py
    R ckanext/example_theme/v9_custom_snippet/templates/home/index.html
    R ckanext/example_theme/v9_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A doc/images/debug-footer.png
    M doc/theming/css.rst
    M doc/theming/javascript.rst
    M doc/theming/static-files.rst
    M doc/theming/substitutions.rst
    M doc/theming/templates.rst
    M setup.py

  Log Message:
  -----------
  [#847] Begin cleaning up theming tutorial

Some of the examples still need to be updated to reflect changes in master.

* Rename the various example_theme extensions with a leading 0, e.g.
  v01_empty_extension etc.

* Add v03_jinja, this example was previously inline in the docs, move into
  a working and testable extension, update the docs to include it.

  Note that this means all the following versions of the example extension
  are renamed, as their version numbers are bumped.

* Update setup.py.

* css.rst: Update literalinclude's.

* static-files.rst: Update literalinclude's and images.

* templates.rst, substitutions.rst: Update literalinclude's, various tweaks
  and improvements. Add screenshot of debug footer.


  Commit: a9836f6d45035a4ecf8c7a0b24109917da2568fe
      https://github.com/ckan/ckan/commit/a9836f6d45035a4ecf8c7a0b24109917da2568fe
  Author: Samuele Santi <redshadow at hackzine.org>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

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

  Log Message:
  -----------
  More pep8 clenaup on ckan/logic/action/get.py (mostly whitespace)


  Commit: 3d5c715cd1d16b7ea01306691023b150ddfbe700
      https://github.com/ckan/ckan/commit/3d5c715cd1d16b7ea01306691023b150ddfbe700
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M ckan/templates/home/layout1.html
    M ckan/templates/home/layout2.html
    M ckan/templates/home/layout3.html

  Log Message:
  -----------
  [#847] Add Jinja blocks to homepage layouts


  Commit: 6e97fbce270b42394a245abae84c27df53d9d7f1
      https://github.com/ckan/ckan/commit/6e97fbce270b42394a245abae84c27df53d9d7f1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    R ckanext/example_theme/v05_block/templates/home/index.html
    A ckanext/example_theme/v05_block/templates/home/layout1.html
    M doc/theming/substitutions.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Update template blocks example


  Commit: c5cfc08da3768664b6f8af2140c8fee0c99346d9
      https://github.com/ckan/ckan/commit/c5cfc08da3768664b6f8af2140c8fee0c99346d9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    A ckanext/example_theme/v06_super/__init__.py
    R ckanext/example_theme/v06_super/templates/home/index.html
    A ckanext/example_theme/v06_super/templates/home/layout1.html
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Update {{ super() }} example in docs


  Commit: e19a1d3d08243ac2d9356f38316c3ee186c52af2
      https://github.com/ckan/ckan/commit/e19a1d3d08243ac2d9356f38316c3ee186c52af2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    A ckanext/example_theme/v07_helper_function/__init__.py
    R ckanext/example_theme/v07_helper_function/templates/home/index.html
    A ckanext/example_theme/v07_helper_function/templates/home/layout1.html
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Update template helper function example


  Commit: d9251161a99ef7f6251058aa5ffcf18288c2d59c
      https://github.com/ckan/ckan/commit/d9251161a99ef7f6251058aa5ffcf18288c2d59c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    A ckanext/example_theme/v08_custom_helper_function/__init__.py
    R ckanext/example_theme/v08_custom_helper_function/templates/home/index.html
    A ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Update custom helper function example


  Commit: d64c746ed3222f9fbfd4242b25a6eee3f6208073
      https://github.com/ckan/ckan/commit/d64c746ed3222f9fbfd4242b25a6eee3f6208073
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M doc/sysadmin-guide.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  Add note about front page layouts to theming docs


  Commit: 9a0b71b05dbcb093566adff13c0751a845cbc130
      https://github.com/ckan/ckan/commit/9a0b71b05dbcb093566adff13c0751a845cbc130
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    A ckanext/example_theme/v09_snippet/__init__.py
    R ckanext/example_theme/v09_snippet/templates/home/index.html
    A ckanext/example_theme/v09_snippet/templates/home/layout1.html
    M doc/theming/index.rst
    A doc/theming/template-snippets.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Update template snippets example


  Commit: cacb1335fd6122756f302c429ab2295fa01342d7
      https://github.com/ckan/ckan/commit/cacb1335fd6122756f302c429ab2295fa01342d7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M ckan/controllers/home.py
    A ckanext/example_theme/v10_custom_snippet/__init__.py
    R ckanext/example_theme/v10_custom_snippet/templates/home/index.html
    A 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 doc/theming/templates.rst
    M doc/theming/variables-and-functions.rst

  Log Message:
  -----------
  [#847] Update custom snippet example


  Commit: e98dfc782759937d4d854046a1320b13e9892226
      https://github.com/ckan/ckan/commit/e98dfc782759937d4d854046a1320b13e9892226
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

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

  Log Message:
  -----------
  [#847] Add beginning of theming best practices page


  Commit: 9c9dda616fd16999fc60035b422c7792f4dd5bb7
      https://github.com/ckan/ckan/commit/9c9dda616fd16999fc60035b422c7792f4dd5bb7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M ckanext/example_theme/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    A ckanext/example_theme/v11_HTML_and_CSS/__init__.py
    R ckanext/example_theme/v11_HTML_and_CSS/templates/home/index.html
    A ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
    M ckanext/example_theme/v11_HTML_and_CSS/templates/snippets/example_theme_most_popular_groups.html
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Update HTML tags and CSS classes example


  Commit: ca43d01f97e715525e026c294280e5bfcc5297f3
      https://github.com/ckan/ckan/commit/ca43d01f97e715525e026c294280e5bfcc5297f3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Delete a couple of TODOs


  Commit: 8faaab1a268a589721a6975d0cd6b06e51c2f30d
      https://github.com/ckan/ckan/commit/8faaab1a268a589721a6975d0cd6b06e51c2f30d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M bin/travis-install-dependencies
    M ckan/public/base/javascript/main.js
    A doc/appendices/index.rst
    A doc/appendices/solr-multicore.rst
    M doc/conf.py
    A doc/contents.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    R doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs

Conflicts:
	doc/index.rst


  Commit: f366ba684340adbb903b78bc5beb871069a6a0c2
      https://github.com/ckan/ckan/commit/f366ba684340adbb903b78bc5beb871069a6a0c2
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

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

  Log Message:
  -----------
  [#1188] Allow organization dropdown to be displayed

The current logic was unclear. If a user belongs to at least one
organization, the dropdown will be displayed, both on the created and
edit forms. Same for the visibility one.


  Commit: 275b8ed942316d0eec0b478bac4cd161314e5046
      https://github.com/ckan/ckan/commit/275b8ed942316d0eec0b478bac4cd161314e5046
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    A ckanext/example_theme/v12_extra_public_dir/__init__.py
    R ckanext/example_theme/v12_extra_public_dir/templates/home/index.html
    A ckanext/example_theme/v12_extra_public_dir/templates/home/layout1.html
    M doc/theming/static-files.rst

  Log Message:
  -----------
  [#847] Update static files example


  Commit: 18529da2507e3544e08fe34150fb43ee0733a43c
      https://github.com/ckan/ckan/commit/18529da2507e3544e08fe34150fb43ee0733a43c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M doc/contents.rst

  Log Message:
  -----------
  [#847] Add user guide and sysadmin guide back into toc


  Commit: 2d2b12f2d7bb4d622e0ab49b575076c25061ac8c
      https://github.com/ckan/ckan/commit/2d2b12f2d7bb4d622e0ab49b575076c25061ac8c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    A ckanext/example_theme/v13_custom_css/__init__.py
    A ckanext/example_theme/v14_more_custom_css/__init__.py
    M doc/theming/css.rst

  Log Message:
  -----------
  [#847] Update theming examples


  Commit: 62fba1241be09e7ff6bd197a79e0c8258a00b357
      https://github.com/ckan/ckan/commit/62fba1241be09e7ff6bd197a79e0c8258a00b357
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1188] Allow empty orgs if datasets can be unowned

If the "create_unowned_dataset" is set to True and you are not a
sysadmin and select the "No organization" option on the dataset form,
you get a validation error.


  Commit: 833536e750c5082866e20f5891741c1813f28c09
      https://github.com/ckan/ckan/commit/833536e750c5082866e20f5891741c1813f28c09
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    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
    R ckanext/example_theme/v15_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v15_initialize_a_javascript_module/plugin.py
    R ckanext/example_theme/v15_initialize_a_javascript_module/public
    R ckanext/example_theme/v15_initialize_a_javascript_module/templates/home/index.html
    R ckanext/example_theme/v15_initialize_a_javascript_module/templates/snippets/package_item.html
    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/theming/fanstatic.rst
    M doc/theming/index.rst
    M setup.py

  Log Message:
  -----------
  [#847] Add Fanstatic tutorial


  Commit: da7e9d8afae5eec54c68a6d67c798d83a429351e
      https://github.com/ckan/ckan/commit/da7e9d8afae5eec54c68a6d67c798d83a429351e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#847] Fix a couple of Sphinx includes


  Commit: 5c3ea40212c62bc9458f7f8593303f794041c20d
      https://github.com/ckan/ckan/commit/5c3ea40212c62bc9458f7f8593303f794041c20d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M doc/theming/javascript.rst

  Log Message:
  -----------
  [#847] Add draft notice to JavaScript tutorial


  Commit: e7324b9c9de3606c70b5f4e3054b0c2e29c80e55
      https://github.com/ckan/ckan/commit/e7324b9c9de3606c70b5f4e3054b0c2e29c80e55
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M doc/theming/fanstatic.rst
    M doc/theming/index.rst

  Log Message:
  -----------
  [#847] Move the versionchanged in the theming docs


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

  Changed paths:
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Add note about undefined variables in Jinja


  Commit: 9972390b9c921e131adf734a33e2f87ceea3d3de
      https://github.com/ckan/ckan/commit/9972390b9c921e131adf734a33e2f87ceea3d3de
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Delete a TODO in the docs


  Commit: 0d6a0ec0fe84f4b5d6723a69035d40d8c923e65e
      https://github.com/ckan/ckan/commit/0d6a0ec0fe84f4b5d6723a69035d40d8c923e65e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    M doc/theming/best-practices.rst
    M doc/theming/fanstatic.rst
    M doc/theming/static-files.rst
    M doc/theming/templates.rst
    M doc/theming/variables-and-functions.rst

  Log Message:
  -----------
  [#847] Various tweaks to theming docs


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

  Changed paths:
    M ckanext/example_theme/v07_helper_function/templates/home/layout1.html
    M ckanext/example_theme/v08_custom_helper_function/templates/home/layout1.html
    M ckanext/example_theme/v09_snippet/templates/home/layout1.html
    M ckanext/example_theme/v10_custom_snippet/templates/home/layout1.html
    M ckanext/example_theme/v11_HTML_and_CSS/templates/home/layout1.html
    A doc/images/html_and_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/theming/templates.rst

  Log Message:
  -----------
  [#847] Add screenshots to templating tutorial


  Commit: 0dafeafce30bdb8b1621ade51f80f04c6f2732b8
      https://github.com/ckan/ckan/commit/0dafeafce30bdb8b1621ade51f80f04c6f2732b8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    A doc/images/extra-public-dir.png
    M doc/theming/static-files.rst

  Log Message:
  -----------
  [#847] Add screenshot to static files example


  Commit: 116a9b90a505a2f08197d7059991a2a46fa606d8
      https://github.com/ckan/ckan/commit/116a9b90a505a2f08197d7059991a2a46fa606d8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    A doc/images/custom-css.png
    A doc/images/more-custom-css.png
    M doc/theming/css.rst

  Log Message:
  -----------
  [#847] Add screenshots to CSS tutorial


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

  Changed paths:
    M doc/theming/index.rst

  Log Message:
  -----------
  [#847] Add a seealso to theming docs index


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

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

  Log Message:
  -----------
  [#847] Various theming docs tweaks


  Commit: 19b179252c03b1df0945d14468c11e8fcbe0e6e3
      https://github.com/ckan/ckan/commit/19b179252c03b1df0945d14468c11e8fcbe0e6e3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M MANIFEST.in
    M ckan/controllers/package.py
    M ckan/logic/__init__.py
    M ckan/logic/schema.py
    M ckan/new_authz.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/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less
    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/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/header.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.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_base.html
    M ckan/templates/organization/snippets/organization_form.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/new.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/snippets/organization.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/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 doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs


  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: 53a9ff21b2f3f93dc44b3ec8ef38b94768d84f5d
      https://github.com/ckan/ckan/commit/53a9ff21b2f3f93dc44b3ec8ef38b94768d84f5d
  Author: Samuele Santi <redshadow at hackzine.org>
  Date:   2013-12-06 (Fri, 06 Dec 2013)

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

  Log Message:
  -----------
  Prevent failure in case no record is found (empty database) (fixes #1363)


  Commit: acd7976f67f769483d615d0a77422e59007a086d
      https://github.com/ckan/ckan/commit/acd7976f67f769483d615d0a77422e59007a086d
  Author: Samuele Santi <redshadow at hackzine.org>
  Date:   2013-12-09 (Mon, 09 Dec 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Removed limit of number of arguments passed to ``user add`` command.

This is needed as the ``user add`` command is supposed to accept a variable number
of arguments.


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

  Changed paths:
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/plugin.py
    M ckanext/example_theme/v15_fanstatic/plugin.py

  Log Message:
  -----------
  [#847] PEP-8


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

  Changed paths:
    M CHANGELOG.rst
    M bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    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/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/uploader.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/get.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/less/dataset.less
    M ckan/templates/group/member_new.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/macros/form.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/organization_form.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/snippets/package_list.html
    M ckan/tests/functional/test_package.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/test_coding_standards.py
    M doc/_themes/sphinx-theme-okfn
    M doc/appendices/solr-multicore.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/documentation-guidelines.rst
    M doc/filestore.rst
    M doc/install-from-source.rst
    M doc/release-process.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs


  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: 5ad5b582a9f4126d9f485163c581d4d668dee861
      https://github.com/ckan/ckan/commit/5ad5b582a9f4126d9f485163c581d4d668dee861
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-10 (Tue, 10 Dec 2013)

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

  Log Message:
  -----------
  [#1022] Fix cross-references in API docstrings

Use :py:func:, :py:class: etc to do proper hyperlinked cross-references.

Also a few other minor docstrings formatting fixes.


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

  Changed paths:
    A doc/.gitignore
    M doc/conf.py
    M doc/install-from-package.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  [#1380] Encourage installing latest release in source install docs

Needed an automated way to get the latest version number, so I added
functions to doc/conf.py for this, and then used them in the source and
package install docs.


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

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  [#1380] Remove hardcoded filename


  Commit: e552048dba78f44edd9589c0400eb0561cc0b4b0
      https://github.com/ckan/ckan/commit/e552048dba78f44edd9589c0400eb0561cc0b4b0
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

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

  Log Message:
  -----------
  [#1384] Make the database query in related_list

* We didn't actually do the database query in related_list if we
  didn't pass a dataset. This commit fixes that.
* Share the dictize function for both cases.


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

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.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/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.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/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M 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/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/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/plugins/interfaces.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/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
    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
    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/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.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/package/activity.html
    R ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/new.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_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/snippets/organization.html
    M ckan/templates/snippets/package_list.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/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/test_group.py
    M ckan/tests/functional/test_package.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
    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
    M doc/appendices/solr-multicore.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/contents.rst
    M doc/documentation-guidelines.rst
    M doc/filestore.rst
    M doc/install-from-source.rst
    M doc/release-process.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 1188-fix-org-list-dataset-form


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

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

  Log Message:
  -----------
  Revert "[#1188] Allow organization dropdown to be displayed"

There is certain logic, albeit a bit flacky, in hiding the organization
dropwdown, in that if shown, any user belonging to an organization could
take ownership of any unowned dataset in the instance. We need to
properly define the auth rules and enforce them at the validator level
as well. For the time being, showing the dropdown only to sysadmins
makes sense (and of course fixing the original bug on the visibility
field validator, which is done on the next commit)

This reverts commit f366ba684340adbb903b78bc5beb871069a6a0c2.


  Commit: a8643383e8c19cf42438f1813d2d040e999d36fd
      https://github.com/ckan/ckan/commit/a8643383e8c19cf42438f1813d2d040e999d36fd
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M MANIFEST.in
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    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/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/cli.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/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/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/plugins/interfaces.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/main.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/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less
    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
    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/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.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/package/activity.html
    R ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/new.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_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/snippets/organization.html
    M ckan/templates/snippets/package_list.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/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/test_package.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/test_coding_standards.py
    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
    M doc/api.rst
    A doc/appendices/index.rst
    A doc/appendices/solr-multicore.rst
    M doc/background-tasks.rst
    M doc/conf.py
    M doc/configuration.rst
    A doc/contents.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/deployment.rst
    M doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/getting-started.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
    A doc/images/create_organization.jpg
    A doc/images/customize_look_and_feel.jpg
    A doc/images/edit_dataset.jpg
    A doc/images/exploring_datasets.jpg
    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/move_dataset_between_organizations.jpg
    A doc/images/register_account.jpg
    A doc/images/search_the_site.jpg
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/release-process.rst
    R doc/solr-setup.rst
    A doc/sysadmin-guide.rst
    M doc/test.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst
    A doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' into 1255-better-search-results


  Commit: fb37fc06b5c47ea7e72d87584a6b0a0dd7a94c92
      https://github.com/ckan/ckan/commit/fb37fc06b5c47ea7e72d87584a6b0a0dd7a94c92
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/group.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/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/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/public/base/javascript/modules/image-upload.js
    M ckan/templates/macros/form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/tests/functional/test_group.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
    M doc/configuration.rst
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 1255-better-search-results


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

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

  Log Message:
  -----------
  [#1188] Fix visibility validator

To not rely on owner_org being present, when the validator gets a value
of private and there is no owner_org, we request the dataset anyway and
check if it actually has an owner_org.

Added new validation tests


  Commit: 52d1c1d8086e4c3888ddc936cb109368d77c09e3
      https://github.com/ckan/ckan/commit/52d1c1d8086e4c3888ddc936cb109368d77c09e3
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#1255] fix dictization tests


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/package.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/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.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/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
    A ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    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
    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
    M ckan/public/base/vendor/resource.config
    M ckan/templates/group/member_new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/read.html
    A ckan/templates/package/group_list.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/resources.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.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
    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
    M doc/configuration.rst
    M doc/documentation-guidelines.rst
    M doc/filestore.rst
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into bug-1363-error-500-api-empty-database


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

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

  Log Message:
  -----------
  Merge branch 'bug-1363-error-500-api-empty-database'


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

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1188] Remove debugger call


  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: 7bd7062ac6b494f221e4157c339a4990b8afb344
      https://github.com/ckan/ckan/commit/7bd7062ac6b494f221e4157c339a4990b8afb344
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  [#1380] Fix some broken hyperlinks in the docs

Stop Sphinx from hyperlinking part of the URL in pip install commands.


  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: 9a75c9f9940198d5aec79cd62dea15de7fd2c34a
      https://github.com/ckan/ckan/commit/9a75c9f9940198d5aec79cd62dea15de7fd2c34a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M ckanext/example_theme/v02_empty_template/plugin.py

  Log Message:
  -----------
  [#847] Add template path explanation


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

  Changed paths:
    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 doc/theming/best-practices.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Refactor a snippet from the theming docs

Also add snippets docstrings to best practices


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

  Changed paths:
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#847] Add note that g is an alias for app_globals


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

  Changed paths:
    M doc/release-process.rst

  Log Message:
  -----------
  [#1389] Tweak release process docs


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

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

  Log Message:
  -----------
  [#1390] Move context definition to prevent exception


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

  Changed paths:
    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 doc/extensions/best-practices.rst
    M doc/extensions/tutorial.rst
    M doc/theming/templates.rst
    M setup.py

  Log Message:
  -----------
  [#847] Add theming custom config setting example


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

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/lib/accept.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/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/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/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
    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
    M ckan/public/base/vendor/resource.config
    M ckan/templates/macros/form.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/snippets/package_basic_fields.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/tests/functional/test_group.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
    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
    M doc/configuration.rst
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs


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

  Changed paths:
    M ckanext/example_iauthfunctions/plugin.py

  Log Message:
  -----------
  [#847] Delete a set_trace()


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

  Changed paths:
    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 doc/extensions/custom-config-settings.rst
    M doc/extensions/index.rst
    M doc/extensions/tutorial.rst
    M doc/theming/templates.rst
    M setup.py

  Log Message:
  -----------
  [#847] Add docs for extensions custom config settings

And example with tests


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

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

  Log Message:
  -----------
  [#1393] user_dictize: return apikey correctly

Was returning email instead of apikey. Fixes #1393


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

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

  Log Message:
  -----------
  [#1393] user_dictize: return apikey correctly

Was returning email instead of apikey. Fixes #1393


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

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

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


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

  Changed paths:
    M ckan/new_tests/factories.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  [#847] Add a factoriy for creating test sysadmins

..and use it in the example_iauthfunctions tests. Also use the normal
user factory in the tests.


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

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

  Log Message:
  -----------
  [#847] Add syntax highlighting to literal includes


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

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

  Log Message:
  -----------
  [#1392] more fixes from awful commit + tests


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

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

  Log Message:
  -----------
  [#1392] pep8 fix


  Commit: 4a89b781c838a86b98a637d09700a3a0f4388afc
      https://github.com/ckan/ckan/commit/4a89b781c838a86b98a637d09700a3a0f4388afc
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

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

  Log Message:
  -----------
  Merge branch '1393-bug-user-create-returns-email-for-api-key'


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

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M bin/travis-install-dependencies
    M bin/travis-run-tests
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.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/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.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/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M 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/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/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
    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/main.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/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less
    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
    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/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.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/package/activity.html
    R ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/new.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_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/snippets/organization.html
    M ckan/templates/snippets/package_list.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/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/test_group.py
    M ckan/tests/functional/test_package.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
    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
    M doc/api.rst
    A doc/appendices/index.rst
    A doc/appendices/solr-multicore.rst
    M doc/background-tasks.rst
    M doc/conf.py
    M doc/configuration.rst
    A doc/contents.rst
    M doc/contributing/coding-standards/testing-coding-standards.rst
    M doc/contributing/documentation-guidelines.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/getting-started.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
    A doc/images/create_organization.jpg
    A doc/images/customize_look_and_feel.jpg
    A doc/images/edit_dataset.jpg
    A doc/images/exploring_datasets.jpg
    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/move_dataset_between_organizations.jpg
    A doc/images/register_account.jpg
    A doc/images/search_the_site.jpg
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/release-process.rst
    R doc/solr-setup.rst
    A doc/sysadmin-guide.rst
    M doc/test.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst
    A doc/user-guide.rst
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into contributing-docs-reorg

Conflicts:
	CONTRIBUTING.rst
	doc/contributing/coding-standards/css-coding-standards.rst
	doc/index.rst


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

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

  Log Message:
  -----------
  Replace example good commit message in docs

The example was not actually a very good example, replace it with a
better one from recent git logs.


  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: 84fc1b8bebd81f1712e03849edaf4440e6ad7d76
      https://github.com/ckan/ckan/commit/84fc1b8bebd81f1712e03849edaf4440e6ad7d76
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M doc/conf.py
    A doc/contributing/architecture.rst
    R doc/contributing/coding-standards/ckan-code-architecture.rst
    R doc/contributing/coding-standards/css-coding-standards.rst
    R doc/contributing/coding-standards/database-migrations.rst
    R doc/contributing/coding-standards/html-coding-standards.rst
    R doc/contributing/coding-standards/index.rst
    R doc/contributing/coding-standards/javascript-coding-standards.rst
    R doc/contributing/coding-standards/python-coding-standards.rst
    R doc/contributing/coding-standards/testing-coding-standards.rst
    R doc/contributing/coding-standards/upgrading-dependencies.rst
    A doc/contributing/commit-messages.rst
    A doc/contributing/css.rst
    A doc/contributing/database-migrations.rst
    R doc/contributing/documentation-guidelines.rst
    A doc/contributing/documentation.rst
    M doc/contributing/frontend/index.rst
    A doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    A doc/contributing/javascript.rst
    M doc/contributing/pull-requests.rst
    A doc/contributing/python.rst
    A doc/contributing/reviewing.rst
    A doc/contributing/testing.rst
    A doc/contributing/upgrading-dependencies.rst
    M doc/extensions/best-practices.rst

  Log Message:
  -----------
  Another contributing docs reorganization

Redorder it all into a single docs/contributing/ subdirectory with one table
of contents and no sub-sub-directories (except for the frontend guidelines one,
which still needs sorting out). This makes it much easier to see what's there
(one main table of contents for all of contributing) and navigate.

Add _CKAN issue tracker hyperlink target to conf.py.

Move commit messages guidelines to their own page.

Move reviewing a pull request guidelines to their own page.

Fix title style of various titles.

A few other small changes


  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: fd53401864661b479c1e4d041e935ee1c240048b
      https://github.com/ckan/ckan/commit/fd53401864661b479c1e4d041e935ee1c240048b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M doc/contributing/documentation.rst

  Log Message:
  -----------
  Fix a Sphinx cross-reference


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

  Changed paths:
    M doc/contributing/documentation.rst

  Log Message:
  -----------
  Add a couple of notes to the documentation guidelines


  Commit: d6ab05be812aca3a52ae56a07f2f9ddb3bfefda1
      https://github.com/ckan/ckan/commit/d6ab05be812aca3a52ae56a07f2f9ddb3bfefda1
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

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

  Log Message:
  -----------
  Merge pull request #1390 from okfn/1390-group_dictize-exception

Exception on group dictize due to 'with_capacity' on context


  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: d2693b834af3516d279827181bb6f0d88d005ad1
      https://github.com/ckan/ckan/commit/d2693b834af3516d279827181bb6f0d88d005ad1
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [#1384] Update related controller to use a list

The controller relied on the output of related_list being a
Query object. Updated them to use the list.


  Commit: f32277034a326867df84082a69fd3d2452a82d3a
      https://github.com/ckan/ckan/commit/f32277034a326867df84082a69fd3d2452a82d3a
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

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

  Log Message:
  -----------
  [#1384] Update tests to deal with list

The tests also relied on related_list being a Query instead of
a list. Updated them and added new asserts.


  Commit: 546caa71b66df2cbcab34bbb50b6ebabab66cdfc
      https://github.com/ckan/ckan/commit/546caa71b66df2cbcab34bbb50b6ebabab66cdfc
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

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

  Log Message:
  -----------
  [#1384] Update documentation for related_list

The related_list function should not need an id or dataset
parameter. We use it ourselves in the related dashboard
without an id or dataset parameter.


  Commit: d621b8b2e7c8064779401343ff1460dfdb36facc
      https://github.com/ckan/ckan/commit/d621b8b2e7c8064779401343ff1460dfdb36facc
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

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

  Log Message:
  -----------
  [#1384] Remove sorted from model_dictize

related_items is already sorted from the database query.
Adding another sorting at the model_dictize level looks
unnecessary and overrides the one from the query.


  Commit: 27831b326959706f8b91b43bff4405ea9171981c
      https://github.com/ckan/ckan/commit/27831b326959706f8b91b43bff4405ea9171981c
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M ckan/controllers/related.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  [#1384] Fix test broken due to sorted change

* Fix the test broken because it expects results from sorted.
* Correct the PEP8 change in related controller.


  Commit: 5b30653d0376f3c6c5043fbdb2d151a8c7c170b9
      https://github.com/ckan/ckan/commit/5b30653d0376f3c6c5043fbdb2d151a8c7c170b9
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M CONTRIBUTING.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/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
    R doc/frontend-development.rst
    R doc/html-coding-standards.rst
    R doc/i18n.rst
    M doc/index.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/resources.rst
    R doc/template-blocks.rst
    R doc/template-tutorial.rst
    R doc/templating.rst
    R doc/testing-coding-standards.rst
    R doc/upgrading-dependencies.rst

  Log Message:
  -----------
  Merge pull request #1324 from okfn/contributing-docs-reorg

Reorganize the contributing docs


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

  Changed paths:
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html

  Log Message:
  -----------
  [#1392] Fixes member add page within groups


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

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

  Log Message:
  -----------
  [#1401] Delete the ckan_deb dir

It just contains a bunch of old scripts that don't work anymore


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

  Changed paths:
    M ckan/controllers/related.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  Merge branch '1384-related-list-503'


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

  Changed paths:
    M doc/theming/css.rst

  Log Message:
  -----------
  [#847] Add some links to some CSS tools


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

  Changed paths:
    M doc/theming/css.rst

  Log Message:
  -----------
  [#847] Remove a todo from the docs


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

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/controllers/related.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/functional/test_related.py
    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/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
    R doc/frontend-development.rst
    R doc/html-coding-standards.rst
    R doc/i18n.rst
    M doc/index.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/resources.rst
    R doc/template-blocks.rst
    R doc/template-tutorial.rst
    R doc/templating.rst
    R doc/testing-coding-standards.rst
    R doc/upgrading-dependencies.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs

Conflicts:
	doc/conf.py


  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: 6905280aa2d9500d9ef3513040a918cbd4df978d
      https://github.com/ckan/ckan/commit/6905280aa2d9500d9ef3513040a918cbd4df978d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/new_tests/factories.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_theme/custom_config_setting/plugin.py

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


  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: 6e4c9103bb2a940c13c7d4c68cb7c1d7d4d0dbf8
      https://github.com/ckan/ckan/commit/6e4c9103bb2a940c13c7d4c68cb7c1d7d4d0dbf8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  [#1409] Fix the e-mail bodies' translation strings

We ended up creating a string with extra whitespace before the paragraphs,
like "...to be reset\n\n Please click the following...".

But the i18n message key doesn't have these whitespaces, so we always send
that in English. To solve it, we could either fix the message key in all .po
files, or change how we construct the string in mailer.py. I prefer the
latter.


  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: b90d2810eeb6acfea39aeaec2215bb12afb7f74a
      https://github.com/ckan/ckan/commit/b90d2810eeb6acfea39aeaec2215bb12afb7f74a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  [#1409] Remove pdb breakpoint


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

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/controllers/home.py
    M ckan/controllers/related.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/plugins/toolkit.py
    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/tests/functional/test_related.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
    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/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
    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/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 setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1389-release-docs-tweaks-2


  Commit: 97855aaf17ee62e030c878c23d871c85c7c37232
      https://github.com/ckan/ckan/commit/97855aaf17ee62e030c878c23d871c85c7c37232
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

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

  Log Message:
  -----------
  Merge pull request #1401 from okfn/1401-delete-ckan_deb-dir

[#1401] Delete ckan_deb dir


  Commit: 9d8454964ea4e79066901cdc16785e5d4c1a63ef
      https://github.com/ckan/ckan/commit/9d8454964ea4e79066901cdc16785e5d4c1a63ef
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  Fix test failures associted with related_list

The related_list dictization changes returned them as returned by
the database. This change gives it a default order if they're not
previously sorted.


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

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1389-release-docs-tweaks-2


  Commit: 254c4990c18de8d3fef5c55ef8fa1f347433a252
      https://github.com/ckan/ckan/commit/254c4990c18de8d3fef5c55ef8fa1f347433a252
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M doc/contributing/index.rst
    A doc/contributing/release-process.rst
    R doc/release-process.rst
    M doc/upgrading.rst

  Log Message:
  -----------
  [#1389] Reorganize the release process docs a little

Put all the stuff that users need to know (what the different types of
release are, and how to upgrade) in /upgrading.html, and put all the
stuff for developers only (how to do a CKAN release) in /contributing/.
Use ..  seealso:: boxes to link the two pages together. Also removed
some duplicated information, fixed some title styles, etc.


  Commit: 5e5a1c5c8b71f016e8a892ed1608728a71fcde4c
      https://github.com/ckan/ckan/commit/5e5a1c5c8b71f016e8a892ed1608728a71fcde4c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M doc/theming/fanstatic.rst

  Log Message:
  -----------
  [#1389] Fix a Sphinx error


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

  Changed paths:
    M doc/contributing/index.rst
    A doc/contributing/release-process.rst
    R doc/release-process.rst
    M doc/theming/fanstatic.rst
    M doc/upgrading.rst

  Log Message:
  -----------
  Merge branch '1389-release-docs-tweaks-2'


  Commit: 46752e562498af4ebe2eb07df71caf3eaf07a51f
      https://github.com/ckan/ckan/commit/46752e562498af4ebe2eb07df71caf3eaf07a51f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M doc/contributing/documentation.rst

  Log Message:
  -----------
  Add a note about seealso boxes in the docs


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

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

  Log Message:
  -----------
  [#1398] Adds: 'word-break: break-word;' for better word breaking on long words


  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: 87fc0807ec5aa7aa5c8a93b744bcf0daa75e2609
      https://github.com/ckan/ckan/commit/87fc0807ec5aa7aa5c8a93b744bcf0daa75e2609
  Author: John Martin <me at johnmart.in>
  Date:   2013-12-24 (Tue, 24 Dec 2013)

  Changed paths:
    M ckan/templates/group/about.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

  Log Message:
  -----------
  [#1302] Removes mentions of 'no description' from templates


  Commit: 46c53d5093ef998337f434da2cf141573002fb72
      https://github.com/ckan/ckan/commit/46c53d5093ef998337f434da2cf141573002fb72
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-01 (Wed, 01 Jan 2014)

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

  Log Message:
  -----------
  [#1360] Update package_update docstring.


  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: bf5b82eab080d9b655b6bf8c6db705281d13ecad
      https://github.com/ckan/ckan/commit/bf5b82eab080d9b655b6bf8c6db705281d13ecad
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-07 (Tue, 07 Jan 2014)

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

  Log Message:
  -----------
  Merge branch '1022-api-docs-improvements'


  Commit: 6ced7cbffaa256ba6d1117012cdb078ecc83191d
      https://github.com/ckan/ckan/commit/6ced7cbffaa256ba6d1117012cdb078ecc83191d
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-07 (Tue, 07 Jan 2014)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/config/who.ini

  Log Message:
  -----------
  [#1422] More secure default for the repoze secret key

The who.ini file has a secret key used during authentication. To make sure
users don't forget to update it we can use the beaker session secret which
is generated randomly when creating the ckan ini file.

If users define a secret in the who.ini file, this one will be used.

To do this, we use a small custom plugin that checks the secret key and
calls the core repoze plugin afterwards.


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1425] Call logic.NotFound


  Commit: 2c9236168f4e64f442d29501e497ab97b29a4fa3
      https://github.com/ckan/ckan/commit/2c9236168f4e64f442d29501e497ab97b29a4fa3
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  Merge branch 'related-list-test-failure'


  Commit: baadd73a116fc6bc14270149cf3300b7a6be5346
      https://github.com/ckan/ckan/commit/baadd73a116fc6bc14270149cf3300b7a6be5346
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

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

  Log Message:
  -----------
  Merge branch '1398-info-overflow-word-break'


  Commit: 0677c8bf9a614c969af23b96537c39c82b92be28
      https://github.com/ckan/ckan/commit/0677c8bf9a614c969af23b96537c39c82b92be28
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

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

  Log Message:
  -----------
  [#1389] Rebuild css after merge


  Commit: cf0fdb8cfb4fcb5331e72b34847c036fa4d9cf9d
      https://github.com/ckan/ckan/commit/cf0fdb8cfb4fcb5331e72b34847c036fa4d9cf9d
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html

  Log Message:
  -----------
  Merge branch '1392-group-member-add-template-fix'


  Commit: 747f2cd24e45aaf0471be1973cf15ebe9feae2d3
      https://github.com/ckan/ckan/commit/747f2cd24e45aaf0471be1973cf15ebe9feae2d3
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

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

  Log Message:
  -----------
  [#1426] Remove duplicated require notice


  Commit: cc2ab8f2773dd0f67691f2bc18269d4c96ab32b9
      https://github.com/ckan/ckan/commit/cc2ab8f2773dd0f67691f2bc18269d4c96ab32b9
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch '1425-exception-fix'


  Commit: 7608b4ce0c2c22c9f55a9de4d250aa648b214e44
      https://github.com/ckan/ckan/commit/7608b4ce0c2c22c9f55a9de4d250aa648b214e44
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge branch 'bug-1375-user-add-command-fix' of github.com:rshk/ckan into rshk-bug-1375-user-add-command-fix


  Commit: 682e8d556c27db837f4269139a1b66691157172a
      https://github.com/ckan/ckan/commit/682e8d556c27db837f4269139a1b66691157172a
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    A doc/.gitignore
    M doc/conf.py
    M doc/install-from-package.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch '1380-encourage-installing-latest-release'


  Commit: f82bd541d2bcc03327fb44ac0a79dc25560aebb8
      https://github.com/ckan/ckan/commit/f82bd541d2bcc03327fb44ac0a79dc25560aebb8
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

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

  Log Message:
  -----------
  Merge branch '1360-update-docstring'

Conflicts:
	ckan/logic/action/update.py


  Commit: d696e975e7cdaddc27bba84519e7926cfa71a6f6
      https://github.com/ckan/ckan/commit/d696e975e7cdaddc27bba84519e7926cfa71a6f6
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/templates/group/about.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

  Log Message:
  -----------
  Merge branch '1302-remove-mentions-of-no-description'


  Commit: 39662c35a1ab89a35e7d73bb0d129a42ac0d3e80
      https://github.com/ckan/ckan/commit/39662c35a1ab89a35e7d73bb0d129a42ac0d3e80
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1188] Tweak checks to support empty strings


  Commit: 6eeb2b1bd0605cc470e4ad742b2dbdedf4d74b79
      https://github.com/ckan/ckan/commit/6eeb2b1bd0605cc470e4ad742b2dbdedf4d74b79
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

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

  Log Message:
  -----------
  [#1421] Ensure that check_access is called on activity_create

Otherwise when disabling the activity streams the action returned before
calling the auth function, which made the auth audit fail


  Commit: 337b5c9b7010f897d622779f508478eb96c879e8
      https://github.com/ckan/ckan/commit/337b5c9b7010f897d622779f508478eb96c879e8
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#1421] Better exception message for auth audit


  Commit: 3a00b572e795e03b915f6250dfed8b83aad768f7
      https://github.com/ckan/ckan/commit/3a00b572e795e03b915f6250dfed8b83aad768f7
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/templates/group/read.html
    M ckan/templates/organization/read.html

  Log Message:
  -----------
  [#1368] Fix dataset ordering on org and group pages

Match dataset ordering options with those on the main search


  Commit: 4bddcd8fe211270f664331b08b676dbc1fa99d9e
      https://github.com/ckan/ckan/commit/4bddcd8fe211270f664331b08b676dbc1fa99d9e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

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

  Log Message:
  -----------
  Merge branch '1188-fix-org-list-dataset-form'


  Commit: 917e4c6d775a9bc92efe4aa205f3a535ed826c12
      https://github.com/ckan/ckan/commit/917e4c6d775a9bc92efe4aa205f3a535ed826c12
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-09 (Thu, 09 Jan 2014)

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

  Log Message:
  -----------
  [#1427] add contitional to allow 0.8 sqlalchemy


  Commit: 116ec3d2533b1bb969ae9bcc37cfc3952851ea5a
      https://github.com/ckan/ckan/commit/116ec3d2533b1bb969ae9bcc37cfc3952851ea5a
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-09 (Thu, 09 Jan 2014)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/config/who.ini

  Log Message:
  -----------
  Merge pull request #1422 from okfn/1422-repoze-key

Use a more secure default for the repoze secret key


  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: ed05bad70c03b3dc79429160ecb6ee5847c704bf
      https://github.com/ckan/ckan/commit/ed05bad70c03b3dc79429160ecb6ee5847c704bf
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-01-14 (Tue, 14 Jan 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  [#1420] Fix group_show by taking schema out of the context when making sub-calls.


  Commit: 2da633fa09b64362aed5d4b22057ae0ad90da452
      https://github.com/ckan/ckan/commit/2da633fa09b64362aed5d4b22057ae0ad90da452
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-19 (Sun, 19 Jan 2014)

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

  Log Message:
  -----------
  [#1437] Instruction to restart apache and nginx


  Commit: edcd180af35acbea50676db4cd7f44c64db24716
      https://github.com/ckan/ckan/commit/edcd180af35acbea50676db4cd7f44c64db24716
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

  Changed paths:
    M ckan/__init__.py
    M doc/conf.py

  Log Message:
  -----------
  Remove mentions to "Comprehensive Knowledge Archive Network"

CKAN stands for CKAN.


  Commit: 56d2857e6bd04ee4a63bf96bac6a5cf278143e25
      https://github.com/ckan/ckan/commit/56d2857e6bd04ee4a63bf96bac6a5cf278143e25
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  [#1409] Change string formatting to use "{foo}".format(foo="bar")


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

  Changed paths:
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst

  Log Message:
  -----------
  Add restart instructions in upgrade docs too


  Commit: 62337405ed21f795f1362e0627e0826a9ab9cfb3
      https://github.com/ckan/ckan/commit/62337405ed21f795f1362e0627e0826a9ab9cfb3
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

  Changed paths:
    M doc/install-from-package.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst

  Log Message:
  -----------
  Merge branch '1437-package-update'


  Commit: c886cb77a110368365f649addb9806c4258a288c
      https://github.com/ckan/ckan/commit/c886cb77a110368365f649addb9806c4258a288c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

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

  Log Message:
  -----------
  Merge branch '1427-sqlalchamy-08-compatability'


  Commit: 47b38e5645b6cc1309d2c933827064756d1e462a
      https://github.com/ckan/ckan/commit/47b38e5645b6cc1309d2c933827064756d1e462a
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

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

  Log Message:
  -----------
  [#1428] Fix superimposing resource items

This was caused by removing the "This resource has no description"
message in #1302.


  Commit: 7f5ec21cb964a7c5948dbae8205a2f421857a0db
      https://github.com/ckan/ckan/commit/7f5ec21cb964a7c5948dbae8205a2f421857a0db
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-21 (Tue, 21 Jan 2014)

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

  Log Message:
  -----------
  Merge pull request #1421 from okfn/1421-activity_create-auth-exception

Disabling activity_streams borks editing groups and user


  Commit: f3c706d41045c92c5e18ddd9893debcbce505459
      https://github.com/ckan/ckan/commit/f3c706d41045c92c5e18ddd9893debcbce505459
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-21 (Tue, 21 Jan 2014)

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

  Log Message:
  -----------
  Merge pull request #1428 from okfn/1428-superimposing-resources

Superimposing resources on dataset page


  Commit: 134bd00fc62c8d4d53dce36a374d904b34afff2c
      https://github.com/ckan/ckan/commit/134bd00fc62c8d4d53dce36a374d904b34afff2c
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-21 (Tue, 21 Jan 2014)

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

  Log Message:
  -----------
  Merge pull request #1426 from okfn/1426-duplicated-required-tag

Duplicated Required Fields notice on Group form


  Commit: 3f0d11b7242bc83daaab65e6473fae524133d2b4
      https://github.com/ckan/ckan/commit/3f0d11b7242bc83daaab65e6473fae524133d2b4
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-21 (Tue, 21 Jan 2014)

  Changed paths:
    M ckan/templates/group/read.html
    M ckan/templates/organization/read.html

  Log Message:
  -----------
  Merge pull request #1368 from okfn/1368-org-datasets-ordering

Default search ordering on organization home page is broken


  Commit: 412fba44ace2bef514f54891afdec897dd702e6e
      https://github.com/ckan/ckan/commit/412fba44ace2bef514f54891afdec897dd702e6e
  Author: Rachel Knowler <rachel.knowler at liip.ch>
  Date:   2014-01-21 (Tue, 21 Jan 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
   Changed license to licenses in facet titles where this makes more sense.


  Commit: 4936c7c2ceb0987f80446ae69128281757f8e69e
      https://github.com/ckan/ckan/commit/4936c7c2ceb0987f80446ae69128281757f8e69e
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-21 (Tue, 21 Jan 2014)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#1429] Pass came_from to login handler after creating a user

Otherwise you lose the language setting for the UI. I'm not entirely
sure but that may involve two redirects.


  Commit: ae5c63a48670611cb04afa75b13a673357a6f132
      https://github.com/ckan/ckan/commit/ae5c63a48670611cb04afa75b13a673357a6f132
  Author: Gael Pasgrimaud <gael at gawel.org>
  Date:   2014-01-21 (Tue, 21 Jan 2014)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  avoid UnicodeEncodeError when params contains non ascii characters


  Commit: cd648de7d085c002475065be1e8ff50ec185251d
      https://github.com/ckan/ckan/commit/cd648de7d085c002475065be1e8ff50ec185251d
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-22 (Wed, 22 Jan 2014)

  Changed paths:
    M ckan/controllers/user.py

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


  Commit: cc2d3545d7ccf8f41a708c64d62bde680d6e9c01
      https://github.com/ckan/ckan/commit/cc2d3545d7ccf8f41a708c64d62bde680d6e9c01
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-22 (Wed, 22 Jan 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch 'ogdch-refer-to-licenses-in-facets-2'


  Commit: 0b0d046a8c25d71ad8e2bc53d7bd65490efb18e4
      https://github.com/ckan/ckan/commit/0b0d046a8c25d71ad8e2bc53d7bd65490efb18e4
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-22 (Wed, 22 Jan 2014)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  Merge branch 'urlencode_error' of github.com:regardscitoyens/ckan into regardscitoyens-urlencode_error


  Commit: c9d05af7b5fc45ad114e373c83ff50814769f8ef
      https://github.com/ckan/ckan/commit/c9d05af7b5fc45ad114e373c83ff50814769f8ef
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-22 (Wed, 22 Jan 2014)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  Merge branch 'regardscitoyens-urlencode_error'


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

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  we need try, except to handle local datastore use

This reverts commit 129aec805528f1cba3c6ac73c7363421d35e38d2.


  Commit: b6b981c07744c1193f82a64c08087d6d934c7d8a
      https://github.com/ckan/ckan/commit/b6b981c07744c1193f82a64c08087d6d934c7d8a
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  [#1446] Require ckan.site_url when using the DataPusher


  Commit: 306c3d84a3d45e845c4206796a681059941f1210
      https://github.com/ckan/ckan/commit/306c3d84a3d45e845c4206796a681059941f1210
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#1433] Flesh out the context for group/about setup_template_variables.


  Commit: 0230587df78bae50288272f78b0a69527335e1fa
      https://github.com/ckan/ckan/commit/0230587df78bae50288272f78b0a69527335e1fa
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

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

  Log Message:
  -----------
  [#1446] Better defaults for DataPusher config options + docs


  Commit: b128ebb1437c4f882be1304feb2020eebddc95a8
      https://github.com/ckan/ckan/commit/b128ebb1437c4f882be1304feb2020eebddc95a8
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

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

  Log Message:
  -----------
  [#1446] Clarify DataPusher issues in docs


  Commit: 853568a023662308113fb1756d606f1c0c4b216c
      https://github.com/ckan/ckan/commit/853568a023662308113fb1756d606f1c0c4b216c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#1446] Remove SQLite urls from template ini file


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

  Changed paths:
    M ckanext/datastore/db.py

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


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  Merge branch '1420-group-view-schema-fix'


  Commit: 1613ed86d45a7694281ba9b161cb5a2c23dc8acf
      https://github.com/ckan/ckan/commit/1613ed86d45a7694281ba9b161cb5a2c23dc8acf
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  [#1446] Enable DataPusher for private datasets

There's no need to prevent the import to the datastore on them, as the
datastore will manage the authorization, and logged in users still
expect these files to get imported to the DataStore.


  Commit: 699dac215996c01afecc93fc062d3a230d8e810e
      https://github.com/ckan/ckan/commit/699dac215996c01afecc93fc062d3a230d8e810e
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  [#1446] Remove misleading datastore warning in docs


  Commit: 6247a8110807c7a9daa92adfb1dcbe0ea46c75f5
      https://github.com/ckan/ckan/commit/6247a8110807c7a9daa92adfb1dcbe0ea46c75f5
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

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

  Log Message:
  -----------
  Recompile main.css (should have been done after #1428 merge)


  Commit: fc60167013fb0e4842514d20d47dfbd728c583fa
      https://github.com/ckan/ckan/commit/fc60167013fb0e4842514d20d47dfbd728c583fa
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge branch 'fix-local-datastore' of github.com:wardi/ckan into wardi-fix-local-datastore


  Commit: 1017a28bc6f45851c2362f1ce498fd2fcd0716c4
      https://github.com/ckan/ckan/commit/1017a28bc6f45851c2362f1ce498fd2fcd0716c4
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge branch 'wardi-fix-local-datastore'


  Commit: e8c8bdaae7109f9255be763ad91205cb2fad04ea
      https://github.com/ckan/ckan/commit/e8c8bdaae7109f9255be763ad91205cb2fad04ea
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datapusher/plugin.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/install-from-package.rst

  Log Message:
  -----------
  Merge pull request #1446 from okfn/1446-datapusher-integration-issues

DataPusher integration issues


  Commit: f9638b4a01b961f5afd6a5658889287a96606b8d
      https://github.com/ckan/ckan/commit/f9638b4a01b961f5afd6a5658889287a96606b8d
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

  Changed paths:
    R ckan/public/base/vendor/jquery.ui.widget.min.js

  Log Message:
  -----------
  [#1450] remove min file as it does not work properly with fanstatic


  Commit: a0b7780bd20298b0c8c26624f1e708fb3e69cada
      https://github.com/ckan/ckan/commit/a0b7780bd20298b0c8c26624f1e708fb3e69cada
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

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

  Log Message:
  -----------
  [#1451] use site url to get callback url for datapusher


  Commit: 558a38cd90d350e731677b3cec8961e9d206cc63
      https://github.com/ckan/ckan/commit/558a38cd90d350e731677b3cec8961e9d206cc63
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

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

  Log Message:
  -----------
  [#1449] Fix extras deletion

The custom-fields module was actually disabling the fields when clicking
the delete extra cross button. This prevented the key and value from
being sent, which caused a validation error.
We now change only the class to make it look disabled, which should be
good enough.


  Commit: d65d22d8c53cd3b8822a21a110bf035aa3db318c
      https://github.com/ckan/ckan/commit/d65d22d8c53cd3b8822a21a110bf035aa3db318c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

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

  Log Message:
  -----------
  [#1452] Fix text preview tests


  Commit: bc9d7fbd2557bf6a2094a01af0bdee7c6d3f0a42
      https://github.com/ckan/ckan/commit/bc9d7fbd2557bf6a2094a01af0bdee7c6d3f0a42
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/validators.py
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  [#1453] remove item for select list if config not set by adding helper and change validator to fail when config is set with empty string


  Commit: 336dfd5304f1a6416dc6ffcd45cd51cf72d594e0
      https://github.com/ckan/ckan/commit/336dfd5304f1a6416dc6ffcd45cd51cf72d594e0
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

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

  Log Message:
  -----------
  Merge pull request #1452 from okfn/1452-textpreview-tests

Text preview tests fail when using production JS scripts


  Commit: b332fe6dea77dc8c072f2b399a32b01db20c4659
      https://github.com/ckan/ckan/commit/b332fe6dea77dc8c072f2b399a32b01db20c4659
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

  Changed paths:
    R ckan/public/base/vendor/jquery.ui.widget.min.js

  Log Message:
  -----------
  Merge branch '1450-resource-reordering-production'


  Commit: 4fa7b5ce666e271f1f6e9f315456a0f1cbe0bce2
      https://github.com/ckan/ckan/commit/4fa7b5ce666e271f1f6e9f315456a0f1cbe0bce2
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/validators.py
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  Merge branch '1453-sysadmins-not-create-unown-datasets'


  Commit: 55959f6d979b94c0082e65396f837258a64924e7
      https://github.com/ckan/ckan/commit/55959f6d979b94c0082e65396f837258a64924e7
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

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

  Log Message:
  -----------
  [#1449] Remove unneeded tests


  Commit: 155fd9bde4009a1500a33efdd3853fbb4e7f0f32
      https://github.com/ckan/ckan/commit/155fd9bde4009a1500a33efdd3853fbb4e7f0f32
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

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

  Log Message:
  -----------
  [#1451] pep8 and a few things to make things a look nicer


  Commit: e7cae2c43076658a6efd59f9c8e115a84a83ebdd
      https://github.com/ckan/ckan/commit/e7cae2c43076658a6efd59f9c8e115a84a83ebdd
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

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

  Log Message:
  -----------
  [#1451] add back in rstrip


  Commit: f9f39eb71fafbc6fd84cd4d0aea0117c88028188
      https://github.com/ckan/ckan/commit/f9f39eb71fafbc6fd84cd4d0aea0117c88028188
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  [#1454] make ie7 fallback to normal dropdown, add logic functions, make sure editor is in member dropdown


  Commit: 515d3c56e18171e76bd988087917ada60aecdd84
      https://github.com/ckan/ckan/commit/515d3c56e18171e76bd988087917ada60aecdd84
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/templates/organization/bulk_process.html

  Log Message:
  -----------
  [#1455] fix bulk editing


  Commit: 82c554fa8f0191a3667696cd31bdcf3c9deb9e03
      https://github.com/ckan/ckan/commit/82c554fa8f0191a3667696cd31bdcf3c9deb9e03
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

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

  Log Message:
  -----------
  [#1452] Fix PEP8


  Commit: 6254fe51c114c1a3bbff132606eb421679b71242
      https://github.com/ckan/ckan/commit/6254fe51c114c1a3bbff132606eb421679b71242
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

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

  Log Message:
  -----------
  Merge pull request #1458 from okfn/1452-textpreview-tests

[#1452] Text Preview fails - Fix PEP8


  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: bb70fc5b29fe550c56d1d9e58fd9b897a009321c
      https://github.com/ckan/ckan/commit/bb70fc5b29fe550c56d1d9e58fd9b897a009321c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

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

  Log Message:
  -----------
  Merge branch '1451-use-site-url-for-datastore-callback'


  Commit: da20b2c4fefdf3ce06571ac24da6c25fabf345fb
      https://github.com/ckan/ckan/commit/da20b2c4fefdf3ce06571ac24da6c25fabf345fb
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/validators.py
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckanext/datapusher/logic/action.py
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  Merge branch 'master' into 1449-cant-delete-extra


  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: 9fdb6957e54313e30c47cfb4a87482770b556c33
      https://github.com/ckan/ckan/commit/9fdb6957e54313e30c47cfb4a87482770b556c33
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

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

  Log Message:
  -----------
  [#1461] remove repeated sort code in package_search


  Commit: da90ffafbbd53c93064ea3020cd3dc362e642df0
      https://github.com/ckan/ckan/commit/da90ffafbbd53c93064ea3020cd3dc362e642df0
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

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

  Log Message:
  -----------
  [#1460]  Change button to input so that ie7 works.  Also needed to change way params are got as value needs to be the thing shown on the input


  Commit: 1cae36c1e627749168627e2ef7da6f03248404b3
      https://github.com/ckan/ckan/commit/1cae36c1e627749168627e2ef7da6f03248404b3
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  Merge branch '1454-member-editing-fixes'


  Commit: afb6ee330544aa0fd0c72892e10848656b7b35a0
      https://github.com/ckan/ckan/commit/afb6ee330544aa0fd0c72892e10848656b7b35a0
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/templates/organization/bulk_process.html

  Log Message:
  -----------
  Merge branch '1455-fix-bulk-editing'


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

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Remove 'Comprehensive...' from docs

CKAN stands for CKAN


  Commit: 9c0737265d067f60aea024c8d7f6434820a56e00
      https://github.com/ckan/ckan/commit/9c0737265d067f60aea024c8d7f6434820a56e00
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

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

  Log Message:
  -----------
  Merge branch '1460-fix-group-remove-ie7'


  Commit: fe00e6cf633d3e0642c77d432fa34cba0ff8dfc6
      https://github.com/ckan/ckan/commit/fe00e6cf633d3e0642c77d432fa34cba0ff8dfc6
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  [#1465] exclude more unlikely cominations


  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: 4acefbaea6a62101bd067331dd3e73e540b57258
      https://github.com/ckan/ckan/commit/4acefbaea6a62101bd067331dd3e73e540b57258
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/templates/organization/snippets/feeds.html

  Log Message:
  -----------
  [1463] Adds organization feeds by re-using a lot of the group feed boilerplate


  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: dfb107e37da91f735c4af4c65b1d1b5a3da3c429
      https://github.com/ckan/ckan/commit/dfb107e37da91f735c4af4c65b1d1b5a3da3c429
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

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

  Log Message:
  -----------
  Merge branch '1461-repeated-code-in-package_search'


  Commit: ed063f144b915cb539fcc4ed8b14ec4cca7eb7aa
      https://github.com/ckan/ckan/commit/ed063f144b915cb539fcc4ed8b14ec4cca7eb7aa
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #1429 from okfn/1429-language-reset-after-register

UI language reset after account creation


  Commit: 687491d637cd747ab9e158a3062814802c82f3e4
      https://github.com/ckan/ckan/commit/687491d637cd747ab9e158a3062814802c82f3e4
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

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

  Log Message:
  -----------
  Merge pull request #1449 from okfn/1449-cant-delete-extra

Can't delete extra


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1433-fix-context'


  Commit: 254fca2d43ccacbe674df2da42aba83897dcdb96
      https://github.com/ckan/ckan/commit/254fca2d43ccacbe674df2da42aba83897dcdb96
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    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
    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:
  -----------
  Big docs reorganization

This is not as big a change as it looks like, because it's taking the way the
docs were already organized by audience and making it explicit by creating
top-level dirs for each audience and moving all the docs into them.
Also cleans up a couple of loose ends where particular files didn't fit into
the organization-based scheme, fit them in. It then has to touch a lot of files
in doc/ to update Sphinx cross-references.

Create 8 top-level directories, one for each different audience:
User guide, sysadmin guide, maintainer's guide, API guide, extending guide,
theming guide, contributing guide and changelog.
(User guide, sysadmin guide and changelog are actually just files, not
directories, because they only need one file each.)

- New overview on docs front page explains the high-level structure

- Added a section to the documentation guidelines explaining the new structure

- Lots of feature pages moved into new maintaining/ dir

- Configuration.rst moved into maintaining/

- getting-started.rst moved into maintaining/

- Move Solr multicore appendix page into maintaining/,
  remove the appendix section itself as no longer needed

- Remove the "Features" index page, no longer needed as the pages just go into
  the "Maintainer's guide" now

- Create doc/maintaining/installing/ subdir and move the installing and
  deployment docs into it

- Create doc/maintaining/upgrading/ subdir and move the upgrading docs into
  it

- Move api.rst and legacy-api.rst into new api/ dir

- Move test.rst into contributing/

- Fix Sphinx references all over the place to point to the new file locations


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

  Changed paths:
    M doc/datastore.rst
    M doc/filestore.rst

  Log Message:
  -----------
  Fix a Sphinx error (broken links)

@kindly


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/logic/action/get.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/templates/group/snippets/group_item.html
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst

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


  Commit: 77d23b0084bdf20c2f10765b6c63a87d7493bc2b
      https://github.com/ckan/ckan/commit/77d23b0084bdf20c2f10765b6c63a87d7493bc2b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  Docs front page text tweaks


  Commit: 41d639f098f07393f1e0613ac35ae5669ff0edf4
      https://github.com/ckan/ckan/commit/41d639f098f07393f1e0613ac35ae5669ff0edf4
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M CHANGELOG.rst
    M README.rst
    M doc/_templates/footer.html
    M doc/background-tasks.rst
    M doc/conf.py
    M doc/contributing/documentation.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/data-viewer.rst
    M doc/extensions/index.rst
    M doc/features.rst
    M doc/install-from-source.rst
    M doc/stats.rst
    M doc/theming/templates.rst
    M doc/tracking.rst

  Log Message:
  -----------
  Correct links to ckan repo


  Commit: 625b51cdb0f1697add59c7e3faf723a48c8e04fd
      https://github.com/ckan/ckan/commit/625b51cdb0f1697add59c7e3faf723a48c8e04fd
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M CHANGELOG.rst
    M README.rst
    M doc/_templates/footer.html
    M doc/background-tasks.rst
    M doc/conf.py
    M doc/contributing/documentation.rst
    M doc/contributing/index.rst
    M doc/contributing/issues.rst
    M doc/data-viewer.rst
    M doc/extensions/index.rst
    M doc/features.rst
    M doc/install-from-source.rst
    M doc/stats.rst
    M doc/theming/templates.rst
    M doc/tracking.rst

  Log Message:
  -----------
  Merge branch 'repo-change'


  Commit: 944d7286e72a1711c77001ca75dc534784a24622
      https://github.com/ckan/ckan/commit/944d7286e72a1711c77001ca75dc534784a24622
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M CHANGELOG.rst
    M README.rst

  Log Message:
  -----------
  Change travis image. Remove coveralls for now


  Commit: e73b580203851436e25bf6cd3c8ef4bd1f75d398
      https://github.com/ckan/ckan/commit/e73b580203851436e25bf6cd3c8ef4bd1f75d398
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M CHANGELOG.rst
    M README.rst

  Log Message:
  -----------
  Merge pull request #1469 from ckan/travis-image-change

Change travis image. Remove coveralls for now


  Commit: d0c7356095b3b710f0164c072a42e5e97953f21d
      https://github.com/ckan/ckan/commit/d0c7356095b3b710f0164c072a42e5e97953f21d
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M ckan/logic/auth/delete.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1470] fix member auth import as breaks auto auth pickup in tests


  Commit: 1353f0b8f7f3606206c9d7983cc0ba2c9ad8652b
      https://github.com/ckan/ckan/commit/1353f0b8f7f3606206c9d7983cc0ba2c9ad8652b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M ckan/logic/auth/delete.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '1470-member-auth-test-fail'


  Commit: a8417e970498e02be56f9b54acaa5d3615960c65
      https://github.com/ckan/ckan/commit/a8417e970498e02be56f9b54acaa5d3615960c65
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1473] allow empty string in owner org when there is no previous package or owner org


  Commit: 49cc5a96bb00ac0a03445c2ac7b5ad796f32dbad
      https://github.com/ckan/ckan/commit/49cc5a96bb00ac0a03445c2ac7b5ad796f32dbad
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

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

  Log Message:
  -----------
  [#1471] Fix dataset deletion authorization for unowned datasets

We are basically deferring the whole package_delete auth function to
package_update, because deletions are basically changing the state field
of a dataset from 'active' to 'deleted'.


  Commit: 2f2dba872933ce1be2f6d59f54d8dcd29f11cdd6
      https://github.com/ckan/ckan/commit/2f2dba872933ce1be2f6d59f54d8dcd29f11cdd6
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  Merge branch '1473-create-unowned-dataset-when-org-member'


  Commit: 677d80a63fc93bfdab50698ed061e14b45f51a10
      https://github.com/ckan/ckan/commit/677d80a63fc93bfdab50698ed061e14b45f51a10
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

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

  Log Message:
  -----------
  [#1471] Call proper function on package_delete


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

  Changed paths:
    M ckan/lib/mailer.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1409-reset-password-email-i18n-bug'


  Commit: af52ce4740d86d92603d695be8998e93526d22a4
      https://github.com/ckan/ckan/commit/af52ce4740d86d92603d695be8998e93526d22a4
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

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

  Log Message:
  -----------
  [#1471] Fix old test

Since organizations were implemented, any unowned dataset can be edited
(and thus deleted) by any user.
We will probably improve this in th future using the creator_user_id


  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: a5d16751321bfce506aaa854a9e766cbb1a97fcc
      https://github.com/ckan/ckan/commit/a5d16751321bfce506aaa854a9e766cbb1a97fcc
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    R .gitmodules
    R doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  Use the default RTD theme. Fixes #1485

[ci skip]


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

  Changed paths:
    M dev-requirements.txt
    M doc/conf.py

  Log Message:
  -----------
  Setup the RTD theme.

[ci skip]


  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: b7cd0c5db240d428585f696b0780af77dd1d14a1
      https://github.com/ckan/ckan/commit/b7cd0c5db240d428585f696b0780af77dd1d14a1
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  Merge branch 'master' into 1471-delete-unowned-datasets


  Commit: 614c1c8761e9ab83b240a70a2725ce8222a76538
      https://github.com/ckan/ckan/commit/614c1c8761e9ab83b240a70a2725ce8222a76538
  Author: kindly <kindly at gmail.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ckan/logic/auth/delete.py
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  Merge branch '1471-delete-unowned-datasets'


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

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Test overriding the context

[ci skip]


  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: 16075d74454dd495e17284124f65e5ccce987c2e
      https://github.com/ckan/ckan/commit/16075d74454dd495e17284124f65e5ccce987c2e
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    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
    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 'docs-reorg'

Conflicts:
	doc/extensions/index.rst
	doc/features.rst

[ci skip]


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

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

  Log Message:
  -----------
  [#1488] Make get_*_object helper functions more robust

When functions like `get_resource_object` got an empty id (eg because of
a bug higher up in the logic layer) they returned a random object (the
most recent one on the DB), causing rally hard to debug bugs.

The functions now raise a ValidationError if an id is not provided.


  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: 91dbd7f287572fcdf00f4dee5fecc88516f4160b
      https://github.com/ckan/ckan/commit/91dbd7f287572fcdf00f4dee5fecc88516f4160b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

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

  Log Message:
  -----------
  [#1488] Fix coding standards test


  Commit: 09c80b28b66da4a39bf91324253ab4b89de6b271
      https://github.com/ckan/ckan/commit/09c80b28b66da4a39bf91324253ab4b89de6b271
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  [#1487] Fix auhtorization in datapusher_hook

We were passing data_dict to the auth function, which didn't contain the
necessary resource_id to perform the auth checks later on. Sadly #1488
was hiding this and the auth check passed or failed randomly


  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: 606430afd677ae27d59d369187adf2933f28bdfc
      https://github.com/ckan/ckan/commit/606430afd677ae27d59d369187adf2933f28bdfc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M CHANGELOG.rst
    M README.rst
    M ckan/config/deployment.ini_tmpl
    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/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.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/auth/delete.py
    M ckan/logic/validators.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/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/datastore/db.py
    M ckanext/textpreview/tests/test_preview.py
    M doc/_templates/footer.html
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/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 remove-ckan-abbreviation-explanations

Conflicts:
	doc/conf.py


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

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Merge branch 'remove-ckan-abbreviation-explanations'


  Commit: 3e37fc957fb07bab5d5f7390f70b4251044820af
      https://github.com/ckan/ckan/commit/3e37fc957fb07bab5d5f7390f70b4251044820af
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

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

  Log Message:
  -----------
  [#1488] Move tests where they will actually get run


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

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

  Log Message:
  -----------
  [#1488] Remove debug junk


  Commit: f49cb0ab8f9736ee556a6a6426b453af4419a8ed
      https://github.com/ckan/ckan/commit/f49cb0ab8f9736ee556a6a6426b453af4419a8ed
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  Merge pull request #1488 from ckan/1488-more-robust-get-object-in-auth

Auth helper function `_get_object` is evil [#1487 + #1488]


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

  Changed paths:
    M doc/_templates/footer.html

  Log Message:
  -----------
  Add the Previous and Next buttons

[ci skip]


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

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

  Log Message:
  -----------
  [#1490] Fox datapusher_hook callback URL

The old implementation didn't work for deployments that were not located
on a non-root location (eg http://someorg.com/ckan). This fixes it and
also allows the action to be run outside of a web request eg from the command
line


  Commit: 2bd5465be5a24f25c7b625e8bb0593258cc03612
      https://github.com/ckan/ckan/commit/2bd5465be5a24f25c7b625e8bb0593258cc03612
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

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

  Log Message:
  -----------
  [#1491] Fix new dataset form and resource pages breadcrumbs


  Commit: 897651c3c5e4564025b399d4642a70bc3e1698f5
      https://github.com/ckan/ckan/commit/897651c3c5e4564025b399d4642a70bc3e1698f5
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update master changelog


  Commit: f341aaf835b0083111c5cfccd45c783c750b71d2
      https://github.com/ckan/ckan/commit/f341aaf835b0083111c5cfccd45c783c750b71d2
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

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

  Log Message:
  -----------
  Merge pull request #1490 from ckan/1490-datapusher_hook-callback-url

Wrong datapusher hook callback URL on non-root deployments


  Commit: 7f0599ce81873c59d4306067e461a175af91568a
      https://github.com/ckan/ckan/commit/7f0599ce81873c59d4306067e461a175af91568a
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Remove html_context (does not work on RTD)

[ci skip]


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

  Changed paths:
    M CHANGELOG.rst
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1491-wrong-breadcrumbs


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

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

  Log Message:
  -----------
  Merge branch '1491-wrong-breadcrumbs'


  Commit: 963e50c1ddf8f58c00330fdd3610e20696525bb3
      https://github.com/ckan/ckan/commit/963e50c1ddf8f58c00330fdd3610e20696525bb3
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Fix version number for master branch


  Commit: 72f55306269a00c5bec72701f0b5978054ed7423
      https://github.com/ckan/ckan/commit/72f55306269a00c5bec72701f0b5978054ed7423
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M ckan/lib/navl/validators.py

  Log Message:
  -----------
  Fix small typo defalult_value -> default_value


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

  Changed paths:
    M CHANGELOG.rst
    M README.rst
    M ckan/__init__.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/validators.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/templates/group/snippets/group_item.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/tests/functional/test_package.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M doc/_templates/footer.html
    R doc/api.rst
    A doc/api/index.rst
    A doc/api/legacy-api.rst
    R doc/appendices/index.rst
    R doc/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' into 1465-travis-half-jobs


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

  Changed paths:
    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
    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
    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 1485-rtd-theme


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

  Changed paths:
    M doc/_templates/footer.html

  Log Message:
  -----------
  Docs theme footer fixes

Wrap it in a <footer> (the theme styles this, e.g. deemphasised text
color), add an <hr> like the theme's default footer has, add back in the
credit line for the theme, tidy up the code formatting.


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

  Changed paths:
    R .gitmodules
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    M doc/conf.py

  Log Message:
  -----------
  Merge branch '1485-rtd-theme'


  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: af4b6a49eed5198149b1d5fd3d1fc37496202b6f
      https://github.com/ckan/ckan/commit/af4b6a49eed5198149b1d5fd3d1fc37496202b6f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-06 (Thu, 06 Feb 2014)

  Changed paths:
    M doc/extensions/index.rst

  Log Message:
  -----------
  Fix a Sphinx rendering error


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

  Changed paths:
    R .gitmodules
    M dev-requirements.txt
    M doc/_templates/footer.html
    R doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/extensions/index.rst

  Log Message:
  -----------
  Merge branch 'master' into 1465-travis-half-jobs


  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: b8b34de5e8b70683eb84b8695ea490945d3c1aa4
      https://github.com/ckan/ckan/commit/b8b34de5e8b70683eb84b8695ea490945d3c1aa4
  Author: george-sattler <george.sattler at xvt.com.au>
  Date:   2014-02-13 (Thu, 13 Feb 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1504] Atom Feed HTTP Content-Type header is set to text/html.

With this change, Content-Type is set to 'application/atom+xml'


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

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  [#1510] Correct License Not Specified capitalization


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

  Changed paths:
    M bin/travis-install-dependencies

  Log Message:
  -----------
  pip >= 1.5 needs --allow-all-external

Starting from version 1.5, pip stopped downloading packages hosted in an
external site, even if there's a checksum in PyPI that we can check the
resulting package against. This breaks when downloading argparse==1.2.1 with
Python 2.6.

Here we allow all external downloads. It shouldn't be a security issue, as
we're still checking the package's hash against PyPI.

For more info, check
http://stackoverflow.com/questions/21021326/security-considerations-of-pip-allow-external


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

  Changed paths:
    M .travis.yml
    M bin/travis-install-dependencies

  Log Message:
  -----------
  Merge pull request #1465 from ckan/1465-travis-half-jobs

Half Travis Jobs to speed them up.


  Commit: 20383c76acb4e9b5260b8b0f94afee24d93c93e7
      https://github.com/ckan/ckan/commit/20383c76acb4e9b5260b8b0f94afee24d93c93e7
  Author: adam mcgreggor <adam-git at amyl.org.uk>
  Date:   2014-02-13 (Thu, 13 Feb 2014)

  Changed paths:
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Update datastore.rst

Duplicitous 'the'


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

  Changed paths:
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge pull request #1511 from adamamyl/patch-1

Typo-fix (duplication) in datastore.rst:


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

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  Merge pull request #1510 from ckan/1510-license-not-specified-capitalization

Correct License Not Specified capitalization


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

  Changed paths:
    M ckan/new_tests/factories.py

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

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


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

  Changed paths:
    M ckan/new_tests/helpers.py

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


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

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

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

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

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

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


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

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

  Log Message:
  -----------
  Fixing small typo in comment


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


  Commit: 1be3492880ef9ce5cd2f9eaf18645fc9eca10161
      https://github.com/ckan/ckan/commit/1be3492880ef9ce5cd2f9eaf18645fc9eca10161
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

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

  Log Message:
  -----------
  Merge branch 'feature/pep8-cleanup-logic-action' of https://github.com/rshk/ckan into feature/pep8-cleanup-logic-action

Conflicts:
	ckan/logic/action/create.py
	ckan/logic/action/get.py


  Commit: 80bbba0763b4b2d06c1e3b5ee08276fd72aa814c
      https://github.com/ckan/ckan/commit/80bbba0763b4b2d06c1e3b5ee08276fd72aa814c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    R .gitmodules
    M .travis.yml
    M CHANGELOG.rst
    M README.rst
    M bin/travis-install-dependencies
    M ckan/__init__.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/logic/__init__.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/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/group/snippets/group_item.html
    M ckan/templates/organization/bulk_process.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/tests/functional/test_package.py
    M ckan/tests/test_coding_standards.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/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' into 1463-add-organization-feeds


  Commit: 2e926fce3c819e6c127f10e8ef1789f874c16af8
      https://github.com/ckan/ckan/commit/2e926fce3c819e6c127f10e8ef1789f874c16af8
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch '1504-atom-feed-content-type' of https://github.com/george-sattler/ckan into george-sattler-1504-atom-feed-content-type


  Commit: 44d638caf85f56c43dec264a3bf435725a408fb7
      https://github.com/ckan/ckan/commit/44d638caf85f56c43dec264a3bf435725a408fb7
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch 'george-sattler-1504-atom-feed-content-type'


  Commit: 966e13d5e4e8ad438fe9ac5b6394fc80084bb523
      https://github.com/ckan/ckan/commit/966e13d5e4e8ad438fe9ac5b6394fc80084bb523
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Remove create.py from pep8 blacklist


  Commit: 13c121493f21889f288bd938be031a812016612b
      https://github.com/ckan/ckan/commit/13c121493f21889f288bd938be031a812016612b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  [#1463] Fix PEP8


  Commit: 3b17ff28d55df7c4584df62faac63686f8b546d0
      https://github.com/ckan/ckan/commit/3b17ff28d55df7c4584df62faac63686f8b546d0
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge branch 'feature/pep8-cleanup-logic-action'


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/templates/organization/snippets/feeds.html

  Log Message:
  -----------
  Merge branch '1463-add-organization-feeds'


  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: 09d0b1d3044e79afdbcca60087af4faf7a0fb055
      https://github.com/ckan/ckan/commit/09d0b1d3044e79afdbcca60087af4faf7a0fb055
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-20 (Thu, 20 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

  Log Message:
  -----------
  Update strings files before CKAN 2.2 call for translations


  Commit: 31d326a7f11cb0dc26f256e9dc641c04b3e8c113
      https://github.com/ckan/ckan/commit/31d326a7f11cb0dc26f256e9dc641c04b3e8c113
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    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/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
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M 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

  Log Message:
  -----------
  Update translations from Transifex before 2.2


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

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

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


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

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

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

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

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


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

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

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


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

  Changed paths:
    M ckan/tests/test_coding_standards.py

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


  Commit: 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: a3c5e57f6af934fd917bd4a8e32d449236f1862f
      https://github.com/ckan/ckan/commit/a3c5e57f6af934fd917bd4a8e32d449236f1862f
  Author: amercader <amercadero at gmail.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M doc/contributing/i18n.rst
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  [#1573] Add new translations policy to docs


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

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

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

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


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

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

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


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

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

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

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


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

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

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

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


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

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

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


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

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

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

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


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

  Changed paths:
    M .tx/config
    A __init__.py b/ckanext/example_theme/v20_pubsub/__init__.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/plugins.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/index.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/page.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/plugin.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/__init__.py
    A ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/favorite.js
    R ckanext/example_theme/v16_initialize_a_javascript_module/public
    R ckanext/example_theme/v16_initialize_a_javascript_module/templates/home/index.html
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    A ckanext/example_theme/v17_popover/__init__.py
    A ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v17_popover/plugin.py
    A ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    A ckanext/example_theme/v18_snippet_api/__init__.py
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v18_snippet_api/plugin.py
    A ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    A ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    A ckanext/example_theme/v19_01_error/__init__.py
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_01_error/plugin.py
    A ckanext/example_theme/v19_01_error/templates
    A ckanext/example_theme/v19_02_error_handling/__init__.py
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v19_02_error_handling/plugin.py
    A ckanext/example_theme/v19_02_error_handling/templates
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v20_pubsub/plugin.py
    A ckanext/example_theme/v20_pubsub/templates
    A ckanext/example_theme/v21_custom_jquery_plugin/__init__.py
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.css
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    A ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/jquery.greenify.js
    A ckanext/example_theme/v21_custom_jquery_plugin/plugin.py
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/ajax_snippets
    A ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M doc/conf.py
    M doc/contributing/documentation.rst
    M doc/extensions/testing-extensions.rst
    A doc/images/example_theme_javascript_popover.png
    A doc/images/example_theme_overlapping_popovers.png
    M doc/maintaining/filestore.rst
    M doc/theming/best-practices.rst
    M doc/theming/index.rst
    A doc/theming/javascript-api-client.rst
    A doc/theming/javascript-module-objects-and-methods.rst
    A doc/theming/javascript-sandbox.rst
    M doc/theming/javascript.rst
    A doc/theming/jquery-plugins.rst
    M setup.py

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

Conflicts:
	ckan/new_tests/factories.py


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

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

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


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

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

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

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


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

  Changed paths:
    A doc/_themes/sphinx-theme-okfn
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    A doc/contributing/string-i18n.rst
    M doc/extensions/best-practices.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  [#809] Add i18n guide for devs

Fixes #809


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

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

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

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

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


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

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

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


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

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

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

Conflicts:
	ckan/templates/header.html


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

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

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


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

  Changed paths:
    A .coveragerc
    R .gitmodules
    M .travis.yml
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M MANIFEST.in
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/__init__.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    A ckan/config/resource_formats.json
    M ckan/config/routing.py
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    A ckan/i18n/he/LC_MESSAGES/ckan.mo
    A ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/vi/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi/LC_MESSAGES/ckan.po
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    A ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/accept.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    A ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/controllers/test_util.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/vendor/jquery.ui.core.js
    A ckan/public/base/vendor/jquery.ui.mouse.js
    A ckan/public/base/vendor/jquery.ui.sortable.js
    M ckan/public/base/vendor/jquery.ui.widget.js
    R ckan/public/base/vendor/jquery.ui.widget.min.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/base.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/feeds.html
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

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

Conflicts:
	setup.py


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

  Changed paths:
    M ckan/plugins/interfaces.py

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


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

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

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

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


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

  Changed paths:
    A doc/_themes/sphinx-theme-okfn
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    A doc/contributing/string-i18n.rst
    M doc/extensions/best-practices.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst

  Log Message:
  -----------
  Merge pull request #1628 from ckan/809-string-i18n-docs

[#809] Add i18n guide for devs


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

  Changed paths:
    M doc/contributing/i18n.rst
    M doc/contributing/release-process.rst

  Log Message:
  -----------
  Merge branch '1573-new-translations-policy'


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

  Changed paths:
    A doc/_themes/sphinx-theme-okfn
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/index.rst
    M doc/contributing/javascript.rst
    M doc/contributing/python.rst
    A doc/contributing/string-i18n.rst
    M doc/extensions/best-practices.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst

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


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

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

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


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

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

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

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


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

  Changed paths:
    M ckan/new_tests/factories.py

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


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

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

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

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


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

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

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

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


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

  Changed paths:
    M doc/maintaining/datastore.rst

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


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

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

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


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

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

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

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


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

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

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


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

  Changed paths:
    M ckan/plugins/interfaces.py

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


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

  Changed paths:
    M ckan/plugins/interfaces.py

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


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

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

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


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

  Changed paths:
    M ckan/plugins/interfaces.py

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


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

  Changed paths:
    M doc/maintaining/datastore.rst

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

Remove duplicate 'the'.


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

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

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

Activity Stream from: Organization Error group not found


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

  Changed paths:
    M ckan/logic/schema.py

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


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

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

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


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

  Changed paths:
    M ckan/lib/helpers.py

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


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

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

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


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

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

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


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

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

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

Trailing whitespace in resource URLs not stripped


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

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

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

Conflicts:
	ckan/new_tests/factories.py


Compare: https://github.com/ckan/ckan/compare/910573bfa0f5...f9961a56e441


More information about the ckan-changes mailing list