[ckan-changes] [ckan/ckan] efffd0: [#2429] Make the system info table revisioned

• Previous message: [ckan-changes] [ckan/ckan] 08343d: [#2478] Deprecate old bits for getting licence pic...
• Next message: [ckan-changes] [ckan/ckan] cab17c: Update version number
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: efffd01122b8b678f99216482ad2aab133c469b1
      https://github.com/ckan/ckan/commit/efffd01122b8b678f99216482ad2aab133c469b1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-18 (Mon, 18 May 2015)

  Changed paths:
    M ckan/lib/app_globals.py
    A ckan/migration/versions/077_add_state_to_system_info.py
    M ckan/model/__init__.py
    M ckan/model/system_info.py
    M ckan/tests/factories.py
    A ckan/tests/model/test_system_info.py

  Log Message:
  -----------
  [#2429] Make the system info table revisioned

If we are going to allow the configuration to be changed remotely it
will be useful to be able to track changes on it (when was it done,
which user did it, etc.) The best way we have now for doing is
revisioning, even though it's a pain to set up, as demonstrated by this
commit. Fields need to be added manually and the model definition is
much more complex.

Added preliminary tests.


  Commit: cdb2ef1f63acdef68a4c39aab538229c8481416e
      https://github.com/ckan/ckan/commit/cdb2ef1f63acdef68a4c39aab538229c8481416e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-18 (Mon, 18 May 2015)

  Changed paths:
    M ckan/config/environment.py
    A ckan/tests/config/test_environment.py

  Log Message:
  -----------
  Merge branch '2429-config-env-var' into 2429-remote-config


  Commit: 8ccc6b2553b59db8fab601392dfe578e20a61d62
      https://github.com/ckan/ckan/commit/8ccc6b2553b59db8fab601392dfe578e20a61d62
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#2429] Add action to update config options

`config_option_update` takes arbitrary key, value pairs and checks the
keys against a config options update schema. If some of the provided
keys are not present in the schema a ValidationError is raised. If
validation is passed, then for each key, value config option:

* It is stored on the `system_info` database table
* The `app_globals` (`g`) object is updated (this is used on templates)
* The Pylons `config` object is updated.

Returns the options set


  Commit: 332dce7232aff16d46adb7b81119718485de168a
      https://github.com/ckan/ckan/commit/332dce7232aff16d46adb7b81119718485de168a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ckan/config/environment.py
    M ckan/tests/config/test_environment.py

  Log Message:
  -----------
  Merge branch 'master' into 2429-remote-config


  Commit: 775b5a314925c3a14e9dc44d5b254f852fdcfa15
      https://github.com/ckan/ckan/commit/775b5a314925c3a14e9dc44d5b254f852fdcfa15
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ckan/migration/versions/077_add_state_to_system_info.py

  Log Message:
  -----------
  [#2429] Fix PEP8


  Commit: 89b920cf5004a6329046d8e09f6950e1338c5b04
      https://github.com/ckan/ckan/commit/89b920cf5004a6329046d8e09f6950e1338c5b04
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/plugins/interfaces.py
    M ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py

  Log Message:
  -----------
  [#2429] Add extension point for tweaking the config options schema

`IConfigurer.update_config_schema` allows to add or remove keys to the
ones that are allowed to be modified remotely, via the web UI or the
API. Defaults to ckan.logic.schema.default_update_configuration_schema


  Commit: 9e8696fd892f5eeb5eb8835713c9b20f00d0ef29
      https://github.com/ckan/ckan/commit/9e8696fd892f5eeb5eb8835713c9b20f00d0ef29
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/logic/action/update.py
    M ckan/tests/logic/action/test_update.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py

  Log Message:
  -----------
  [#2429] Only add options to app_globals if defined in there

Don't add all new config options edited via `config_option_update`
automatically to `g`.


  Commit: 9784aba03fe9690d62b3143e6b54f9109cfa8dab
      https://github.com/ckan/ckan/commit/9784aba03fe9690d62b3143e6b54f9109cfa8dab
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2429] config_option_show action.

Sysadmins can call this action with a key (eg. 'ckan.site_title') to
retrieve a config value. The value is returned either from the
system_info table of the database, or secondly, from the config object
as defined in the ini file. Only config options in the schema
whitelisted as editable will be returned. Non-editable options, or non
existing options, will return a ValidationError.


  Commit: d71abe6c0050847380e44e5fb67f499c6fbe60b5
      https://github.com/ckan/ckan/commit/d71abe6c0050847380e44e5fb67f499c6fbe60b5
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2429] config_option_list action.

Returns the whitelisted config option keys whose values can be updated
with `config_option_update`.


  Commit: 3bfee861fa17fa0d1eb634f0d7b36b3cad083890
      https://github.com/ckan/ckan/commit/3bfee861fa17fa0d1eb634f0d7b36b3cad083890
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ckan/config/environment.py
    M ckan/migration/versions/077_add_state_to_system_info.py
    M ckan/tests/config/test_environment.py

  Log Message:
  -----------
  Merge branch '2429-remote-config' of ...

github.com:ckan/ckan into 2429-remote-config

Conflicts:
	ckan/tests/config/test_environment.py


  Commit: 9c7e850e562af003b8ca2d79e83586665a9dd1a8
      https://github.com/ckan/ckan/commit/9c7e850e562af003b8ca2d79e83586665a9dd1a8
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#2429] Simplify app_globals logic, common function for config schema

In app_globals, use keys from the update_config_schema to know what
needs to be autoupdated from the db.

Move the logic to get the full update_config_schema (including
modifications from extensions) to a single function.


  Commit: a4d980c8298c6da600b90ced34078e37a99190db
      https://github.com/ckan/ckan/commit/a4d980c8298c6da600b90ced34078e37a99190db
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/templates/admin/config.html
    A ckanext/example_iconfigurer/templates/admin/config.html

  Log Message:
  -----------
  [#2429] Update admin controller to use new actions

Bring the config method of the admin controller more in line with how
the rest of form/controllers work in ckan. Call `config_option_update`
action, catch and display ValidationErrors.

Pass all editable options to the form template, even if the fields are
not displayed by default. This way extensions can add fields to the form
and these will get stored.

Added an example on how to extend the template to the example_iconfigurer
extension.


  Commit: 720d0cb3011fa3f53891878fc6b57a96333c3252
      https://github.com/ckan/ckan/commit/720d0cb3011fa3f53891878fc6b57a96333c3252
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge branch '2429-remote-config' of github.com:ckan/ckan into 2429-remote-config

Conflicts:
	ckan/logic/schema.py


  Commit: f962e1c98dfa4a8a514a3ed0fc316365910cf8ef
      https://github.com/ckan/ckan/commit/f962e1c98dfa4a8a514a3ed0fc316365910cf8ef
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2429] Change config option schema.

Use `update_configuration_schema` which ensures plugins have a
change to contribute to resulting schema dict.


  Commit: 4c79d2ede34315cc28a9b4de3c0f3f55e7415fc9
      https://github.com/ckan/ckan/commit/4c79d2ede34315cc28a9b4de3c0f3f55e7415fc9
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

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

  Log Message:
  -----------
  [#2429] Fix property name in config_option_update


  Commit: 11225f63245f9dc7a5ef16096040951f7cdf8f61
      https://github.com/ckan/ckan/commit/11225f63245f9dc7a5ef16096040951f7cdf8f61
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

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

  Log Message:
  -----------
  [#2429] Simplify config_option_show


  Commit: eae3bae75bb8930e5fca5be1f1d44eceb7faaa9e
      https://github.com/ckan/ckan/commit/eae3bae75bb8930e5fca5be1f1d44eceb7faaa9e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py

  Log Message:
  -----------
  [#2429] Fix test


  Commit: 909f8c44f2094a7c0b0b2087e1868e23e32e5682
      https://github.com/ckan/ckan/commit/909f8c44f2094a7c0b0b2087e1868e23e32e5682
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M ckan/templates/admin/config.html

  Log Message:
  -----------
  [#2429] Add form import to config template


  Commit: bf239da3df8b54131d6891f1ea0c70089d8d6770
      https://github.com/ckan/ckan/commit/bf239da3df8b54131d6891f1ea0c70089d8d6770
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py

  Log Message:
  -----------
  Merge branch '2429-remote-config' of github.com:ckan/ckan into 2429-remote-config


  Commit: 14c0b3f3392e0e5809ca620228e807e517613ea2
      https://github.com/ckan/ckan/commit/14c0b3f3392e0e5809ca620228e807e517613ea2
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    A ckan/tests/controllers/test_admin.py

  Log Message:
  -----------
  [#2429] Functional test for config option update.

Updating a config option using the admin form correctly changes the
value where expected:

* the value returned by the action `config_option_show`
* the value returned by system_info.get_system_info
* the value rendered to template title tags


  Commit: bec6aca9e0f002fa7283c8d0d57c69ad04636f82
      https://github.com/ckan/ckan/commit/bec6aca9e0f002fa7283c8d0d57c69ad04636f82
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ckan/tests/logic/auth/test_get.py

  Log Message:
  -----------
  [#2429] Small refact or test_get.py


  Commit: a322013f061c4314d59c83ac536095ea7afbfd44
      https://github.com/ckan/ckan/commit/a322013f061c4314d59c83ac536095ea7afbfd44
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#2429] config_option_* auth tests


  Commit: 9bba20cfb63d17f0b4b94508191dfaf6bf310cbd
      https://github.com/ckan/ckan/commit/9bba20cfb63d17f0b4b94508191dfaf6bf310cbd
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py

  Log Message:
  -----------
  [#2429] Add more tests for config option extension

Test that newly registered keys are returned in `config_option_list` and
`config_option_show` actions.


  Commit: 3f0062e962bfa857f715d180b9ef0d91d8a5b821
      https://github.com/ckan/ckan/commit/3f0062e962bfa857f715d180b9ef0d91d8a5b821
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2429] Add storage path and datapusher URL to env vars

Both are critical and useful to set up via env vars on cloud
environments


  Commit: a3d6988a1ebc08c51ee0b67530375886a2280b7f
      https://github.com/ckan/ckan/commit/a3d6988a1ebc08c51ee0b67530375886a2280b7f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [#2429] Cenrtalize code for setting app_globals in a single place

The logic for adding keys to app_globals was not consistenly applied
from all places. Right now this only happens in two places, in
`config_option_update` and on the `_init` [sic] method of the `_Globals`
object. There is some processing, eg casting as int or list depending on
the options of `app_globals_from_config_details`.

Cleaned up the functions on app_globals to remove model stuff.

TODO: improve the reset method.


  Commit: 960e4c374659540895daeb53b81a2b85610b661c
      https://github.com/ckan/ckan/commit/960e4c374659540895daeb53b81a2b85610b661c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ckan/config/environment.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    A ckanext/example_iconfigurer/plugin_v1.py
    A ckanext/example_iconfigurer/plugin_v2.py
    M ckanext/example_iconfigurer/templates/admin/config.html
    M doc/extensions/index.rst
    A doc/extensions/remote-config-update.rst
    A doc/images/custom_config_fields.png
    M doc/maintaining/configuration.rst
    M setup.py

  Log Message:
  -----------
  [#2429] Add documentation for remote config

* Section about env vars and runtime config editing in
  `configuration.rst`
* Env vars are pulled automatically from `environment.py`
* Tutorial for adding custom config options from an extension and adding
  fields to the admin form
* Improved action docstrings


  Commit: 4634c3ff329c798e4c85812f69f5a7978a2fe2ed
      https://github.com/ckan/ckan/commit/4634c3ff329c798e4c85812f69f5a7978a2fe2ed
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py

  Log Message:
  -----------
  Merge branch '2429-remote-config' of github.com:ckan/ckan into 2429-remote-config


  Commit: 293b803572cc4619d21dd573e2be0136772ca69f
      https://github.com/ckan/ckan/commit/293b803572cc4619d21dd573e2be0136772ca69f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    A ckan/migration/versions/077_add_revisions_to_system_info.py
    R ckan/migration/versions/077_add_state_to_system_info.py

  Log Message:
  -----------
  [#2429] Rename migration file


  Commit: 656490f68e2f780850cc1dbd5a00c133a6f02f4a
      https://github.com/ckan/ckan/commit/656490f68e2f780850cc1dbd5a00c133a6f02f4a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

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

  Log Message:
  -----------
  [#2429] Fix sphinx warning


  Commit: 5c8ff316669dc3c1d51c1502584636d085f59b72
      https://github.com/ckan/ckan/commit/5c8ff316669dc3c1d51c1502584636d085f59b72
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

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

  Log Message:
  -----------
  [#2429] Fix sphinx warning again


  Commit: 8ab19cbc2b005e3a9ff93dcea86bace9636ce71c
      https://github.com/ckan/ckan/commit/8ab19cbc2b005e3a9ff93dcea86bace9636ce71c
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-27 (Wed, 27 May 2015)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2429] Add site_url to the supported env var configuration options

This is an obvious choice, as it is likely to be involve network,
domain, etc set up.


  Commit: d8accae28f7478f820fb159fbd0042861561c1f8
      https://github.com/ckan/ckan/commit/d8accae28f7478f820fb159fbd0042861561c1f8
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/logic/action/update.py
    M doc/extensions/remote-config-update.rst

  Log Message:
  -----------
  [#2429] Typos and doc tweaks


  Commit: 3442366dbcde075e9e54900719ce57d43fcc93c2
      https://github.com/ckan/ckan/commit/3442366dbcde075e9e54900719ce57d43fcc93c2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M CHANGELOG.rst
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.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/auth/get.py
    M ckan/logic/validators.py
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/test_coding_standards.py
    R ckan/tests/legacy/test_wsgi_ckanclient.py
    R ckan/tests/legacy/wsgi_ckanclient.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/test_validators.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    M doc/api/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-source.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 2429-remote-config


  Commit: 5e4a2b5e751c2ce90052915f76998a881f05dabd
      https://github.com/ckan/ckan/commit/5e4a2b5e751c2ce90052915f76998a881f05dabd
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/plugin_v1.py
    M ckanext/example_iconfigurer/plugin_v2.py
    M doc/extensions/remote-config-update.rst
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#2429] Fix typos, improve language

Use runtime-editable config options consistently


  Commit: c64b43096f5a10035690da52b0ae354f8c4a13e1
      https://github.com/ckan/ckan/commit/c64b43096f5a10035690da52b0ae354f8c4a13e1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge branch '2429-remote-config' of github.com:ckan/ckan into 2429-remote-config

Conflicts:
	ckan/logic/action/update.py
	doc/extensions/remote-config-update.rst


  Commit: 5c916c3b180ab3fbcac3e9bfe807912da8597a0e
      https://github.com/ckan/ckan/commit/5c916c3b180ab3fbcac3e9bfe807912da8597a0e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M ckan/model/system_info.py
    M doc/extensions/remote-config-update.rst

  Log Message:
  -----------
  [#2429] Add note about system_info, typos


  Commit: 9bf61b4b2707ff943d38a4f6035114272638a42b
      https://github.com/ckan/ckan/commit/9bf61b4b2707ff943d38a4f6035114272638a42b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    A ckan/migration/versions/077_add_revisions_to_system_info.py
    M ckan/model/__init__.py
    M ckan/model/system_info.py
    M ckan/plugins/interfaces.py
    M ckan/templates/admin/config.html
    A ckan/tests/controllers/test_admin.py
    M ckan/tests/factories.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_update.py
    A ckan/tests/model/test_system_info.py
    M ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/plugin_v1.py
    A ckanext/example_iconfigurer/plugin_v2.py
    A ckanext/example_iconfigurer/templates/admin/config.html
    A ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M doc/extensions/index.rst
    A doc/extensions/remote-config-update.rst
    A doc/images/custom_config_fields.png
    M doc/maintaining/configuration.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #2429 from ckan/2429-remote-config

Remote CKAN config


Compare: https://github.com/ckan/ckan/compare/be95a53b39b9...9bf61b4b2707

• Previous message: [ckan-changes] [ckan/ckan] 08343d: [#2478] Deprecate old bits for getting licence pic...
• Next message: [ckan-changes] [ckan/ckan] cab17c: Update version number
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]