[ckan-changes] [okfn/ckan] 4518dd: Process config from config_details

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 4518ddb27b14e94441f182f96925e6b6eed60aba
      https://github.com/okfn/ckan/commit/4518ddb27b14e94441f182f96925e6b6eed60aba
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Process config from config_details


  Commit: 0a3ed85e344c50916b97ed22ee7be75237037d43
      https://github.com/okfn/ckan/commit/0a3ed85e344c50916b97ed22ee7be75237037d43
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  config.favicon default set in config/environment.py so fix and add comment


  Commit: a885db3005964197ae954fffeea16afc49c65ad3
      https://github.com/okfn/ckan/commit/a885db3005964197ae954fffeea16afc49c65ad3
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  add extra config options into app_globals


  Commit: 944970ab83de9de885bc543eedda20a2ed5f0880
      https://github.com/okfn/ckan/commit/944970ab83de9de885bc543eedda20a2ed5f0880
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/templates/base.html
    M ckan/templates/footer.html
    M ckan/templates/header.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html

  Log Message:
  -----------
  Change templates to use g not config for settings


  Commit: 32a7e6821688ba0445f28d27fe972caeadf141b8
      https://github.com/okfn/ckan/commit/32a7e6821688ba0445f28d27fe972caeadf141b8
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Do not give config to jinja templates


  Commit: a1389453a355c5da20060eae44d4ec7a265a48d4
      https://github.com/okfn/ckan/commit/a1389453a355c5da20060eae44d4ec7a265a48d4
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/functional/api/test_dashboard.py
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch 'master' into clean-config-from-jinja-templates


  Commit: 4adbc4ef765e44bf025cc1abd37506b3dc31e6d0
      https://github.com/okfn/ckan/commit/4adbc4ef765e44bf025cc1abd37506b3dc31e6d0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Fix globals names for recaptcha


  Commit: 60e31d28b0a28c524700d6838356631c6c69e604
      https://github.com/okfn/ckan/commit/60e31d28b0a28c524700d6838356631c6c69e604
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-02 (Sun, 02 Dec 2012)

  Changed paths:
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    M ckan/model/group.py
    M ckan/public/base/less/masthead.less
    M ckan/templates/header.html
    A ckan/templates/package/activity.html
    M ckan/templates/package/read.html
    M ckan/templates/user/dashboard.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/__init__.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/mock_publisher_auth.py
    M ckan/tests/models/test_group.py
    M doc/contributing.rst
    A doc/frontend-testing.rst
    M doc/python-coding-standards.rst
    M pip-requirements-test.txt
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into clean-config-from-jinja-templates

Conflicts:
	ckan/templates/header.html

    trivial merge

    also lib/app_globals new setting moved to new system


  Commit: 347e81ebd45203b7e5b28b7fe783e4f73b6d7483
      https://github.com/okfn/ckan/commit/347e81ebd45203b7e5b28b7fe783e4f73b6d7483
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-02 (Sun, 02 Dec 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Fix typo in comment


  Commit: b9178f6d68204af931d52069126b7abc3240bf7c
      https://github.com/okfn/ckan/commit/b9178f6d68204af931d52069126b7abc3240bf7c
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-11 (Tue, 11 Dec 2012)

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  Fixed typo in template. I suspect this never worked.


  Commit: ca58fd6b30af7d71d93563bc4995d6e748855608
      https://github.com/okfn/ckan/commit/ca58fd6b30af7d71d93563bc4995d6e748855608
  Author: John Glover <glover.john at gmail.com>
  Date:   2012-12-12 (Wed, 12 Dec 2012)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/templates/base.html
    M ckan/templates/footer.html
    M ckan/templates/header.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html

  Log Message:
  -----------
  Merge pull request #180 from okfn/clean-config-from-jinja-templates

Clean config from jinja templates


Compare: https://github.com/okfn/ckan/compare/67a6121e8c59...ca58fd6b30af