[ckan-changes] [ckan/ckan] 839bd7: [1541] Add empty alt tag to gravatar
GitHub
noreply at github.com
Mon Jun 30 16:20:47 UTC 2014
Branch: refs/heads/1764-solr-rubbish
Home: https://github.com/ckan/ckan
Commit: 839bd7e82a54a3c0ae88af5c808de0ea2941d2ee
https://github.com/ckan/ckan/commit/839bd7e82a54a3c0ae88af5c808de0ea2941d2ee
Author: Ross Jones <ross at servercode.co.uk>
Date: 2014-02-28 (Fri, 28 Feb 2014)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[1541] Add empty alt tag to gravatar
Commit: f65718314e07918b45655f7332d9ef638a6e9262
https://github.com/ckan/ckan/commit/f65718314e07918b45655f7332d9ef638a6e9262
Author: nigelb <nigel.babu at okfn.org>
Date: 2014-04-14 (Mon, 14 Apr 2014)
Changed paths:
M ckan/config/routing.py
M ckan/templates/admin/base.html
A ckan/templates/admin/trash.html
Log Message:
-----------
[#1539] Create a minimal new Trash page
Commit: 73b1242d1c7f3f6d7956b2e598136bac67b299ba
https://github.com/ckan/ckan/commit/73b1242d1c7f3f6d7956b2e598136bac67b299ba
Author: amercader <amercadero at gmail.com>
Date: 2014-04-17 (Thu, 17 Apr 2014)
Changed paths:
M ckanext/datastore/logic/auth.py
M ckanext/datastore/tests/test_create.py
Log Message:
-----------
[#1652] Fix auth when creating a DataStore resource directly
If you provided a dataset id on datastore_create to create the resource
directly, the auth functions failed as they expected a resource. This
changes the datastore_create auth function to use package_update instead
of resource_update if that is the case.
Commit: 9ea722e56d4308a7509e49e300877f343b657aeb
https://github.com/ckan/ckan/commit/9ea722e56d4308a7509e49e300877f343b657aeb
Author: Ian Ward <ian at excess.org>
Date: 2014-04-23 (Wed, 23 Apr 2014)
Changed paths:
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
Log Message:
-----------
[#1664] package_create+update: fix config permission check
Use the same permission checks for both package_update and package_create
and check all the applicable config options: anon_create_dataset,
create_unowned_dataset and create_dataset_if_not_in_organization
Commit: 09100bab306ee9df3ec740ac88ba18136a3476de
https://github.com/ckan/ckan/commit/09100bab306ee9df3ec740ac88ba18136a3476de
Author: nigelb <nigel.babu at okfn.org>
Date: 2014-04-24 (Thu, 24 Apr 2014)
Changed paths:
M ckanext/datapusher/plugin.py
Log Message:
-----------
Catch exception in DataPusher
Fixes #1666
Commit: f685c5a025dd2855c18a5c57d38ae79fa192342a
https://github.com/ckan/ckan/commit/f685c5a025dd2855c18a5c57d38ae79fa192342a
Author: Aníbal Pacheco <anibal.pacheco at agesic.gub.uy>
Date: 2014-04-24 (Thu, 24 Apr 2014)
Changed paths:
M ckan/templates_legacy/layout_base.html
M ckan/templates_legacy/package/search.html
Log Message:
-----------
Fix link for api docs, issue #1670
Commit: dc67b3d184ee10b2ddd98f50d55f2f81adb5a672
https://github.com/ckan/ckan/commit/dc67b3d184ee10b2ddd98f50d55f2f81adb5a672
Author: Aníbal Pacheco <anibal.pacheco at agesic.gub.uy>
Date: 2014-04-24 (Thu, 24 Apr 2014)
Changed paths:
M ckan/templates/footer.html
Log Message:
-----------
Fix link for api docs in the footer template, issue #1670
Commit: 8a5f4f3740ef15ec596328335eed053c3167cfba
https://github.com/ckan/ckan/commit/8a5f4f3740ef15ec596328335eed053c3167cfba
Author: nigelb <nigel.babu at okfn.org>
Date: 2014-04-28 (Mon, 28 Apr 2014)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Catch NotFound error in resources page
Commit: a29feb5649391a1967dc39ad03b4d0a40ae9f94e
https://github.com/ckan/ckan/commit/a29feb5649391a1967dc39ad03b4d0a40ae9f94e
Author: nigelb <nigel.babu at okfn.org>
Date: 2014-05-07 (Wed, 07 May 2014)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#1668] Show only active users on cli
Commit: 95880e3049c608ab3b791389390604ec0c5d5726
https://github.com/ckan/ckan/commit/95880e3049c608ab3b791389390604ec0c5d5726
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#1721] log the user in programmatically after registration
Commit: 3561649b15256bc0a2500f02924b158f5bbaee99
https://github.com/ckan/ckan/commit/3561649b15256bc0a2500f02924b158f5bbaee99
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#1721] pep8
Commit: f7ef56da271c580f5e617fe3b57ae41896ccd91c
https://github.com/ckan/ckan/commit/f7ef56da271c580f5e617fe3b57ae41896ccd91c
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2014-05-19 (Mon, 19 May 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#1721] leave username as unicode string
Fix so old user tests pass, not that we allow unicode usernames anyway
Commit: 33d1971b2ebf3e95523f58a99c12e65bfb590783
https://github.com/ckan/ckan/commit/33d1971b2ebf3e95523f58a99c12e65bfb590783
Author: amercader <amercadero at gmail.com>
Date: 2014-05-19 (Mon, 19 May 2014)
Changed paths:
M README.rst
M ckan/config/middleware.py
M ckan/lib/helpers.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/new_authz.py
M ckan/new_tests/factories.py
M ckan/new_tests/logic/action/test_create.py
M ckan/new_tests/logic/test_validators.py
A ckan/new_tests/test_factories.py
M ckan/plugins/interfaces.py
M ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
A ckan/public/base/vendor/select2/.gitignore
A ckan/public/base/vendor/select2/LICENSE
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/bower.json
A ckan/public/base/vendor/select2/component.json
A ckan/public/base/vendor/select2/composer.json
A ckan/public/base/vendor/select2/package.json
A ckan/public/base/vendor/select2/release.sh
A ckan/public/base/vendor/select2/select2-bootstrap.css
M ckan/public/base/vendor/select2/select2.css
A ckan/public/base/vendor/select2/select2.jquery.json
M ckan/public/base/vendor/select2/select2.js
M ckan/public/base/vendor/select2/select2.min.js
A ckan/public/base/vendor/select2/select2_locale_ar.js
A ckan/public/base/vendor/select2/select2_locale_bg.js
A ckan/public/base/vendor/select2/select2_locale_ca.js
A ckan/public/base/vendor/select2/select2_locale_cs.js
A ckan/public/base/vendor/select2/select2_locale_da.js
A ckan/public/base/vendor/select2/select2_locale_de.js
A ckan/public/base/vendor/select2/select2_locale_el.js
A ckan/public/base/vendor/select2/select2_locale_en.js.template
A ckan/public/base/vendor/select2/select2_locale_es.js
A ckan/public/base/vendor/select2/select2_locale_et.js
A ckan/public/base/vendor/select2/select2_locale_eu.js
A ckan/public/base/vendor/select2/select2_locale_fa.js
A ckan/public/base/vendor/select2/select2_locale_fi.js
A ckan/public/base/vendor/select2/select2_locale_fr.js
A ckan/public/base/vendor/select2/select2_locale_gl.js
A ckan/public/base/vendor/select2/select2_locale_he.js
A ckan/public/base/vendor/select2/select2_locale_hr.js
A ckan/public/base/vendor/select2/select2_locale_hu.js
A ckan/public/base/vendor/select2/select2_locale_id.js
A ckan/public/base/vendor/select2/select2_locale_is.js
A ckan/public/base/vendor/select2/select2_locale_it.js
A ckan/public/base/vendor/select2/select2_locale_ja.js
A ckan/public/base/vendor/select2/select2_locale_ka.js
A ckan/public/base/vendor/select2/select2_locale_ko.js
A ckan/public/base/vendor/select2/select2_locale_lt.js
A ckan/public/base/vendor/select2/select2_locale_lv.js
A ckan/public/base/vendor/select2/select2_locale_mk.js
A ckan/public/base/vendor/select2/select2_locale_ms.js
A ckan/public/base/vendor/select2/select2_locale_nl.js
A ckan/public/base/vendor/select2/select2_locale_no.js
A ckan/public/base/vendor/select2/select2_locale_pl.js
A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
A ckan/public/base/vendor/select2/select2_locale_ro.js
A ckan/public/base/vendor/select2/select2_locale_rs.js
A ckan/public/base/vendor/select2/select2_locale_ru.js
A ckan/public/base/vendor/select2/select2_locale_sk.js
A ckan/public/base/vendor/select2/select2_locale_sv.js
A ckan/public/base/vendor/select2/select2_locale_th.js
A ckan/public/base/vendor/select2/select2_locale_tr.js
A ckan/public/base/vendor/select2/select2_locale_uk.js
A ckan/public/base/vendor/select2/select2_locale_vi.js
A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
M ckan/templates/footer.html
M ckan/templates/home/snippets/search.html
M ckan/templates/macros/form.html
M ckan/templates/package/read_base.html
M ckan/templates/snippets/license.html
M ckan/templates/user/snippets/recaptcha.html
M ckanext/stats/__init__.py
M doc/contributing/pull-requests.rst
M doc/contributing/test.rst
M doc/contributing/testing.rst
M doc/images/add_dataset_3.jpg
M doc/maintaining/installing/deployment.rst
M doc/user-guide.rst
Log Message:
-----------
Merge branch 'master' into 1652-datastore-resources-auth
Commit: 31dcb2cbbd09eab1cf30a0d6632fd814f285431c
https://github.com/ckan/ckan/commit/31dcb2cbbd09eab1cf30a0d6632fd814f285431c
Author: amercader <amercadero at gmail.com>
Date: 2014-05-19 (Mon, 19 May 2014)
Changed paths:
M ckanext/datastore/tests/test_create.py
Log Message:
-----------
[#1652] Fix dodgy test
Commit: cff83a8c58a2c35725c3389a3ab4fa41c090b413
https://github.com/ckan/ckan/commit/cff83a8c58a2c35725c3389a3ab4fa41c090b413
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-05-21 (Wed, 21 May 2014)
Changed paths:
M doc/theming/best-practices.rst
Log Message:
-----------
[#1694] Document using extra_vars over c
Commit: da0d62ca078172fced95a5fdfe40f997e419cc3b
https://github.com/ckan/ckan/commit/da0d62ca078172fced95a5fdfe40f997e419cc3b
Author: Ian Ward <ian at excess.org>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
M doc/contributing/python.rst
Log Message:
-----------
[#1745] remove lie about python 3 string formatting
Commit: 6b7601491049bfaa3c4b6aab842f520c27f1a2b7
https://github.com/ckan/ckan/commit/6b7601491049bfaa3c4b6aab842f520c27f1a2b7
Author: Ian Ward <ian at excess.org>
Date: 2014-06-04 (Wed, 04 Jun 2014)
Changed paths:
M doc/contributing/python.rst
Log Message:
-----------
[#1745] nothing wrong with from module import name
Commit: 050c4fac4f8c3c23d32cd4cd676b13c8cca3ebd3
https://github.com/ckan/ckan/commit/050c4fac4f8c3c23d32cd4cd676b13c8cca3ebd3
Author: Ian Ward <ian at excess.org>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M ckan/tests/test_coding_standards.py
M doc/contributing/python.rst
Log Message:
-----------
[#1745] recommend from module import name
Commit: 63a8492f57025f6c6d64e000fd4a6a26a56a3aa8
https://github.com/ckan/ckan/commit/63a8492f57025f6c6d64e000fd4a6a26a56a3aa8
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
A Dockerfile
A contrib/docker/nginx.conf
A contrib/docker/svc/ckan/run
A contrib/docker/svc/nginx/run
Log Message:
-----------
Add Dockerfile for building a CKAN 2.2 image
This commit adds a Dockerfile and support files (including nginx and
runit configuration) for a binary CKAN 2.2 docker image.
Specifically, this allows you to build a docker image including CKAN
2.2, running behind nginx and gunicorn, by running
docker build .
For example, to build an image called ckan/ckan tagged at version 2.2,
you might run
docker build -t ckan/ckan:2.2 .
The resulting image contains only CKAN, with a nearly vanilla
configuration. In order to use it, you must do one of two things. You
can either use the vanilla configuration as-is, and this requires that
you specify the location of a Postgres database and a Solr core on
startup:
docker run -i -t -p 80:80 \
-e DATABASE_URL=postgres://user:pass@hostname/db \
-e SOLR_URL=http://hostname:8983/solr/ckan_default \
ckan/ckan:2.2
This will run CKAN, connect to the database, and initialise it if need
be. Configuring Solr will have to be done separately.
Alternatively, you can use this image as a base for extension. If a
configuration file is injected to /etc/ckan/default.ini, the image will
use that and ignore the DATABASE_URL and SOLR_URL environment variables.
Lastly, by default the CKAN file store is at /var/lib/ckan, and you may
well wish to mount this data volume outside the running container:
docker run ... -v /mnt/storage:/var/lib/ckan ...
Commit: 51ffc2e75ee42bab676509d0bc462f6adb0dc509
https://github.com/ckan/ckan/commit/51ffc2e75ee42bab676509d0bc462f6adb0dc509
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M Dockerfile
A contrib/docker/main.cf
M contrib/docker/svc/ckan/run
A contrib/docker/svc/postfix/run
Log Message:
-----------
Add postfix to docker image and allow configuration
This ensures that we can configure error emails from the CKAN instance
inside the container.
An optional environment variable, ERROR_EMAIL, can be set for the
container. If set, it will configure CKAN to send error emails to
$ERROR_EMAIL. If unset, no emails will be sent.
Commit: 13b4d3636c7f13bc0936dc6bc1d2a69515f7d4d6
https://github.com/ckan/ckan/commit/13b4d3636c7f13bc0936dc6bc1d2a69515f7d4d6
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M Dockerfile
A contrib/docker/apache.conf
A contrib/docker/apache.wsgi
M contrib/docker/nginx.conf
M contrib/docker/svc/ckan/run
Log Message:
-----------
Switch to mod_wsgi in preference to gunicorn
As discussed previously, we're going to change one thing at a time so
this sticks to the default installation instructions and uses mod_wsgi
to run CKAN rather than gunicorn.
Also revert paths to the defaults (/etc/ckan/default,
/usr/lib/ckan/default, etc.)
Commit: fd5172e587402ed5e1aae3e5cc1f6de4293c5dfa
https://github.com/ckan/ckan/commit/fd5172e587402ed5e1aae3e5cc1f6de4293c5dfa
Author: jared-brown <jared at opengovgear.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M doc/theming/static-files.rst
Log Message:
-----------
Fix directory trees in theming tutorial
Commit: e361ae7bd4aae66214c3c2bff77204e559e299ff
https://github.com/ckan/ckan/commit/e361ae7bd4aae66214c3c2bff77204e559e299ff
Author: jared-brown <jared at opengovgear.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M doc/theming/css.rst
Log Message:
-----------
Fix directory trees in theming tutorial
Commit: 32cdd29acb33d8df0858baeb4a90613e5f61f65f
https://github.com/ckan/ckan/commit/32cdd29acb33d8df0858baeb4a90613e5f61f65f
Author: jared-brown <jared at opengovgear.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M doc/theming/fanstatic.rst
Log Message:
-----------
Fix directory trees in theming tutorial
The tutorial was instructing learners to put files in the ckanext-example_theme, instead of ckanext-example_theme/ckanext/example_theme
Commit: 1b424da64dd570c42a6e92631a62108ccf0f91cf
https://github.com/ckan/ckan/commit/1b424da64dd570c42a6e92631a62108ccf0f91cf
Author: jared-brown <jared at opengovgear.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M doc/theming/javascript.rst
Log Message:
-----------
Fix directory trees in theming tutorial
Commit: 2d4eceb242a808f482c8fd40afe004f04e288ac2
https://github.com/ckan/ckan/commit/2d4eceb242a808f482c8fd40afe004f04e288ac2
Author: jared-brown <jared at opengovgear.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
Log Message:
-----------
Update package_item.html
Commit: a2f8d300ffb33be2df539f9ac08a822fd4397c51
https://github.com/ckan/ckan/commit/a2f8d300ffb33be2df539f9ac08a822fd4397c51
Author: jared-brown <jared at opengovgear.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
Log Message:
-----------
fix block name in theming tutorial
Commit: 9823afba3fb5dad40a5d459ddc09f8e034ae1c3f
https://github.com/ckan/ckan/commit/9823afba3fb5dad40a5d459ddc09f8e034ae1c3f
Author: jared-brown <jared at opengovgear.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
Log Message:
-----------
Fix block names in example_theme
Commit: 354451e39bf0c76d4e45e46199832e28485f308a
https://github.com/ckan/ckan/commit/354451e39bf0c76d4e45e46199832e28485f308a
Author: jared-brown <jared at opengovgear.com>
Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths:
M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
Log Message:
-----------
Fix block names in example_theme
Commit: 9a7502449e40bc540960990e718adf80f9a9d78b
https://github.com/ckan/ckan/commit/9a7502449e40bc540960990e718adf80f9a9d78b
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
A ckan/config/solr/Dockerfile
Log Message:
-----------
Add a Dockerfile for a simple CKAN Solr container
This adds a Dockerfile which can build a simple container running Solr
4.8.1 with a "ckan" core which uses the schema from the ckan/config/solr
directory.
Commit: 5baa9e968fc750c2861efe162a96bcb2d87e9172
https://github.com/ckan/ckan/commit/5baa9e968fc750c2861efe162a96bcb2d87e9172
Author: amercader <amercadero at gmail.com>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M ckan/templates/package/snippets/resources_list.html
Log Message:
-----------
[#1766] Don't show 'add some resources' link if not auhtorized
Commit: 4dd343803e515c8ae74d5965afa2f1ffcadcedde
https://github.com/ckan/ckan/commit/4dd343803e515c8ae74d5965afa2f1ffcadcedde
Author: amercader <amercadero at gmail.com>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#1766] Check access on new resource page
Add auth check to the `new_resource` action on the package controller so
the form is not shown to unauthorized users.
Commit: 88f0cf9c4347ec6062e6a0cc6f137fc5f3888fbd
https://github.com/ckan/ckan/commit/88f0cf9c4347ec6062e6a0cc6f137fc5f3888fbd
Author: Ian Ward <ian at excess.org>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M doc/contributing/python.rst
A doc/images/ckan_importing_diagram.graphml
A doc/images/ckan_importing_diagram.png
Log Message:
-----------
[#1745] add importing diagram to imports section of coding guidelines
Commit: 070325076ad65dc9ac21b01f4a02550646beb425
https://github.com/ckan/ckan/commit/070325076ad65dc9ac21b01f4a02550646beb425
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths:
M ckanext/datastore/logic/auth.py
M ckanext/datastore/tests/test_create.py
Log Message:
-----------
Merge pull request #1652 from ckan/1652-datastore-resources-auth
Creating a DataStore resource with the package_id fails for a normal user
Commit: baca61be40b506c9b1ad9e9bdee3bd5a2b7a6878
https://github.com/ckan/ckan/commit/baca61be40b506c9b1ad9e9bdee3bd5a2b7a6878
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths:
M doc/theming/best-practices.rst
Log Message:
-----------
Merge pull request #1694 from ckan/1694-document-extra-vars-over-c
Document using extra_vars instead of c
Commit: fde7096b219891792851faa6a922eee5e30713e8
https://github.com/ckan/ckan/commit/fde7096b219891792851faa6a922eee5e30713e8
Author: Ian Ward <ian at excess.org>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
M ckan/config/middleware.py
M ckan/controllers/related.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/action/test_create.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/test_validators.py
M ckan/plugins/interfaces.py
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
M ckan/public/base/vendor/jquery.min.js
A ckan/public/base/vendor/select2/.gitignore
A ckan/public/base/vendor/select2/LICENSE
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/bower.json
A ckan/public/base/vendor/select2/component.json
A ckan/public/base/vendor/select2/composer.json
A ckan/public/base/vendor/select2/package.json
A ckan/public/base/vendor/select2/release.sh
A ckan/public/base/vendor/select2/select2-bootstrap.css
M ckan/public/base/vendor/select2/select2.css
A ckan/public/base/vendor/select2/select2.jquery.json
M ckan/public/base/vendor/select2/select2.js
M ckan/public/base/vendor/select2/select2.min.js
A ckan/public/base/vendor/select2/select2_locale_ar.js
A ckan/public/base/vendor/select2/select2_locale_bg.js
A ckan/public/base/vendor/select2/select2_locale_ca.js
A ckan/public/base/vendor/select2/select2_locale_cs.js
A ckan/public/base/vendor/select2/select2_locale_da.js
A ckan/public/base/vendor/select2/select2_locale_de.js
A ckan/public/base/vendor/select2/select2_locale_el.js
A ckan/public/base/vendor/select2/select2_locale_en.js.template
A ckan/public/base/vendor/select2/select2_locale_es.js
A ckan/public/base/vendor/select2/select2_locale_et.js
A ckan/public/base/vendor/select2/select2_locale_eu.js
A ckan/public/base/vendor/select2/select2_locale_fa.js
A ckan/public/base/vendor/select2/select2_locale_fi.js
A ckan/public/base/vendor/select2/select2_locale_fr.js
A ckan/public/base/vendor/select2/select2_locale_gl.js
A ckan/public/base/vendor/select2/select2_locale_he.js
A ckan/public/base/vendor/select2/select2_locale_hr.js
A ckan/public/base/vendor/select2/select2_locale_hu.js
A ckan/public/base/vendor/select2/select2_locale_id.js
A ckan/public/base/vendor/select2/select2_locale_is.js
A ckan/public/base/vendor/select2/select2_locale_it.js
A ckan/public/base/vendor/select2/select2_locale_ja.js
A ckan/public/base/vendor/select2/select2_locale_ka.js
A ckan/public/base/vendor/select2/select2_locale_ko.js
A ckan/public/base/vendor/select2/select2_locale_lt.js
A ckan/public/base/vendor/select2/select2_locale_lv.js
A ckan/public/base/vendor/select2/select2_locale_mk.js
A ckan/public/base/vendor/select2/select2_locale_ms.js
A ckan/public/base/vendor/select2/select2_locale_nl.js
A ckan/public/base/vendor/select2/select2_locale_no.js
A ckan/public/base/vendor/select2/select2_locale_pl.js
A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
A ckan/public/base/vendor/select2/select2_locale_ro.js
A ckan/public/base/vendor/select2/select2_locale_rs.js
A ckan/public/base/vendor/select2/select2_locale_ru.js
A ckan/public/base/vendor/select2/select2_locale_sk.js
A ckan/public/base/vendor/select2/select2_locale_sv.js
A ckan/public/base/vendor/select2/select2_locale_th.js
A ckan/public/base/vendor/select2/select2_locale_tr.js
A ckan/public/base/vendor/select2/select2_locale_uk.js
A ckan/public/base/vendor/select2/select2_locale_vi.js
A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
M ckan/templates/footer.html
M ckan/templates/macros/form.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/page.html
M ckan/templates/snippets/license.html
M ckan/templates/user/snippets/recaptcha.html
M ckan/tests/functional/test_tracking.py
M ckan/tests/test_coding_standards.py
M ckanext/datastore/bin/datastore_setup.py
M ckanext/datastore/commands.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/tests/test_create.py
M ckanext/example_idatasetform/plugin.py
A ckanext/example_idatasetform/plugin_v1.py
A ckanext/example_idatasetform/plugin_v2.py
A ckanext/example_idatasetform/plugin_v3.py
A ckanext/example_idatasetform/plugin_v4.py
A ckanext/example_idatasetform/templates/package/search.html
A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
A ckanext/example_idatasetform/tests/__init__.py
A ckanext/example_idatasetform/tests/test_example_idatasetform.py
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/stats/__init__.py
M doc/contributing/architecture.rst
M doc/contributing/pull-requests.rst
M doc/contributing/test.rst
M doc/contributing/testing.rst
A doc/extensions/adding-custom-fields.rst
M doc/extensions/index.rst
M doc/images/add_dataset_3.jpg
M doc/maintaining/installing/deployment.rst
M doc/theming/best-practices.rst
M doc/theming/static-files.rst
M doc/user-guide.rst
M setup.py
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into fix-package-permissions
Commit: 746cfc56eb1881a0d0b53191fd44405272f1fa04
https://github.com/ckan/ckan/commit/746cfc56eb1881a0d0b53191fd44405272f1fa04
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1665] Add new_tests.helpers.change_config() decorator
This allows you to temporarily change a CKAN's config value during a test.
It'll restore the values to what they were before, after you test is ran.
Conflicts:
ckan/new_tests/helpers.py
Commit: 318891ef87fb95f91210ed6d8885af4529d1f232
https://github.com/ckan/ckan/commit/318891ef87fb95f91210ed6d8885af4529d1f232
Author: Ian Ward <ian at excess.org>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1664] clear auth functions cache when changing config
Commit: 66fec03d6acf38f97d192dec55e834f8be518835
https://github.com/ckan/ckan/commit/66fec03d6acf38f97d192dec55e834f8be518835
Author: Ian Ward <ian at excess.org>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M ckan/new_tests/logic/auth/test_create.py
Log Message:
-----------
[#1664] tests for anon users
Commit: 64fd260e20508d25eb4fb3e67db7f2627784daf1
https://github.com/ckan/ckan/commit/64fd260e20508d25eb4fb3e67db7f2627784daf1
Author: Ian Ward <ian at excess.org>
Date: 2014-06-16 (Mon, 16 Jun 2014)
Changed paths:
M ckan/new_tests/logic/auth/test_create.py
Log Message:
-----------
[#1664] tests for logged in users
Commit: 70c63ab2fde30ea545a34ca29bf88590db0ead3f
https://github.com/ckan/ckan/commit/70c63ab2fde30ea545a34ca29bf88590db0ead3f
Author: Ian Ward <ian at excess.org>
Date: 2014-06-16 (Mon, 16 Jun 2014)
Changed paths:
M ckan/new_tests/logic/auth/test_create.py
Log Message:
-----------
[#1664] fix tests
Commit: 3564807cb450d54b80541b69a0cba0a97d55b544
https://github.com/ckan/ckan/commit/3564807cb450d54b80541b69a0cba0a97d55b544
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/snippets/resources_list.html
Log Message:
-----------
Merge pull request #1766 from ckan/1766-resource-create-link
"Add some resources" link shown to unauthorized users
Commit: 213111f365cb2960daa12e559db28d4d3a20b262
https://github.com/ckan/ckan/commit/213111f365cb2960daa12e559db28d4d3a20b262
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
Merge pull request #1721 from joetsoi/1721-login-after-userreg
Programatically log user in after registration
Commit: 7546504195498439c723517f6f7b3d5aef7341ed
https://github.com/ckan/ckan/commit/7546504195498439c723517f6f7b3d5aef7341ed
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths:
M doc/maintaining/installing/index.rst
A doc/maintaining/installing/install-using-docker.rst
Log Message:
-----------
Add documentation on installing with Docker
Adds a page to the installation documentation explaining how to use and
customise the Docker image. Note that not all of the commands listed
here will work until we merge the Dockerfile and configure the building
of the image on the Docker Hub.
Commit: b4eb7e1a9237439a0f6f63575ad09cb08e121073
https://github.com/ckan/ckan/commit/b4eb7e1a9237439a0f6f63575ad09cb08e121073
Author: Sean Hammond <seanh at users.noreply.github.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
Log Message:
-----------
Merge pull request #1761 from jared-brown/master
Fix block names in example_theme
Commit: 4151473170b04dd9d7d4ec51e14e07c86142b4d5
https://github.com/ckan/ckan/commit/4151473170b04dd9d7d4ec51e14e07c86142b4d5
Author: Sean Hammond <seanh at users.noreply.github.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M doc/theming/javascript.rst
Log Message:
-----------
Merge pull request #1760 from jared-brown/patch-6
Fix directory trees in theming tutorial
Commit: 3f432ef4518e4faac59df938cf82bd17c38a92d3
https://github.com/ckan/ckan/commit/3f432ef4518e4faac59df938cf82bd17c38a92d3
Author: Sean Hammond <seanh at users.noreply.github.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M doc/theming/fanstatic.rst
Log Message:
-----------
Merge pull request #1759 from jared-brown/patch-5
Fix directory trees in theming tutorial fanstatic page
Commit: 58dfb8bba6e2ff833d7a144929f13be3c099647a
https://github.com/ckan/ckan/commit/58dfb8bba6e2ff833d7a144929f13be3c099647a
Author: Sean Hammond <seanh at users.noreply.github.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M doc/theming/css.rst
Log Message:
-----------
Merge pull request #1758 from jared-brown/patch-3
Fix directory trees in theming tutorial css page
Commit: 1a678d914591ce3b41f45f8b2d60b21f331c5ca9
https://github.com/ckan/ckan/commit/1a678d914591ce3b41f45f8b2d60b21f331c5ca9
Author: Sean Hammond <seanh at users.noreply.github.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M doc/theming/static-files.rst
Log Message:
-----------
Merge pull request #1757 from jared-brown/patch-2
Fix directory trees in theming tutorial static files
Commit: 68ab7d5fb1e500777a160cba510f1e4181f34119
https://github.com/ckan/ckan/commit/68ab7d5fb1e500777a160cba510f1e4181f34119
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths:
M ckan/templates/footer.html
M ckan/templates_legacy/layout_base.html
M ckan/templates_legacy/package/search.html
Log Message:
-----------
Merge pull request #1671 from anibalpacheco/1670-broken-api-docs-link
[#1670] Broken API docs link
Commit: 748c1fb6dda03300a61188165527f4e6ca31460f
https://github.com/ckan/ckan/commit/748c1fb6dda03300a61188165527f4e6ca31460f
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-20 (Fri, 20 Jun 2014)
Changed paths:
R ckanext/datastore/bin/__init__.py
R ckanext/datastore/bin/datastore_setup.py
R ckanext/datastore/bin/set_permissions.sql
M ckanext/datastore/commands.py
A ckanext/datastore/set_permissions.sql
M doc/maintaining/datastore.rst
Log Message:
-----------
datastore: Rationalise set-permissions command
This commit reduces the number of distinct ways of setting db
permissions from three to two (and both use the same paster command),
while simultaneously making it possible to set permissions on remote
database servers without having to manually edit SQL.
The three mechanisms of doing this before were:
1) Run a paster command "set-permissions", which shelled out to
2) A script in `ckanext/datastore/bin`, which shelled out to
"sudo -u postgres psql ..." and piped in a prefilled version of
3) An SQL template script
The options available for passing through to `psql` did not extend to
setting remote host names, which meant that the only option for
configuring permissions on remote database servers was:
- copy the SQL template script to the remote server
- manually fill in the template parameters (despite the fact they're
already in the config file)
- execute the SQL
This commit replaces these with two basic ways of setting permissions,
both of which use the "set-permissions" paster command. The script in
`ckanext/datastore/bin` has gone.
You can now either run simply:
paster datastore set-permissions
Which will emit the correct SQL to STDOUT, allowing you to either pipe
it to a local `psql`:
paster datastore set-permissions | sudo -u postgres psql
Or pipe it to a remote `psql`
paster datastore set-permissions | ssh postgres at dbserver psql
Or, finally, you can ask the paste script to connect directly to the
database to run the SQL. This isn't ideal, as it implies you have
network access to a superuser account on the database, but it will make
life easier in development:
paster datastore set-permissions -- -x
The unfortunate extra "--" is due to the fact that ckan.lib.cli is
insane. It's not possible to provide --options to subcommands without
it, as paster rather wants them all for itself, and will complain if it
sees options it doesn't recognise. By terminating the options list with
"--", paster treats these as extra args, and we can use them in the
subcommand.
Commit: 71b367f4aad5ac06b021ff4c757cf99ac202c313
https://github.com/ckan/ckan/commit/71b367f4aad5ac06b021ff4c757cf99ac202c313
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-20 (Fri, 20 Jun 2014)
Changed paths:
M bin/travis-install-dependencies
Log Message:
-----------
travis-install-dependencies: use new set-permissions
Commit: c0925818ec7c099925fa1af41e8427072132242d
https://github.com/ckan/ckan/commit/c0925818ec7c099925fa1af41e8427072132242d
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
R ckan/config/solr/Dockerfile
A contrib/docker/postgresql/Dockerfile
A contrib/docker/solr/Dockerfile
A contrib/docker/solr/schema.xml
M contrib/docker/svc/ckan/run
M doc/maintaining/installing/install-using-docker.rst
Log Message:
-----------
Update instructions to use containerised Solr/Pg by default
Getting CKAN to talk to Postgres and Solr on the Docker host is
perfectly possible, but explaining how to set up appropriate routes in
iptables is outside the scope of the CKAN installation docs.
This commit updates the CKAN run script to support connection to Pg and
Solr through Docker links, and updates the documentation accordingly.
Commit: e3ae168293f3660509aa90f2e68b43af455529c8
https://github.com/ckan/ckan/commit/e3ae168293f3660509aa90f2e68b43af455529c8
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M ckanext/datastore/commands.py
M ckanext/datastore/set_permissions.sql
M doc/maintaining/datastore.rst
Log Message:
-----------
datastore: Simplify set-permissions even further
This commit removes the ability for CKAN to execute the permissions
script for you. Why?
1. It's unnecessary. You can almost always pipe the script into a psql
shell, regardless of the location of your database server. If you
can't, then the only way that CKAN is going to be able to help is by
connecting over the network. See point 2.
2. It encourages a setup in which you can connect to your database as a
superuser over the network. This is a Bad Idea.
3. It adds substantial complication to the set-permissions command.
Commit: 16418ecd9fb5ecd341209f49a2783895a8cce199
https://github.com/ckan/ckan/commit/16418ecd9fb5ecd341209f49a2783895a8cce199
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M ckanext/datastore/set_permissions.sql
Log Message:
-----------
datastore: Explicitly connect to datastore DB in set-permissions
See comment in set_permissions.sql
Commit: 74a33767f33da960465981fb40b04d752ad75d3b
https://github.com/ckan/ckan/commit/74a33767f33da960465981fb40b04d752ad75d3b
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M contrib/docker/svc/postfix/run
Log Message:
-----------
docker: Initialise postfix correctly
Postfix initialisation is a bit more complicated than the service file assumed
and doesn't actually work due to pieces missing from the chroot. Delegate to
the sysv init script and tail the log to keep the process running.
This is potentially a problem if postfix crashes and doesn't come back, but I
reckon finding a crashing bug in postfix is a few orders of magnitude less
likely than finding a similar bug in CKAN.
Commit: a6fbeb8bbc244ce69a34174a3c79d4aa4083cf05
https://github.com/ckan/ckan/commit/a6fbeb8bbc244ce69a34174a3c79d4aa4083cf05
Author: amercader <amercadero at gmail.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ckan/templates/admin/trash.html
Log Message:
-----------
[#1539] Fix typo
Commit: c41f0cf23c88f25461a51175c9201ef95a379ccd
https://github.com/ckan/ckan/commit/c41f0cf23c88f25461a51175c9201ef95a379ccd
Author: amercader <amercadero at gmail.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ckan/config/routing.py
M ckan/templates/admin/base.html
A ckan/templates/admin/trash.html
Log Message:
-----------
Merge branch '1539-clean-trash'
Commit: 0e7696c6b31d1113b49227dd506727d6732cc175
https://github.com/ckan/ckan/commit/0e7696c6b31d1113b49227dd506727d6732cc175
Author: amercader <amercadero at gmail.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch '1541-gravatar-alt-tag'
Commit: e5d6898a98bc401fd886a8eb3c52910f53c5c1e7
https://github.com/ckan/ckan/commit/e5d6898a98bc401fd886a8eb3c52910f53c5c1e7
Author: amercader <amercadero at gmail.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ckan/tests/test_coding_standards.py
M doc/contributing/python.rst
A doc/images/ckan_importing_diagram.graphml
A doc/images/ckan_importing_diagram.png
Log Message:
-----------
Merge branch '1745-python-coding-standards' of https://github.com/wardi/ckan into wardi-1745-python-coding-standards
Commit: b1e5a2777b6fb93132d78b23763e071e0a166276
https://github.com/ckan/ckan/commit/b1e5a2777b6fb93132d78b23763e071e0a166276
Author: amercader <amercadero at gmail.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ckan/tests/test_coding_standards.py
M doc/contributing/python.rst
A doc/images/ckan_importing_diagram.graphml
A doc/images/ckan_importing_diagram.png
Log Message:
-----------
Merge branch 'wardi-1745-python-coding-standards'
Commit: 24b147ff355a469ba3fd8bd74f273b332365f018
https://github.com/ckan/ckan/commit/24b147ff355a469ba3fd8bd74f273b332365f018
Author: Sean Hammond <git at seanh.cc>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
[#1793] Don't delete all cookies whose names start with "ckan"
Apparently in 2012 it was necessary (possibly only on demo.ckan.org) to
delete all cookies whose names start with "ckan".
I don't think CKAN sets any cookies today, except for the session
cookie, so this seems unnecessary now.
Deleting all cookies whose names start with "ckan" is likely to delete
cookies created by extensions that are called something like "ckanext-foo",
which is very confusing, especially because the header that deletes the
cookies comes in the /en request not in the first request for the page.
Since I don't know the specific names of the cookies this code was
intended to delete, I'm just removing the code and guessing it's no
longer needed.
Commit: 5b594ca3761fe7fa451f14cdeb25c1fb453ce18b
https://github.com/ckan/ckan/commit/5b594ca3761fe7fa451f14cdeb25c1fb453ce18b
Author: amercader <amercadero at gmail.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Merge branch '1668-deleted-users'
Commit: 4170b89898decae5be2e3bb7855d7b47569c967c
https://github.com/ckan/ckan/commit/4170b89898decae5be2e3bb7855d7b47569c967c
Author: amercader <amercadero at gmail.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/auth/test_create.py
Log Message:
-----------
Merge branch 'fix-package-permissions' of https://github.com/wardi/ckan into wardi-fix-package-permissions
Commit: ffdd089c03dfff0295ce58723cd15cbcf5a31fc1
https://github.com/ckan/ckan/commit/ffdd089c03dfff0295ce58723cd15cbcf5a31fc1
Author: amercader <amercadero at gmail.com>
Date: 2014-06-25 (Wed, 25 Jun 2014)
Changed paths:
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/auth/test_create.py
Log Message:
-----------
Merge branch 'wardi-fix-package-permissions'
Commit: 6b40b6db1463e2291a9798a2754312af5a9edeb8
https://github.com/ckan/ckan/commit/6b40b6db1463e2291a9798a2754312af5a9edeb8
Author: Joe Tsoi <joetsoi at users.noreply.github.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M bin/travis-install-dependencies
R ckanext/datastore/bin/__init__.py
R ckanext/datastore/bin/datastore_setup.py
R ckanext/datastore/bin/set_permissions.sql
M ckanext/datastore/commands.py
A ckanext/datastore/set_permissions.sql
M doc/maintaining/datastore.rst
Log Message:
-----------
Merge pull request #1786 from nickstenning/saner-set-permissions
datastore: Rationalise set-permissions command
Commit: 00413b105ac3ca57c1078420243a4cf993e99165
https://github.com/ckan/ckan/commit/00413b105ac3ca57c1078420243a4cf993e99165
Author: Joe Tsoi <joetsoi at users.noreply.github.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M ckanext/datapusher/plugin.py
Log Message:
-----------
Merge pull request #1666 from ckan/1666-datastore-perms-check
Datapusher extension throws an authorization error which it should have caught
Commit: 947737b7355c7c5b232ce2c608a174565d314830
https://github.com/ckan/ckan/commit/947737b7355c7c5b232ce2c608a174565d314830
Author: Joe Tsoi <joetsoi at users.noreply.github.com>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge pull request #1685 from ckan/dataset-resources-notfound
Catch NotFound error in resources page
Commit: ee82e01b22963c97401c2deec92179d26bcc9b1f
https://github.com/ckan/ckan/commit/ee82e01b22963c97401c2deec92179d26bcc9b1f
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M contrib/docker/nginx.conf
Log Message:
-----------
docker: Explicitly set nginx types_hash_bucket_size
As discovered by the inimitable bug-hunter @nigelbabu, on the version of
Nginx in the image, the value of types_hash_bucket_size is set at
runtime to the processor cache line size.
This means that on hardware with small cache lines (16 bytes) the image
can fail to start with:
nginx: [emerg] could not build the types_hash, you should increase
either types_hash_max_size: 1024 or types_hash_bucket_size: 32
This commit sets types_hash_bucket_size and types_hash_max_size to the
values used by latest Nginx (1.7.2 at the time of writing).
Commit: b8943a21c5c055fb6631abe690108fa64b8029d5
https://github.com/ckan/ckan/commit/b8943a21c5c055fb6631abe690108fa64b8029d5
Author: David Read <david.read at hackneyworkshop.com>
Date: 2014-06-27 (Fri, 27 Jun 2014)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
Merge pull request #1793 from ckan/1793-dont-delete-cookies
Don't delete all cookies whose names start with "ckan"
Commit: 11dd3b236c12a7ca0de9f4b1ff783ddff67305fc
https://github.com/ckan/ckan/commit/11dd3b236c12a7ca0de9f4b1ff783ddff67305fc
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M doc/maintaining/installing/install-using-docker.rst
Log Message:
-----------
docs: Add note about requirement of Docker>=1.0
The built images don't appear to work with Docker<0.10.0, in particular
not with the version of Docker that currently ships as "docker.io" in
the Ubuntu 14.04 repositories.
The install instructions do link directly to the official install docs
for Docker, which don't recommend the distro packages, but we make this
explicit now in a callout at the top of the page.
Commit: c7f8526060164f8c5d6a613d35bde719be79ed58
https://github.com/ckan/ckan/commit/c7f8526060164f8c5d6a613d35bde719be79ed58
Author: Nick Stenning <nick at whiteink.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M doc/maintaining/installing/install-using-docker.rst
Log Message:
-----------
docs: Explicitly note omission of DataStore/DataPusher
Support for these parts of CKAN will come in a future PR.
Commit: de550a7222b27fa61835526245ef34f21abe8541
https://github.com/ckan/ckan/commit/de550a7222b27fa61835526245ef34f21abe8541
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
A Dockerfile
A contrib/docker/apache.conf
A contrib/docker/apache.wsgi
A contrib/docker/main.cf
A contrib/docker/nginx.conf
A contrib/docker/postgresql/Dockerfile
A contrib/docker/solr/Dockerfile
A contrib/docker/solr/schema.xml
A contrib/docker/svc/ckan/run
A contrib/docker/svc/nginx/run
A contrib/docker/svc/postfix/run
M doc/maintaining/installing/index.rst
A doc/maintaining/installing/install-using-docker.rst
Log Message:
-----------
Merge pull request #1755 from nickstenning/docker
[#1766] Dockerfile for CKAN
Commit: 852d3752352fefbeb369ea17ec496b8de5d40c6e
https://github.com/ckan/ckan/commit/852d3752352fefbeb369ea17ec496b8de5d40c6e
Author: David Read <david.read at hackneyworkshop.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
A Dockerfile
M bin/travis-install-dependencies
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/auth/test_create.py
M ckan/templates/admin/base.html
A ckan/templates/admin/trash.html
M ckan/templates/footer.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates_legacy/layout_base.html
M ckan/templates_legacy/package/search.html
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/plugin.py
R ckanext/datastore/bin/__init__.py
R ckanext/datastore/bin/datastore_setup.py
R ckanext/datastore/bin/set_permissions.sql
M ckanext/datastore/commands.py
M ckanext/datastore/logic/auth.py
A ckanext/datastore/set_permissions.sql
M ckanext/datastore/tests/test_create.py
M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
A contrib/docker/apache.conf
A contrib/docker/apache.wsgi
A contrib/docker/main.cf
A contrib/docker/nginx.conf
A contrib/docker/postgresql/Dockerfile
A contrib/docker/solr/Dockerfile
A contrib/docker/solr/schema.xml
A contrib/docker/svc/ckan/run
A contrib/docker/svc/nginx/run
A contrib/docker/svc/postfix/run
M doc/contributing/python.rst
A doc/images/ckan_importing_diagram.graphml
A doc/images/ckan_importing_diagram.png
M doc/maintaining/datastore.rst
M doc/maintaining/installing/index.rst
A doc/maintaining/installing/install-using-docker.rst
M doc/theming/best-practices.rst
M doc/theming/css.rst
M doc/theming/fanstatic.rst
M doc/theming/javascript.rst
M doc/theming/static-files.rst
Log Message:
-----------
Merge branch 'master' of github.com:ckan/ckan into 1764-solr-rubbish
Conflicts:
ckan/new_tests/helpers.py
Compare: https://github.com/ckan/ckan/compare/fbfdbcccda41...852d3752352f
More information about the ckan-changes
mailing list