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

• Previous message: [ckan-changes] [okfn/ckan] 1e7b07: First work on theming docs and example
• Next message: [ckan-changes] [okfn/ckan] 13f5b2: [#1377] Add js error handling example and docs
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/1389-release-docs-tweaks-2
  Home:   https://github.com/okfn/ckan
  Commit: 1e7b07bb9624e975f88715a00388f84db74d4da3
      https://github.com/okfn/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/okfn/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: 1fce2cc1d499c3cb5421732b08c3ee518ca18be9
      https://github.com/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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: 8c0e6341e45ac40c488b5cecb3807073091a5447
      https://github.com/okfn/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/okfn/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/okfn/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: 356ee3981ef914242eaf0e201206811f38cf9f0a
      https://github.com/okfn/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/okfn/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: 983bb024157e2846465a568623055da7fb06e9cf
      https://github.com/okfn/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/okfn/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: a8a13b22a3ee00bc71e7d6bbd7d40d54dbb71ce5
      https://github.com/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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: a128a9c7e70ad6a787c6cf4ea080a63c06f6b214
      https://github.com/okfn/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: 3d5c715cd1d16b7ea01306691023b150ddfbe700
      https://github.com/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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: 275b8ed942316d0eec0b478bac4cd161314e5046
      https://github.com/okfn/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/okfn/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/okfn/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: 833536e750c5082866e20f5891741c1813f28c09
      https://github.com/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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: e21ca1439d1efdd82732b5ef96c3317fc03a6fdb
      https://github.com/okfn/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/okfn/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: e552048dba78f44edd9589c0400eb0561cc0b4b0
      https://github.com/okfn/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: 9a75c9f9940198d5aec79cd62dea15de7fd2c34a
      https://github.com/okfn/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/okfn/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/okfn/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: b65e7066abd5c6a6752fa8d6f3f7cd8be9736a04
      https://github.com/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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: f4a24aeacf8e396f80305278d5198651912a9706
      https://github.com/okfn/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/okfn/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/okfn/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/okfn/ckan/commit/9a2840b78ee292841147e96a6bdaa6b9a693002f
  Author: kindly <kindly at gmail.com>
  Date:   2013-12-15 (Sun, 15 Dec 2013)

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

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


  Commit: 4a89b781c838a86b98a637d09700a3a0f4388afc
      https://github.com/okfn/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/okfn/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/okfn/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: 84fc1b8bebd81f1712e03849edaf4440e6ad7d76
      https://github.com/okfn/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: fd53401864661b479c1e4d041e935ee1c240048b
      https://github.com/okfn/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/okfn/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/okfn/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: d2693b834af3516d279827181bb6f0d88d005ad1
      https://github.com/okfn/ckan/commit/d2693b834af3516d279827181bb6f0d88d005ad1
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-16 (Mon, 16 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/okfn/ckan/commit/f32277034a326867df84082a69fd3d2452a82d3a
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-16 (Mon, 16 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/okfn/ckan/commit/546caa71b66df2cbcab34bbb50b6ebabab66cdfc
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-16 (Mon, 16 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/okfn/ckan/commit/d621b8b2e7c8064779401343ff1460dfdb36facc
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-16 (Mon, 16 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/okfn/ckan/commit/27831b326959706f8b91b43bff4405ea9171981c
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-12-16 (Mon, 16 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/okfn/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: e3d5da801e74e775dcf5ed42d9510788bc1895d5
      https://github.com/okfn/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/okfn/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/okfn/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/okfn/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/okfn/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: 6905280aa2d9500d9ef3513040a918cbd4df978d
      https://github.com/okfn/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: a236ba294f508f154f79e37f36f4129da0fdb4a3
      https://github.com/okfn/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/okfn/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: a0aaa9abca4150b96b0adf7380cef6b5ff556e91
      https://github.com/okfn/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/okfn/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/okfn/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


Compare: https://github.com/okfn/ckan/compare/1b4d639c0bb2...5e5a1c5c8b71

• Previous message: [ckan-changes] [okfn/ckan] 1e7b07: First work on theming docs and example
• Next message: [ckan-changes] [okfn/ckan] 13f5b2: [#1377] Add js error handling example and docs
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]