[ckan-changes] [okfn/ckan] 7a4fb0: [#2302] show logo if defined else ckan one

Mon Jul 30 09:28:52 UTC 2012

  Branch: refs/heads/2375-demo-theme-development
  Home:   https://github.com/okfn/ckan
  Commit: 7a4fb0d462983c7f69c9157952b88e42d675dae8
      https://github.com/okfn/ckan/commit/7a4fb0d462983c7f69c9157952b88e42d675dae8
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  [#2302] show logo if defined else ckan one


  Commit: 50f0a57561b587437944b69a557531a7a48e4e67
      https://github.com/okfn/ckan/commit/50f0a57561b587437944b69a557531a7a48e4e67
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/templates/base.html

  Log Message:
  -----------
  [#2302] set main_css via the global config


  Commit: f6feb1e32e19a51dcdd9858be203c06e21b939b9
      https://github.com/okfn/ckan/commit/f6feb1e32e19a51dcdd9858be203c06e21b939b9
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    A ckan/public/base/css/fuchsia.css
    A ckan/public/base/css/green.css
    A ckan/public/base/css/red.css

  Log Message:
  -----------
  [#2302] add some new style sheets


  Commit: 61fbf7f744c1f6ced9b86eadc8707943fa07542c
      https://github.com/okfn/ckan/commit/61fbf7f744c1f6ced9b86eadc8707943fa07542c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2302] make css link absolute


  Commit: 65fc06ca8709767319530b8cfc67847bff781fe0
      https://github.com/okfn/ckan/commit/65fc06ca8709767319530b8cfc67847bff781fe0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2302] css setting minor refactor


  Commit: 5e105cc99fa3bbe024116e5e264f9580c53b0ccf
      https://github.com/okfn/ckan/commit/5e105cc99fa3bbe024116e5e264f9580c53b0ccf
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/controllers/admin.py

  Log Message:
  -----------
  [#2302] General clean-up ofadmin controller


  Commit: 032b9ac4e38e27500784025d07e4fcdb61c4cfc6
      https://github.com/okfn/ckan/commit/032b9ac4e38e27500784025d07e4fcdb61c4cfc6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M CHANGELOG.txt
    M LICENSE.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/revision.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/schema.py
    M ckan/model/authz.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/meta.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
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/media.less
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/public/scripts/application.js
    A ckan/templates/admin/authz.html
    A ckan/templates/admin/index.html
    M ckan/templates/base.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.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
    A ckan/templates/snippets/internal-tracking.html
    M ckan/templates/snippets/language_selector.html
    M ckan/templates/snippets/related.html
    M ckan/templates/user/list.html
    M ckan/templates/user/read.html
    M ckan/templates_legacy/facets.html
    M ckan/templates_legacy/layout_base.html
    M ckan/tests/forms/test_authz.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/functional/test_publisher_auth.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/models/test_user.py
    M ckanext/organizations/forms.py
    M ckanext/publisher_form/templates/publisher_read.html
    M doc/coding-standards.rst
    A doc/frontend-development.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/toolkit.rst
    A jshint.json

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2302-simple-themes


  Commit: 16cb7a3e49287049f28f00818247179b7133c5b9
      https://github.com/okfn/ckan/commit/16cb7a3e49287049f28f00818247179b7133c5b9
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    A ckan/templates/admin/config.html

  Log Message:
  -----------
  [#2302] set style via form


  Commit: 48986635ae53427d29e3b46f84b219eeb0672da8
      https://github.com/okfn/ckan/commit/48986635ae53427d29e3b46f84b219eeb0672da8
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/templates/admin/config.html

  Log Message:
  -----------
  [#2302] improvements for setting css


  Commit: 1a2c4ce26180a880acf0fba62f0c0cc26c0f5cb5
      https://github.com/okfn/ckan/commit/1a2c4ce26180a880acf0fba62f0c0cc26c0f5cb5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/templates/admin/config.html
    M ckan/templates/base.html

  Log Message:
  -----------
  [#2302] allow setting of site title


  Commit: 8e8f5c6e32908f1ef59cc3ca43750941f29e75fb
      https://github.com/okfn/ckan/commit/8e8f5c6e32908f1ef59cc3ca43750941f29e75fb
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

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

  Log Message:
  -----------
  [#2302] config for improvements


  Commit: cb712108b35440fe9ec6ee0cc7dd8f2995dbc8ca
      https://github.com/okfn/ckan/commit/cb712108b35440fe9ec6ee0cc7dd8f2995dbc8ca
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/controllers/admin.py

  Log Message:
  -----------
  [#2302] only update config on post and allow setting empty values


  Commit: 14d704657281e5bc5fbd3bd5c417a3cc979f4f58
      https://github.com/okfn/ckan/commit/14d704657281e5bc5fbd3bd5c417a3cc979f4f58
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

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

  Log Message:
  -----------
  [#2302] config add tagline to form


  Commit: e5ec5e22041d52a8c4b64efc7ee74f38baa2d32d
      https://github.com/okfn/ckan/commit/e5ec5e22041d52a8c4b64efc7ee74f38baa2d32d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/templates/admin/config.html
    M ckan/templates/home/about.html

  Log Message:
  -----------
  [#2302] config add about text to form


  Commit: 08cf22f4894c7ca71ffbe359880bb00232daecd2
      https://github.com/okfn/ckan/commit/08cf22f4894c7ca71ffbe359880bb00232daecd2
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/templates/admin/config.html

  Log Message:
  -----------
  [#2302] add reset button to reset to config values


  Commit: 164d62f418b2a6e28525522ad4c2fd88eddbf643
      https://github.com/okfn/ckan/commit/164d62f418b2a6e28525522ad4c2fd88eddbf643
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2302] allow setting ckan.main_css via .ini file


  Commit: e6c0094f5aba5e119a13a0eed2f20db05c6be1cf
      https://github.com/okfn/ckan/commit/e6c0094f5aba5e119a13a0eed2f20db05c6be1cf
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M ckan/templates/home/about.html

  Log Message:
  -----------
  [#2302] only show about title if standard text


  Commit: b841878ee85db45288046e8085f84f723190d5cd
      https://github.com/okfn/ckan/commit/b841878ee85db45288046e8085f84f723190d5cd
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    A ckan/migration/versions/059_add_system_info_table.py
    M ckan/model/__init__.py
    A ckan/model/system_info.py

  Log Message:
  -----------
  [#2302] sys info table added and stores settings


  Commit: 413d3c89f413c233d29e08e1e47f4a3669195c37
      https://github.com/okfn/ckan/commit/413d3c89f413c233d29e08e1e47f4a3669195c37
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2302] add some documentation/comments


  Commit: 066bb82d72b889b7404e2faf055f5f53f7162015
      https://github.com/okfn/ckan/commit/066bb82d72b889b7404e2faf055f5f53f7162015
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/model/__init__.py
    M ckan/model/system_info.py

  Log Message:
  -----------
  [#2302] move some functions into system_info module


  Commit: e9429b85102a83d8eaace04c7cb602d4738b6479
      https://github.com/okfn/ckan/commit/e9429b85102a83d8eaace04c7cb602d4738b6479
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M ckan/lib/extract.py
    M setup.cfg
    M setup.py

  Log Message:
  -----------
  [#2750] .js i18n ripping including translate()


  Commit: 0d7779f02113d9e9c88254cc46d317a0dcc9a33c
      https://github.com/okfn/ckan/commit/0d7779f02113d9e9c88254cc46d317a0dcc9a33c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2302] update config when get/set via system_info


  Commit: 48f7bd7d5c098ca8e618c4e03830a43a04e25e07
      https://github.com/okfn/ckan/commit/48f7bd7d5c098ca8e618c4e03830a43a04e25e07
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2302] some refactoring of app globals


  Commit: b103a97d8e311625fa5aab6618d1d3c21cf4cf19
      https://github.com/okfn/ckan/commit/b103a97d8e311625fa5aab6618d1d3c21cf4cf19
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2302] rename app_globals helper function


  Commit: c3070a77b162acaa352bf075075776e18155b877
      https://github.com/okfn/ckan/commit/c3070a77b162acaa352bf075075776e18155b877
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#2302] flakes app_globals


  Commit: 90e1572ba5797a11b90c3dcea7b89b50f0b010dd
      https://github.com/okfn/ckan/commit/90e1572ba5797a11b90c3dcea7b89b50f0b010dd
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/model/system_info.py

  Log Message:
  -----------
  [#2302] flake8 model/system_info.py


  Commit: 51f994a0bd42b8daace8f2f29f6665341a31e956
      https://github.com/okfn/ckan/commit/51f994a0bd42b8daace8f2f29f6665341a31e956
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/lib/app_globals.py
    M ckan/tests/pylons_controller.py

  Log Message:
  -----------
  [#2302] remove app_global helpers from the globals object


  Commit: b4fb4135c01aa778f1937818ee07d2b33c00d0d6
      https://github.com/okfn/ckan/commit/b4fb4135c01aa778f1937818ee07d2b33c00d0d6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    A ckan/migration/versions/059_add_system_info_table.py
    M ckan/model/__init__.py
    A ckan/model/system_info.py
    M ckan/tests/pylons_controller.py

  Log Message:
  -----------
  Merge branch '2302-simple-themes' into 2375-demo-theme-development

Conflicts:
	ckan/controllers/admin.py
	ckan/lib/app_globals.py

trivial fixes


Compare: https://github.com/okfn/ckan/compare/5b78c15b4901...b4fb4135c01a