[ckan-changes] [okfn/ckan] 8cdb92: Add 'full table of contents' page to docs

Wed Nov 27 17:25:47 UTC 2013

  Branch: refs/heads/847-new-theming-docs
  Home:   https://github.com/okfn/ckan
  Commit: 8cdb92b5bf96e7ce7384635e0ff1640bf9639d96
      https://github.com/okfn/ckan/commit/8cdb92b5bf96e7ce7384635e0ff1640bf9639d96
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M doc/conf.py
    A doc/contents.rst
    M doc/index.rst

  Log Message:
  -----------
  Add 'full table of contents' page to docs

  Commit: 55732cba210d84e7bf758c1468204488b74d198a
      https://github.com/okfn/ckan/commit/55732cba210d84e7bf758c1468204488b74d198a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M doc/contents.rst

  Log Message:
  -----------
  Docs: remove depth limit from full toc

  Commit: d322b015bde73ceb1b484652bf56ccf63b6efd9e
      https://github.com/okfn/ckan/commit/d322b015bde73ceb1b484652bf56ccf63b6efd9e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Fix the docs PDF build

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

  Changed paths:
    M ckan/public/base/javascript/main.js

  Log Message:
  -----------
  [#1305] Fixes popover error by checking for it's existance in the plugins

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

  Changed paths:
    A doc/appendices/index.rst
    A doc/appendices/solr-multicore.rst
    M doc/conf.py
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    R doc/solr-setup.rst

  Log Message:
  -----------
  Reorganize Solr setup docs

Sphinx doesn't support "inner pages" like the Solr setup page was trying
to be, it breaks Sphinx's navigation.

Move the single-core Solr setup docs into the source install docs,
inline.

And an appendices chapter to the docs, and move the multi-core Solr docs
into it.

Also add new docs for setting up a second Solr core when using
multi-core.

Also tidy up some Sphinx heading styles.

  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: ab601eca80a5d71bfaebf275a869e2b94d55f8f4
      https://github.com/okfn/ckan/commit/ab601eca80a5d71bfaebf275a869e2b94d55f8f4
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js

  Log Message:
  -----------
  Merge branch '1305-undefined-popover'

  Commit: fee92ce53b602c839aa0147f5a79b31c5350c432
      https://github.com/okfn/ckan/commit/fee92ce53b602c839aa0147f5a79b31c5350c432
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/travis-run-tests
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/group.py
    M ckan/logic/action/get.py
    M ckan/new_tests/helpers.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M doc/api.rst
    M doc/background-tasks.rst
    M doc/conf.py
    M doc/configuration.rst
    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
    M doc/test.rst
    A doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' into docs-full-table-of-contents

Conflicts:
	doc/index.rst

  Commit: dbe15f63c0c570facbbb3bd229b3c6e5b13e3af3
      https://github.com/okfn/ckan/commit/dbe15f63c0c570facbbb3bd229b3c6e5b13e3af3
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    M doc/conf.py
    A doc/contents.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'docs-full-table-of-contents'

  Commit: da133f13795b26653e0c1486501b29dd70a3d794
      https://github.com/okfn/ckan/commit/da133f13795b26653e0c1486501b29dd70a3d794
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js
    M doc/conf.py
    A doc/contents.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'master' into solr-docs-reorg

Added appendices/index.rst to the contents.rst main TOC

Conflicts:
	doc/index.rst

  Commit: 91f31845a2c2b4b43e7d5367bf4b1db081a57624
      https://github.com/okfn/ckan/commit/91f31845a2c2b4b43e7d5367bf4b1db081a57624
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    A doc/appendices/index.rst
    A doc/appendices/solr-multicore.rst
    M doc/conf.py
    M doc/contents.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    R doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'solr-docs-reorg'

  Commit: c07d875931759f829e1ba10f508028b507ad0144
      https://github.com/okfn/ckan/commit/c07d875931759f829e1ba10f508028b507ad0144
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M bin/travis-install-dependencies

  Log Message:
  -----------
  [#1337] Get Postgres 8.4 from Ubuntu repos

Not sure why we use a custom PPA:
http://packages.ubuntu.com/precise/database/postgresql-8.4

  Commit: a7b046d2731bc4f48b6370f080be0746b2173d16
      https://github.com/okfn/ckan/commit/a7b046d2731bc4f48b6370f080be0746b2173d16
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M bin/travis-install-dependencies

  Log Message:
  -----------
  [#1337] Force postgres restart

  Commit: 1048efa07dd5cc035eafe6a209c6129d1e98bcbc
      https://github.com/okfn/ckan/commit/1048efa07dd5cc035eafe6a209c6129d1e98bcbc
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M bin/travis-install-dependencies

  Log Message:
  -----------
  [#1337] fix travis tests for postgres 8.4

force config to use port 5432

  Commit: bd918a8a77e82efdb457de61f0abe122ef7bf495
      https://github.com/okfn/ckan/commit/bd918a8a77e82efdb457de61f0abe122ef7bf495
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M bin/travis-install-dependencies

  Log Message:
  -----------
  Merge branch '1337-travis-postgres-8.4-cleaned'

  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

Compare: https://github.com/okfn/ckan/compare/0420072bed0f...8faaab1a268a