[ckan-changes] [okfn/ckan] 9318ef: [#523] Initial clean of extensions.rst

GitHub noreply at github.com
Wed May 8 18:58:26 UTC 2013


  Branch: refs/heads/839-stats-doc
  Home:   https://github.com/okfn/ckan
  Commit: 9318ef4b920e4bd0be5e2d5245ef428642fe017c
      https://github.com/okfn/ckan/commit/9318ef4b920e4bd0be5e2d5245ef428642fe017c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Initial clean of extensions.rst


  Commit: a65f5a6748938a1b1da0f9574054120a2ee1164b
      https://github.com/okfn/ckan/commit/a65f5a6748938a1b1da0f9574054120a2ee1164b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#523] Edit writing-extensions.rst part I


  Commit: 7c002297de5a56b77d2fdb9af9fccaa90cca2652
      https://github.com/okfn/ckan/commit/7c002297de5a56b77d2fdb9af9fccaa90cca2652
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#523] More writing extensions updates


  Commit: 04354826535a2608137ed23255d2a5626ce0d2db
      https://github.com/okfn/ckan/commit/04354826535a2608137ed23255d2a5626ce0d2db
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M doc/toolkit.rst
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#523] Toolkit update and other fixes


  Commit: 86ed2f710756899c49e0bc95f5ff01eca7f9766f
      https://github.com/okfn/ckan/commit/86ed2f710756899c49e0bc95f5ff01eca7f9766f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M doc/extensions.rst
    R doc/writing-extensions.rst

  Log Message:
  -----------
  [#523] Merge extensions and writing extensions


  Commit: 56588ef9550895eac6b6317670e470d5c5e90188
      https://github.com/okfn/ckan/commit/56588ef9550895eac6b6317670e470d5c5e90188
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523]  Remove erroneous section on plugin ordering


  Commit: 32aa746365e780d6d2dcf3d4387e07ca3f92b058
      https://github.com/okfn/ckan/commit/32aa746365e780d6d2dcf3d4387e07ca3f92b058
  Author: John Glover <j at johnglover.net>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#531] Update data viewer docs for CKAN 2.0


  Commit: 0dfbc87cbd88f22cb194065c85f7b16ab79953cf
      https://github.com/okfn/ckan/commit/0dfbc87cbd88f22cb194065c85f7b16ab79953cf
  Author: John Glover <j at johnglover.net>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M README.rst
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.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/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/search/query.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/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tracking.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/organization/index.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckanext/datastore/commands.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M doc/_templates/footer.html
    M doc/conf.py
    M doc/configuration.rst
    A doc/contributing.rst
    M doc/database-dumps.rst
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/post-installation.rst
    A doc/tracking.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 531-data-viewer-docs


  Commit: 33fd2fefd1785dff74187af6fadcfe0b2b28e2f0
      https://github.com/okfn/ckan/commit/33fd2fefd1785dff74187af6fadcfe0b2b28e2f0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-22 (Mon, 22 Apr 2013)

  Changed paths:
    M doc/common-error-messages.rst
    M doc/index.rst
    M doc/test.rst

  Log Message:
  -----------
  [#535] Move error messages related to test to a separate page.

The idea is to write the common errors that might happen closer to where they're
more common, so you have the information nearby when you need it.

This works well for test errors. For install/upgrade, as we have two methods,
we can't simply add to the same page. I've changed the index so the common
errors page is under the Installation section. Only installation/upgrade
issues should be added there.


  Commit: 95c4aa0e1bfcc8145efb6c5fa0fca990f213346d
      https://github.com/okfn/ckan/commit/95c4aa0e1bfcc8145efb6c5fa0fca990f213346d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Improve docs based on Sean's feedback


  Commit: 6ed13083aee4dff19c334b631d1cab97be1e48b4
      https://github.com/okfn/ckan/commit/6ed13083aee4dff19c334b631d1cab97be1e48b4
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] More Extension docs reworking


  Commit: 3361586875ce9d3ae88d514f40f215ea3a1aa2a2
      https://github.com/okfn/ckan/commit/3361586875ce9d3ae88d514f40f215ea3a1aa2a2
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Remove adding plugin interface code.


  Commit: f8dd0a16b15203a7cec3fd33a58fbc9f53e29947
      https://github.com/okfn/ckan/commit/f8dd0a16b15203a7cec3fd33a58fbc9f53e29947
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Fix sphinx warnings.


  Commit: edbf775eb9e0daba831bfc9a7992af360f437190
      https://github.com/okfn/ckan/commit/edbf775eb9e0daba831bfc9a7992af360f437190
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Minor fixes.


  Commit: 655851a6f66c46d2bc1e7906c33bff4a60baf744
      https://github.com/okfn/ckan/commit/655851a6f66c46d2bc1e7906c33bff4a60baf744
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Reflow and better link to toolkit.


  Commit: 4f7f911656657c416d5ba6384ec8f8889be1307c
      https://github.com/okfn/ckan/commit/4f7f911656657c416d5ba6384ec8f8889be1307c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] More cleanups.


  Commit: ab1e9b2980d45ac120be1bf65ba9c11a1cd81f4f
      https://github.com/okfn/ckan/commit/ab1e9b2980d45ac120be1bf65ba9c11a1cd81f4f
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#520] First swing at the theming docs


  Commit: 14b53e72c997e07dd2661ac4b8399626500c238e
      https://github.com/okfn/ckan/commit/14b53e72c997e07dd2661ac4b8399626500c238e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Remove enable plugin section etc.


  Commit: 8cbdd3139f34b5fe9d7e33a952650f043d1f5eaa
      https://github.com/okfn/ckan/commit/8cbdd3139f34b5fe9d7e33a952650f043d1f5eaa
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#819] Fix code error on abort in user controller


  Commit: 48be10548e68ae60db5e583c8219cbfba27b16d8
      https://github.com/okfn/ckan/commit/48be10548e68ae60db5e583c8219cbfba27b16d8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M doc/extensions.rst
    M doc/multilingual.rst

  Log Message:
  -----------
  [#523] Fix formatting in extensions list in docs


  Commit: 0746d2d40599df0f37f6947e7f0416c416e5e6da
      https://github.com/okfn/ckan/commit/0746d2d40599df0f37f6947e7f0416c416e5e6da
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523]  Some more updates add example etc


  Commit: 554dc917f55f583118d67d0650064a07b4b773fe
      https://github.com/okfn/ckan/commit/554dc917f55f583118d67d0650064a07b4b773fe
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M doc/extensions.rst
    M doc/multilingual.rst

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


  Commit: 98ad884259f60a84c21b4161c9e5daa8420873e8
      https://github.com/okfn/ckan/commit/98ad884259f60a84c21b4161c9e5daa8420873e8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Add example


  Commit: d1555e8d3fa77757f1b1f06b9676bf0bce79e649
      https://github.com/okfn/ckan/commit/d1555e8d3fa77757f1b1f06b9676bf0bce79e649
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Fix formatting


  Commit: e1a54d706ae9ba7c46789ad41cdc686dd21d26c7
      https://github.com/okfn/ckan/commit/e1a54d706ae9ba7c46789ad41cdc686dd21d26c7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] More improvements


  Commit: 81316507367970ad814eaa1b53f7daf6c65c4c6d
      https://github.com/okfn/ckan/commit/81316507367970ad814eaa1b53f7daf6c65c4c6d
  Author: John Glover <j at johnglover.net>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M doc/configuration.rst
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#531] Update data viewer docs


  Commit: 4fb36e6ae7c25c0635b869e7cce78979db3d9cb5
      https://github.com/okfn/ckan/commit/4fb36e6ae7c25c0635b869e7cce78979db3d9cb5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M ckan/lib/base.py
    M ckan/lib/render.py

  Log Message:
  -----------
  [#808] Fix unicode template 500 error


  Commit: 07ecbaa86dea992b320e9e5380b671e99b65b25d
      https://github.com/okfn/ckan/commit/07ecbaa86dea992b320e9e5380b671e99b65b25d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M doc/common-error-messages.rst

  Log Message:
  -----------
  [#535] Remove errors that aren't valid anymore


  Commit: fabee46f9029e4feb6ff21c5391565b634ee60e5
      https://github.com/okfn/ckan/commit/fabee46f9029e4feb6ff21c5391565b634ee60e5
  Author: John Glover <j at johnglover.net>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#531] Add note about /preview URL for resources.


  Commit: 11225e167f3c9ed9d4a0074116a48cdca111b43b
      https://github.com/okfn/ckan/commit/11225e167f3c9ed9d4a0074116a48cdca111b43b
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#520] Minor textual tweaks


  Commit: fb0ccd16fb9a9b9ea2b505762be7f75b4e426b94
      https://github.com/okfn/ckan/commit/fb0ccd16fb9a9b9ea2b505762be7f75b4e426b94
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M doc/templating.rst

  Log Message:
  -----------
  [#520] Jinja2 not Jinja


  Commit: eeeb2ba1b97157961e68060ea551545623ad05b1
      https://github.com/okfn/ckan/commit/eeeb2ba1b97157961e68060ea551545623ad05b1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    R doc/geospatial.rst
    R doc/harvesting.rst

  Log Message:
  -----------
  [#523] Remove geospatial and harvester docs form core


  Commit: f8e1c67d8577eb02c58f8456640426899c75c456
      https://github.com/okfn/ckan/commit/f8e1c67d8577eb02c58f8456640426899c75c456
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Fix some titles in the extensions docs


  Commit: 19361f8fe73c7ea2cd94d64be6c46f0879e5d8fd
      https://github.com/okfn/ckan/commit/19361f8fe73c7ea2cd94d64be6c46f0879e5d8fd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M doc/extensions.rst
    A doc/overview.rst
    M doc/toolkit.rst
    A doc/writing-documentation.rst

  Log Message:
  -----------
  [#523] Edit the extensions docs

Just a couple of small edits


  Commit: ad809c80df9afecf68bcdeaa7780942219e19988
      https://github.com/okfn/ckan/commit/ad809c80df9afecf68bcdeaa7780942219e19988
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    R doc/extension-templating.rst
    M doc/templating.rst

  Log Message:
  -----------
  [#520] Removes doc/extenstion-templating.html as it's inaccurate and wrong


  Commit: 66f4adae58274b1edbfbfd58562c9c639669419b
      https://github.com/okfn/ckan/commit/66f4adae58274b1edbfbfd58562c9c639669419b
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M doc/theming.rst

  Log Message:
  -----------
  [#520] Few more textual tweaks


  Commit: 3ee60a58304dae7c33cc757ed9a6a0bbadf7355e
      https://github.com/okfn/ckan/commit/3ee60a58304dae7c33cc757ed9a6a0bbadf7355e
  Author: John Martin <me at johnmart.in>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M doc/templating.rst
    M doc/theming.rst

  Log Message:
  -----------
  [#520] Added more context to how to add templates within an extension


  Commit: 2afe4269097e21c46547cec68ad80f7a293c5a1a
      https://github.com/okfn/ckan/commit/2afe4269097e21c46547cec68ad80f7a293c5a1a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#853] Fix license facets

The current default facets were using a 'license' field which is not present
in the Solr index. Changed it to 'license_id' and added some logic in
package_search to return a display name for them.


  Commit: f6e2750e86305742d68d55890e2114bccda2c461
      https://github.com/okfn/ckan/commit/f6e2750e86305742d68d55890e2114bccda2c461
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/new_authz.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/snippets/facet_list.html
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_search.py
    M doc/apps-ideas.rst
    M doc/authorization.rst
    R doc/commenting.rst
    M doc/configuration.rst
    M doc/css-coding-standards.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    M doc/i18n.rst
    A doc/importing-datasets.rst
    M doc/index.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    R doc/loading-data.rst
    R doc/organizations_and_groups.rst
    R doc/publisher-profile.rst
    M doc/publishing-datasets.rst
    M doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/templating.rst
    M doc/tracking.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 531-data-viewer-docs

Conflicts:
	doc/configuration.rst


  Commit: f5724214fe9ecc4eeab5aedfeddf6b0b7abfbf8f
      https://github.com/okfn/ckan/commit/f5724214fe9ecc4eeab5aedfeddf6b0b7abfbf8f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#531] Fix references after merge


  Commit: 30c5ff751dec5435eea00d8ee736ae3c2893f5f0
      https://github.com/okfn/ckan/commit/30c5ff751dec5435eea00d8ee736ae3c2893f5f0
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  Merge pull request #531 from okfn/531-data-viewer-docs

Update Data Viewer docs for 2.0


  Commit: 2a6c4408faa8ee4c0ff0416304b8667c04c3f90d
      https://github.com/okfn/ckan/commit/2a6c4408faa8ee4c0ff0416304b8667c04c3f90d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge branch '853-license-facet'


  Commit: 596d53a8545e99704ba3973b080c1972aef54d0a
      https://github.com/okfn/ckan/commit/596d53a8545e99704ba3973b080c1972aef54d0a
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-01 (Wed, 01 May 2013)

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

  Log Message:
  -----------
  [#787] Adds max-width to inner image to prevent 100% width in IE10


  Commit: e4055530a835770de6f8db20ca9bc2d82f9e1d60
      https://github.com/okfn/ckan/commit/e4055530a835770de6f8db20ca9bc2d82f9e1d60
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    R ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less

  Log Message:
  -----------
  [#822] Removes flags from language dropdown in footer


  Commit: f18bf06cb36ac0d687794779c877daf283f72599
      https://github.com/okfn/ckan/commit/f18bf06cb36ac0d687794779c877daf283f72599
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

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

  Log Message:
  -----------
  [#859] Fix default sort ordering

The default sort ordering for dataset searches is supposed to be
most-recently-modified first, but it's actually most-recently-created
first. This appears to have been a typo/accidental change in this
commit: bc496ff. Change it back to most-recently-modified.


  Commit: 811b5467a81d07d4db12e1d200539121f90b8f63
      https://github.com/okfn/ckan/commit/811b5467a81d07d4db12e1d200539121f90b8f63
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    R doc/overview.rst
    R doc/writing-documentation.rst

  Log Message:
  -----------
  [#523] Remove a couple of accidentally-completed files

A couple of draft docs files got committed by accident, remove them.


  Commit: 2ef6f37303a5d5d227d38a8385cc9bc2094ae681
      https://github.com/okfn/ckan/commit/2ef6f37303a5d5d227d38a8385cc9bc2094ae681
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M doc/architecture.rst
    M doc/background-tasks.rst
    M doc/extensions.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst

  Log Message:
  -----------
  [#523] sphinx fixes


  Commit: 8fe645977f2c34f8fac81ee3c241eb3968e09625
      https://github.com/okfn/ckan/commit/8fe645977f2c34f8fac81ee3c241eb3968e09625
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    R doc/overview.rst
    R doc/writing-documentation.rst

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


  Commit: 915d2982d5fd864dc01e217652252b0b5a7fd400
      https://github.com/okfn/ckan/commit/915d2982d5fd864dc01e217652252b0b5a7fd400
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#830] Dashboard filter fix


  Commit: c6132e24b7c54eacfbdb9d45eae7a9c9bff09a3c
      https://github.com/okfn/ckan/commit/c6132e24b7c54eacfbdb9d45eae7a9c9bff09a3c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

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

  Log Message:
  -----------
  Recompile css


  Commit: 0e789022bab14772e044260d6d291c6570f5fd7d
      https://github.com/okfn/ckan/commit/0e789022bab14772e044260d6d291c6570f5fd7d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

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

  Log Message:
  -----------
  Merge branch '859-fix-default-sort-ordering'


  Commit: c1018fd696af7cc5598d4d4c87103c36e0c0277e
      https://github.com/okfn/ckan/commit/c1018fd696af7cc5598d4d4c87103c36e0c0277e
  Author: John Martin <me at johnmart.in>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    M doc/templating.rst

  Log Message:
  -----------
  [#520] Added blank line for better code rendering


  Commit: 7d0723e24e837efd4d5b5679a50bdf5998b3c525
      https://github.com/okfn/ckan/commit/7d0723e24e837efd4d5b5679a50bdf5998b3c525
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    R doc/extension-templating.rst
    M doc/templating.rst
    M doc/theming.rst

  Log Message:
  -----------
  Merge branch '520-templating-docs'


  Commit: 40409401184ee15876826d359789ea784f7241ce
      https://github.com/okfn/ckan/commit/40409401184ee15876826d359789ea784f7241ce
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-02 (Thu, 02 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #830 from okfn/830-dashboard-fix

Server error 500 on http://beta.ckan.org/dashboard?type=user&name=shevski


  Commit: 675c0a84bf5ff30a8da0559c166e090d0606cd12
      https://github.com/okfn/ckan/commit/675c0a84bf5ff30a8da0559c166e090d0606cd12
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M doc/common-error-messages.rst
    M doc/index.rst
    M doc/test.rst

  Log Message:
  -----------
  Merge pull request #804 from vitorbaptista/535

[#535] Move error messages related to test to a separate page.


  Commit: 03ac5a810f8b3e756cb9b705b599a1ce03b664d7
      https://github.com/okfn/ckan/commit/03ac5a810f8b3e756cb9b705b599a1ce03b664d7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#523] Fix a typo in the docs


  Commit: fe98f77f8374a637461d1deef01ea4e7ee583e9f
      https://github.com/okfn/ckan/commit/fe98f77f8374a637461d1deef01ea4e7ee583e9f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#523] Remove broken reference to plugins.rst


  Commit: 3cebb3934e5fd13043435ae2362dc66b079d13c2
      https://github.com/okfn/ckan/commit/3cebb3934e5fd13043435ae2362dc66b079d13c2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M ckan/plugins/interfaces.py
    M doc/architecture.rst
    M doc/background-tasks.rst
    M doc/extensions.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/index.rst
    M doc/multilingual.rst
    M doc/tag-vocabularies.rst
    M doc/toolkit.rst
    R doc/writing-extensions.rst

  Log Message:
  -----------
  Merge branch '523-docs-extensions'


  Commit: 6e1d325d61ea66cd197864dc9a5af5c65af183c0
      https://github.com/okfn/ckan/commit/6e1d325d61ea66cd197864dc9a5af5c65af183c0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-05 (Sun, 05 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/conf.py
    M doc/datastore-setup.rst
    M doc/install-from-source.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  [#519] Update source install docs for 2.0

Update the source install and related docs (datastore setup, solr setup,
testing) and files (deployment.ini_tmp, test-core.ini) for CKAN 2.0.

The idea is to document the setup process that OKFN is currently using
on its servers, so that the deployment docs can become the docs for the
OKFN dev team and we can dogfood our own docs, instead of having a bunch
of wiki pages, READMEs, etc. that we follow and ignoring the "official"
docs. Hopefully those can all be deleted or cut down massively once this
is done.

So both the docs now describe the layout we use on our servers, where
there's space for multiple CKAN sites on the same server, with
virtualenvs in /usr/lib/ckan/ and config files in /etc/ckan/.

- Changed default virtualenv location from `~/pyenv` to `/usr/lib/ckan/default`

- Changed default config files dir to `/etc/ckan/default`

- Added tip for developers in source install docsS symlink `/usr/lib/ckan` and
  `/etc/ckan` to directories in your homedir to install ckan in your homedir

- Changed default database user from `ckanuser` to `ckan_default`

- Changed default database from `ckan_dev` to `ckan_default`

- Changed default datastore database from `datastore` to `datastore_default`

- Changed default datastore database user from `readonlyuser` to `datastore_default`

- Changed default test databases from `ckan_test` and `ckan_test_datastore` to
  `ckan_test` and `datastore_test`

- Changed default `ckan.site_id` from `ckan.net` to `default`

- Disabled file log handler, rely on Apache's log files only (as we do on our
  servers)

- Changed the docs to use restructured text substitutions for things like the
  paths to the virtualenv and config files, database names, etc. instead of
  typing them out each time

- Lots of minor formatting fixes and editing

So now we have:

    virtualenv:        /usr/lib/ckan/default
    development.ini:   /etc/ckan/default/development.ini
    production.ini:    /etc/ckan/default/production.ini
    ckan.site_id:      default
    Database user:     ckan_default
    Database:          ckan_default
    Datastore user:    datastore_default
    Datastore db:      datastore_default
    Test database:     ckan_test
    Test datastore db: datastore_test


  Commit: 02f5bad24f73c7e3f617847c76598932b40b4e43
      https://github.com/okfn/ckan/commit/02f5bad24f73c7e3f617847c76598932b40b4e43
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-05 (Sun, 05 May 2013)

  Changed paths:
    M doc/post-installation.rst

  Log Message:
  -----------
  [#519] Update post-installation docs

Make them fit with the changes in commit
6e1d325d61ea66cd197864dc9a5af5c65af183c0


  Commit: d015114da0b3a58ef5119ee4cea01e9404e46b67
      https://github.com/okfn/ckan/commit/d015114da0b3a58ef5119ee4cea01e9404e46b67
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-05 (Sun, 05 May 2013)

  Changed paths:
    M doc/conf.py
    M doc/deployment.rst

  Log Message:
  -----------
  [#519] Update deployment docs

Uses the same directory structure as the updated source install docs, so
you can step through the source install docs and then the deployment
docs as written and it all works.

Also updated the apache.wsgi and sites-available files to match those
that we use on our servers.

Removed CORS setup instructions as this has been builtin since CKAN 1.5.


  Commit: 02cf77cff06ae2f5be670718aaccf60a1acee31e
      https://github.com/okfn/ckan/commit/02cf77cff06ae2f5be670718aaccf60a1acee31e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-05 (Sun, 05 May 2013)

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

  Log Message:
  -----------
  [#519] Edit source install docs

Minor edits to install from source docs


  Commit: d70fc0ba6a0270de9b51f360a1c84b34ec054e42
      https://github.com/okfn/ckan/commit/d70fc0ba6a0270de9b51f360a1c84b34ec054e42
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-05 (Sun, 05 May 2013)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#519] Edit solr setup docs

Minor edits to solr setup docs


  Commit: c634a67fee7ff99ecfa71c72490825d57c63b2cd
      https://github.com/okfn/ckan/commit/c634a67fee7ff99ecfa71c72490825d57c63b2cd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-05 (Sun, 05 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M doc/conf.py
    M doc/filestore.rst

  Log Message:
  -----------
  [#519] Update FileStore setup instructions


  Commit: 9197182b39fb58f839aa2f611183be73229f1be3
      https://github.com/okfn/ckan/commit/9197182b39fb58f839aa2f611183be73229f1be3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-05 (Sun, 05 May 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#519] Fix Travis build

Update the database and user names in travis build


  Commit: a64c21e2819971c800366ca56f0f005a20c54972
      https://github.com/okfn/ckan/commit/a64c21e2819971c800366ca56f0f005a20c54972
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#519] Minor edits to solr setup docs


  Commit: 427ee0f6c19ff1e5ab93f5f348fdbf9e9dd00788
      https://github.com/okfn/ckan/commit/427ee0f6c19ff1e5ab93f5f348fdbf9e9dd00788
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/deployment.rst

  Log Message:
  -----------
  [#519] Add postfix to deployment docs


  Commit: 6cbdcb1d1325f5115dafe68ef33db9f328e23273
      https://github.com/okfn/ckan/commit/6cbdcb1d1325f5115dafe68ef33db9f328e23273
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#519] Minor edits to datastore docs

Minor edits to the datastore docs, from Dominik. See:

https://github.com/okfn/ckan/pull/807


  Commit: c77012a7c2c20e09092e35e546f06e5361405f93
      https://github.com/okfn/ckan/commit/c77012a7c2c20e09092e35e546f06e5361405f93
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/lib/base.py
    M ckan/lib/render.py

  Log Message:
  -----------
  Merge branch '808-unicode-template-fix2'


  Commit: 94a367fef3fb2b2ca2bd63dce19de692ef143c89
      https://github.com/okfn/ckan/commit/94a367fef3fb2b2ca2bd63dce19de692ef143c89
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckan/config/install.py
    M setup.py

  Log Message:
  -----------
  [#746] Extend Pylons installer to tweak deployment.ini_tmpl

With the new 'paste.app_install' entry point on setup.py, we can define
a custom "installer" that basically allows us to define new variables to
be used on the deployment.ini_tmpl file. This is useful eg for defining
the ckan version and provide a link to the relevant documentation for
the configuration options.


  Commit: 88f9c6aa8d5acd293e906ee20ba0572b65125ad4
      https://github.com/okfn/ckan/commit/88f9c6aa8d5acd293e906ee20ba0572b65125ad4
  Author: John Glover <glover.john at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #819 from okfn/819-abort-error-in-user-controller

Abort error in user controller


  Commit: 7ced6fc9bf0347487f5032305fd0e2b5973d2634
      https://github.com/okfn/ckan/commit/7ced6fc9bf0347487f5032305fd0e2b5973d2634
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/conf.py
    M doc/filestore.rst

  Log Message:
  -----------
  [#519] Docs: change restart_apache substitution to reload_apache


  Commit: 6032a292d97018cf8343b597cf66e9a87372e1f5
      https://github.com/okfn/ckan/commit/6032a292d97018cf8343b597cf66e9a87372e1f5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/deployment.rst
    M doc/email-notifications.rst
    M doc/install-from-source.rst

  Log Message:
  -----------
  [#519] Docs: use the reload_apache substitution


  Commit: 1240f0290b115761fac2d37ed90791560ebbd466
      https://github.com/okfn/ckan/commit/1240f0290b115761fac2d37ed90791560ebbd466
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/deployment.rst

  Log Message:
  -----------
  [#519] Remove non-root URL deployment instructions

We've had reports from some users that this causes problems with some
CKAN features, so we don't want to recommend it until tested.


  Commit: 36fff9664e20a6f7f282fffe73626629eb5ffe65
      https://github.com/okfn/ckan/commit/36fff9664e20a6f7f282fffe73626629eb5ffe65
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/configuration.rst
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#746] Document datastore db url config options

And include them from the datastore setup documentation to avoid
duplication.


  Commit: b674dbe4f5371f378788c3d7a7bb8b55b44a4dfa
      https://github.com/okfn/ckan/commit/b674dbe4f5371f378788c3d7a7bb8b55b44a4dfa
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#746] Update configuration.rst

* Document ckan.email_notifications_since
* Remove duplicate search.facet.limits
* Minor formatting tweaks


  Commit: a36ea43d936cebab6b7e4c9ada5df8801833784d
      https://github.com/okfn/ckan/commit/a36ea43d936cebab6b7e4c9ada5df8801833784d
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#746] Document file store options in configuration.rst

TODO: Expand them


  Commit: ddef4f59b89cbbe6f331589f1f8e16860d78c706
      https://github.com/okfn/ckan/commit/ddef4f59b89cbbe6f331589f1f8e16860d78c706
  Author: amercader <amercadero at gmail.com>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#746] Update deployment.ini_tmpl

Remove legacy  and unused options, add new ones. Change the structure to
follow more closely the documentation on configuration.rst. Remove all inline
comments to avoid having documentation in more than one place.


  Commit: b6f7878a3dd244c98b0e2400d8dcd5a1b89b210d
      https://github.com/okfn/ckan/commit/b6f7878a3dd244c98b0e2400d8dcd5a1b89b210d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

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

  Log Message:
  -----------
  [#519] Replace seanh with `whoami` in source install docs


  Commit: be59aaaabe93df33d0d7a7d3b7a485e264e2c187
      https://github.com/okfn/ckan/commit/be59aaaabe93df33d0d7a7d3b7a485e264e2c187
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#519] Docs: changed 'supported' to 'recommended'


  Commit: 929ebc8ac1b613074312503e73692ae1c6c4e71d
      https://github.com/okfn/ckan/commit/929ebc8ac1b613074312503e73692ae1c6c4e71d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M doc/datastore-setup.rst

  Log Message:
  -----------
  [#746] No : at end of sentence.


  Commit: e88b2fbb67bcd845ea32d93a6509f025a016cc8e
      https://github.com/okfn/ckan/commit/e88b2fbb67bcd845ea32d93a6509f025a016cc8e
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M doc/conf.py
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #874 from okfn/519-update-deployment-docs-second-try

519 update deployment docs second try


  Commit: 5cfeaeef249de4475271f6c15869c10226b7654d
      https://github.com/okfn/ckan/commit/5cfeaeef249de4475271f6c15869c10226b7654d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#746] Edit a docstring in deployment.ini_tmpl

Minor edits


  Commit: 6c37a3b21a05c21b142048be4dfc13bc539f2132
      https://github.com/okfn/ckan/commit/6c37a3b21a05c21b142048be4dfc13bc539f2132
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#746] Minor edits to configuration docs


  Commit: 819849838ad145d16a5449cd7ec0506cf9e14fa8
      https://github.com/okfn/ckan/commit/819849838ad145d16a5449cd7ec0506cf9e14fa8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

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

  Log Message:
  -----------
  Merge branch '787-ie10-media-item-image-height'


  Commit: 2597b4b97022d2c1ee43bcacf767cff71df75ba3
      https://github.com/okfn/ckan/commit/2597b4b97022d2c1ee43bcacf767cff71df75ba3
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

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

  Log Message:
  -----------
  css recompile


  Commit: e0cd7ba46e260b503b4090d1a382c5bc5dcf7db8
      https://github.com/okfn/ckan/commit/e0cd7ba46e260b503b4090d1a382c5bc5dcf7db8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/user.py
    M doc/conf.py
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    M doc/filestore.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 746-update-deployment.ini_tmpl

Conflicts:
	ckan/config/deployment.ini_tmpl
	doc/datastore-setup.rst


  Commit: 6df1539b9ab5cb1fc8621a0c4599e7b11207449b
      https://github.com/okfn/ckan/commit/6df1539b9ab5cb1fc8621a0c4599e7b11207449b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckan/config/install.py
    M doc/configuration.rst
    M doc/datastore-setup.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '746-update-deployment.ini_tmpl'


  Commit: 15ce695cc624abbf5c075c4f0602170a5255ad1d
      https://github.com/okfn/ckan/commit/15ce695cc624abbf5c075c4f0602170a5255ad1d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    A ckan/config/install.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/render.py
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M doc/architecture.rst
    M doc/background-tasks.rst
    M doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore-setup.rst
    M doc/deployment.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    M doc/extensions.rst
    M doc/filestore.rst
    R doc/geospatial.rst
    R doc/harvesting.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/multilingual.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 839-stats-doc

Conflicts:
	doc/extensions.rst


  Commit: a49e874c119850d95ee0519b2ba898dea9c06d3e
      https://github.com/okfn/ckan/commit/a49e874c119850d95ee0519b2ba898dea9c06d3e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M doc/stats.rst

  Log Message:
  -----------
  [#839] Make the docs sound better


  Commit: 4ac59173892f1b7e487ac3cec280a2c46d9e273d
      https://github.com/okfn/ckan/commit/4ac59173892f1b7e487ac3cec280a2c46d9e273d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M doc/extensions.rst

  Log Message:
  -----------
  [#869] Link to stats docs from extension docs


Compare: https://github.com/okfn/ckan/compare/a3bf3a01b0bb...4ac59173892f


More information about the ckan-changes mailing list