[ckan-changes] [okfn/ckan] 910ca2: New option to disable user creation via web

GitHub noreply at github.com
Wed Nov 13 16:50:10 UTC 2013


  Branch: refs/heads/1304-reset-db
  Home:   https://github.com/okfn/ckan
  Commit: 910ca29a902b265e5788864f533a70d8626cbcf1
      https://github.com/okfn/ckan/commit/910ca29a902b265e5788864f533a70d8626cbcf1
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/auth/create.py
    M ckan/new_authz.py
    M ckan/templates/header.html
    M ckan/templates/user/login.html
    M test-core.ini

  Log Message:
  -----------
  New option to disable user creation via web


  Commit: 6bc0c3ee3b9ea158ad358c5697e26eedd372ba9f
      https://github.com/okfn/ckan/commit/6bc0c3ee3b9ea158ad358c5697e26eedd372ba9f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Add documentation for new config option


  Commit: c75e487ff99765418d5c82e9f683e2d694afc98d
      https://github.com/okfn/ckan/commit/c75e487ff99765418d5c82e9f683e2d694afc98d
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M ckan/logic/auth/create.py
    M doc/configuration.rst

  Log Message:
  -----------
  Fix docs, remove deprecated comment


  Commit: 3d5fe71e8b17067f032784be75b932a352163fc6
      https://github.com/okfn/ckan/commit/3d5fe71e8b17067f032784be75b932a352163fc6
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    A ckan/lib/uploader.py
    M ckan/logic/schema.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  [1262] basic image upload functionality


  Commit: 66105d360e010114751ff0280b07196e6f73445a
      https://github.com/okfn/ckan/commit/66105d360e010114751ff0280b07196e6f73445a
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/uploader.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html

  Log Message:
  -----------
  [#1262] fix how url field is handled


  Commit: 1b62423d9d013dbc4481bbddd5a1037b49e52529
      https://github.com/okfn/ckan/commit/1b62423d9d013dbc4481bbddd5a1037b49e52529
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [1262] use logic instead of requests


  Commit: c4d673327c6b83e01ead0091246cecb83875160a
      https://github.com/okfn/ckan/commit/c4d673327c6b83e01ead0091246cecb83875160a
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

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

  Log Message:
  -----------
  [#1262] fix test failures


  Commit: fc1097763c8d9bdb3be42bbd43c037aab59f1b6d
      https://github.com/okfn/ckan/commit/fc1097763c8d9bdb3be42bbd43c037aab59f1b6d
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1267] fix url for by faking routes threadlocal


  Commit: 5023e0c3354ca03475b06ee11a3e47f867adedaf
      https://github.com/okfn/ckan/commit/5023e0c3354ca03475b06ee11a3e47f867adedaf
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-13 (Sun, 13 Oct 2013)

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

  Log Message:
  -----------
  Don't exempt sysadmins


  Commit: 878772cfc37932805cca58439150d702506fe043
      https://github.com/okfn/ckan/commit/878772cfc37932805cca58439150d702506fe043
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-13 (Sun, 13 Oct 2013)

  Changed paths:
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/logic/test_auth.py

  Log Message:
  -----------
  [#1226] Add tests


  Commit: c269023a3fce3e80fcfdc58ea0335d769eb56163
      https://github.com/okfn/ckan/commit/c269023a3fce3e80fcfdc58ea0335d769eb56163
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    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/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.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/validators.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.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/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/homepage.less
    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
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/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/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/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/organization.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/login.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
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    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_navl.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/datastore/plugin.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 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 dev-requirements.txt
    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/i18n.rst
    M doc/index.rst
    M doc/multilingual.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    R doc/toolkit.rst
    M doc/upgrade-source.rst
    R doc/writing-extensions.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1226-user-create-option

Conflicts:
	ckan/logic/auth/create.py
	ckan/templates/header.html


  Commit: 3273ebf7d0e06dbf3d854a25f701e651fe88bb0b
      https://github.com/okfn/ckan/commit/3273ebf7d0e06dbf3d854a25f701e651fe88bb0b
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/tests/functional/api/test_user.py

  Log Message:
  -----------
  [#1226] Return the old behaviour for create_user


  Commit: bb6cb7d0ff417b72f002dd372bdfd09ba560a766
      https://github.com/okfn/ckan/commit/bb6cb7d0ff417b72f002dd372bdfd09ba560a766
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1261] add filesize limit, make storage folder backwards compatable, document a bit more


  Commit: 3dee85226f1fa6a29a03d598c8c11be1c5dba4ca
      https://github.com/okfn/ckan/commit/3dee85226f1fa6a29a03d598c8c11be1c5dba4ca
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/forms.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [#1262] First working version of the JS module for image uploading


  Commit: 0f74db8a964451e5cba1360b4f15ea3a84a56544
      https://github.com/okfn/ckan/commit/0f74db8a964451e5cba1360b4f15ea3a84a56544
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1262] Adds in doc blocks into the image_upload JS module


  Commit: 7d15d591499d5722f60cc0ecfc09abf59dad177f
      https://github.com/okfn/ckan/commit/7d15d591499d5722f60cc0ecfc09abf59dad177f
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1262] Adds support for different field names for image upload


  Commit: 3a60c2e2420350631742f8d0330be2f002d581eb
      https://github.com/okfn/ckan/commit/3a60c2e2420350631742f8d0330be2f002d581eb
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M .travis.yml
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests

  Log Message:
  -----------
  [#766] Stop Travis build if a dependency install fails

To do so, I needed to split our ./bin/travis-build in two files, one with the
deps install, and one with the test run. Doing so allows me to use the
"install" directive in Travis, and break the build as soon as something fails
with it.


  Commit: 1aee242081710ddb1283d3cb9b0987d209273b53
      https://github.com/okfn/ckan/commit/1aee242081710ddb1283d3cb9b0987d209273b53
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M bin/travis-install-dependencies

  Log Message:
  -----------
  [#766] Remove redundant datastore_test psql user creation


  Commit: 6cc143f9deec75bf13fe2e517bead4ae90b91b50
      https://github.com/okfn/ckan/commit/6cc143f9deec75bf13fe2e517bead4ae90b91b50
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1262] make tests pass


  Commit: 8b6e56d9d89ba92fb1a67a0febac8334192ddc83
      https://github.com/okfn/ckan/commit/8b6e56d9d89ba92fb1a67a0febac8334192ddc83
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  [#1155] Document how to upgrade the dependencies


  Commit: 4c46078e6737062d9b48c30e82afb5203f02c770
      https://github.com/okfn/ckan/commit/4c46078e6737062d9b48c30e82afb5203f02c770
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M bin/travis-install-dependencies
    M bin/travis-run-tests

  Log Message:
  -----------
  [#766] Move solr configuration to travis-run-tests

I was unable to run Jetty-Solr's configuration on travis-install-dependencies.
Probably something to do with Bash's "set -e", but I was unable to pinpoint
exactly, so I left it into travis-run-tests. No big deal.


  Commit: 852a23cda23a81ddc2374d53f67556d2a700ca7e
      https://github.com/okfn/ckan/commit/852a23cda23a81ddc2374d53f67556d2a700ca7e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M bin/travis-run-tests

  Log Message:
  -----------
  [#766] Use /bin/sh instead of /bin/bash


  Commit: 809f6b6816411002c22df09211d0e8834a678d92
      https://github.com/okfn/ckan/commit/809f6b6816411002c22df09211d0e8834a678d92
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M README.rst
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/template.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/logic/auth/create.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/organization/snippets/helper.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
    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
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/tests/logic/test_auth.py
    M dev-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 766

Conflicts:
	bin/travis-install-dependencies


  Commit: 12b5d386b150b2072dc6680996a11b8b524199fb
      https://github.com/okfn/ckan/commit/12b5d386b150b2072dc6680996a11b8b524199fb
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  [#1294] Update docs theme to latest version


  Commit: 5550a4a34e481441c8cdc2ac6f40ebcbfad95663
      https://github.com/okfn/ckan/commit/5550a4a34e481441c8cdc2ac6f40ebcbfad95663
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    A doc/_static/ckanlogo.png
    M doc/conf.py
    R doc/images/ckan_logo_box.png

  Log Message:
  -----------
  [#1294] Fix logo on docs header bar

The logo needs to be in a _static folder because the sphinx-theme-okfn
hardcodes it there:

https://github.com/okfn/sphinx-theme-okfn/blob/master/layout.html#L18


  Commit: 500733eeb791b3960e0a7b116499ad8a27d207cf
      https://github.com/okfn/ckan/commit/500733eeb791b3960e0a7b116499ad8a27d207cf
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

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

  Log Message:
  -----------
  Default API_URL to SITE_URL if missing

Otherwise file uploads and other calls where broken when using CKAN in
a non-root location.


  Commit: 787cb7ae25ce47bfa28b8543c1a7e59a06186fe4
      https://github.com/okfn/ckan/commit/787cb7ae25ce47bfa28b8543c1a7e59a06186fe4
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M ckan/tests/functional/api/test_user.py

  Log Message:
  -----------
  Fix a few small mistakes in the tests


  Commit: 4f732627fbf515bc7cbe29e84731606409a637b7
      https://github.com/okfn/ckan/commit/4f732627fbf515bc7cbe29e84731606409a637b7
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1262] only allow file already exists errors to not raise exception


  Commit: 8c7329c6246c03a965f8284c855c3e538d205a9c
      https://github.com/okfn/ckan/commit/8c7329c6246c03a965f8284c855c3e538d205a9c
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [#1262] only allow file already exists errors to not raise exception for other case


  Commit: cba4e6ccd350cde453efc5ca958c86b10c9a5d98
      https://github.com/okfn/ckan/commit/cba4e6ccd350cde453efc5ca958c86b10c9a5d98
  Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #1276 from okfn/1267-fix-urlfor-paster

Make url_for work in paster commands


  Commit: 8b15c7938295f7919d95857975d45282f3daffbe
      https://github.com/okfn/ckan/commit/8b15c7938295f7919d95857975d45282f3daffbe
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/public/base/css/main.css
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1262] fix pull request issues


  Commit: 38ed0ae150f8551b8120b4bc9e9ca73d8436c86a
      https://github.com/okfn/ckan/commit/38ed0ae150f8551b8120b4bc9e9ca73d8436c86a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 960-dont-use-api_url


  Commit: 04d65785c97a6b8d44d70c8f6bdff4de50caf3b7
      https://github.com/okfn/ckan/commit/04d65785c97a6b8d44d70c8f6bdff4de50caf3b7
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/app_globals.py
    M ckan/public/base/javascript/main.js
    M ckan/templates/base.html
    M doc/configuration.rst
    M doc/legacy-api.rst

  Log Message:
  -----------
  [#960] Remove ckan.api_url completely on 2.2


  Commit: 4d0184ae6ee1af126c3103a4ac4c407c417fa824
      https://github.com/okfn/ckan/commit/4d0184ae6ee1af126c3103a4ac4c407c417fa824
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [#1262] fix required field in wrong place


  Commit: be38950f69517a5fd528a972f8ca6080a7ab5eef
      https://github.com/okfn/ckan/commit/be38950f69517a5fd528a972f8ca6080a7ab5eef
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M .travis.yml
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests

  Log Message:
  -----------
  Merge pull request #766 from okfn/766-stop-travis-build-when-deps-install-fails

Recurring travis fail `no such option 'with-pylons'`


  Commit: ff7e38e56842d4e20b6846717e61625fbcbe47e2
      https://github.com/okfn/ckan/commit/ff7e38e56842d4e20b6846717e61625fbcbe47e2
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/tests/functional/api/test_user.py

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


  Commit: cf55b02a9d918021b586ad789f9238094c5bf6ad
      https://github.com/okfn/ckan/commit/cf55b02a9d918021b586ad789f9238094c5bf6ad
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/auth/create.py
    M ckan/new_authz.py
    M ckan/templates/header.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/logic/test_auth.py
    M doc/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #1226 from okfn/1226-user-create-option

Disable user registration with a config


  Commit: 85737e8e2d1e1b4184849f278c7e24e501e5e510
      https://github.com/okfn/ckan/commit/85737e8e2d1e1b4184849f278c7e24e501e5e510
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

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

  Log Message:
  -----------
  [#1307] Minor docs correction


  Commit: de166d955c8c682ce94ff794f77962fa3ba558ae
      https://github.com/okfn/ckan/commit/de166d955c8c682ce94ff794f77962fa3ba558ae
  Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

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

  Log Message:
  -----------
  Merge pull request #1307 from okfn/1307-minor-docs-correction

Minor docs correction


  Commit: 7f1327fe010debaee0eed9a5d3c87c119aede52c
      https://github.com/okfn/ckan/commit/7f1327fe010debaee0eed9a5d3c87c119aede52c
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#1068] Show 404 instead of login page on user not found

Remove unnecessary auth check, fix redirect


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

  Changed paths:
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html

  Log Message:
  -----------
  [#1309] Fix placeholders in non-root locations


  Commit: fce2b457afd660a685b15a6797fa61d5cef92c48
      https://github.com/okfn/ckan/commit/fce2b457afd660a685b15a6797fa61d5cef92c48
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html

  Log Message:
  -----------
  Merge pull request #1309 from okfn/1309-fix-placeholders-non-root

Placeholder images broken on non-root locations


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update CHANGELOG


  Commit: 31f30dc2d9965ef1326051173bc0d7c20a34b270
      https://github.com/okfn/ckan/commit/31f30dc2d9965ef1326051173bc0d7c20a34b270
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/app_globals.py
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/templates/base.html
    M doc/configuration.rst
    M doc/legacy-api.rst

  Log Message:
  -----------
  Merge pull request #960 from okfn/960-dont-use-api_url

api_url needs to default to CKAN's mount URL.


  Commit: ae17348ce8d26d121d65d0688392000ab38dcc3f
      https://github.com/okfn/ckan/commit/ae17348ce8d26d121d65d0688392000ab38dcc3f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M CHANGELOG.rst
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.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/plugins.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/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
    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/homepage.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/admin/config.html
    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_item.html
    M ckan/templates/group/snippets/helper.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/organization/snippets/helper.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
    M ckan/templates/package/snippets/package_metadata_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/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_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
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/i18n.rst
    M doc/legacy-api.rst
    M doc/upgrade-source.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1262-org-group-image-upload

Conflicts:
	ckan/lib/helpers.py
	ckan/logic/action/create.py
	ckan/public/base/css/main.css
	ckan/public/base/less/forms.less
	ckan/templates/group/snippets/group_item.html
	ckan/templates/organization/snippets/organization_item.html


  Commit: 6aa06a2a70c3b74249fbf145f8a4945fad0d997a
      https://github.com/okfn/ckan/commit/6aa06a2a70c3b74249fbf145f8a4945fad0d997a
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    A ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/forms.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  Merge pull request #1262 from okfn/1262-org-group-image-upload

Upload for group and organization images.


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

  Changed paths:
    M CONTRIBUTING.rst
    A doc/upgrading-dependencies.rst

  Log Message:
  -----------
  [#1155] Tweak upgrading dependencies docs


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

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.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/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.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/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/model/meta.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.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/templates/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.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
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_help.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/snippets/datapusher_status.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/login.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_related.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.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 doc/configuration.rst
    M doc/legacy-api.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1155-document-upgrading-dependencies


  Commit: 1a188b04f91116beb201eadeb14fe65470e23123
      https://github.com/okfn/ckan/commit/1a188b04f91116beb201eadeb14fe65470e23123
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M doc/upgrading-dependencies.rst

  Log Message:
  -----------
  [#1155] Explain how to pin the latest uncompatible version in requirements.in


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

  Changed paths:
    M doc/upgrading-dependencies.rst

  Log Message:
  -----------
  [#1155] Add a small clarification to the docs


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

  Changed paths:
    M CONTRIBUTING.rst
    A doc/upgrading-dependencies.rst

  Log Message:
  -----------
  Merge branch '1155-document-upgrading-dependencies'


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

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.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/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/model/meta.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.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/templates/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.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
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_help.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/snippets/datapusher_status.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/login.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.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/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M doc/configuration.rst
    M doc/legacy-api.rst
    A doc/upgrading-dependencies.rst
    M setup.py
    M test-core.ini

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


  Commit: a73ee7a305ac2faf714098d4d69b8e88b59f49bc
      https://github.com/okfn/ckan/commit/a73ee7a305ac2faf714098d4d69b8e88b59f49bc
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #1068 from okfn/1068-404-on-user-not-found

Non-existent user profile should give error


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

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

  Log Message:
  -----------
  [#1294] Show table of contents in docs sidebar on front page


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

  Changed paths:
    M ckan/controllers/user.py

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


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

  Changed paths:
    A doc/_static/ckanlogo.png
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    R doc/images/ckan_logo_box.png
    M doc/index.rst

  Log Message:
  -----------
  Merge branch '1294-update-docs-theme'


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

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  Remove an unnecessary <hr> from a docs page


  Commit: acdcef137c45a0b53e20cf813d2004e15c82ae45
      https://github.com/okfn/ckan/commit/acdcef137c45a0b53e20cf813d2004e15c82ae45
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    A ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/forms.less
    M ckan/templates/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_auth.py
    A doc/_static/ckanlogo.png
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    R doc/images/ckan_logo_box.png
    M doc/index.rst
    M doc/legacy-api.rst
    A doc/upgrading-dependencies.rst
    M test-core.ini

  Log Message:
  -----------
  Merge origin/master


Compare: https://github.com/okfn/ckan/compare/ed5ecd2c56d3...acdcef137c45


More information about the ckan-changes mailing list