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

[GitHub]

  Branch: refs/heads/solr-docs-reorg
  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: 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


Compare: https://github.com/okfn/ckan/compare/9674f862ae61...da133f13795b