[ckan-changes] [okfn/ckan] 223a5e: [#1788][l]: Rewrote minornavigation using bootstra...

GitHub noreply at github.com
Wed Mar 28 10:33:40 UTC 2012 

  Branch: refs/heads/enhancement-2257-clean-template-vars
  Home:   https://github.com/okfn/ckan
  Commit: 223a5e55e81140bc75752f0c5a64b6a92d9febaf
      https://github.com/okfn/ckan/commit/223a5e55e81140bc75752f0c5a64b6a92d9febaf
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/group/history.html
  M ckan/templates/group/layout.html
  M ckan/templates/package/layout.html
  M ckan/templates/user/read.html

  Log Message:
  -----------
  [#1788][l]: Rewrote minornavigation using bootstrap. Simpler. Only works on Groups currently. IE7 compatible.


  Commit: cd394200a03af63b657b2a5d8b86f19b40aa3821
      https://github.com/okfn/ckan/commit/cd394200a03af63b657b2a5d8b86f19b40aa3821
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [#1788]: Restyled dropdowns too. Everything looks great in IE7. Phew.


  Commit: e69359f935f4938b3815e287d41bda4b93ae0702
      https://github.com/okfn/ckan/commit/e69359f935f4938b3815e287d41bda4b93ae0702
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/templates/group/layout.html
  M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#1788]: Tidied groups code; done User menu.


  Commit: e142366611dcddacf7ed391ee1c7fbd712cab59b
      https://github.com/okfn/ckan/commit/e142366611dcddacf7ed391ee1c7fbd712cab59b
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/controllers/authorization_group.py
  M ckan/templates/admin/layout.html
  M ckan/templates/authorization_group/layout.html
  M ckan/templates/package/form_fields.html

  Log Message:
  -----------
  [#1788]: Updated to IE7 Bootstrap compatibility: Authorization group nav; Admin nav


  Commit: efd743843b56bda3c953e899321abd7740baa953
      https://github.com/okfn/ckan/commit/efd743843b56bda3c953e899321abd7740baa953
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/templates/revision/layout.html
  M ckan/templates/revision/list.html
  M ckan/templates/user/list.html

  Log Message:
  -----------
  [#1788]: IE7 compatibility upgrades to User and Revision pages.


  Commit: 078631e36c53718457aacaa3943a2a9912820c91
      https://github.com/okfn/ckan/commit/078631e36c53718457aacaa3943a2a9912820c91
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [#1788]: Corrrectly handling existence/nonexistence of minornavigation


  Commit: e37f006dac231818ba19341524c24b16aadf5ff7
      https://github.com/okfn/ckan/commit/e37f006dac231818ba19341524c24b16aadf5ff7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/controllers/admin.py
  M ckan/lib/base.py
  M ckan/tests/functional/api/model/test_package.py

  Log Message:
  -----------
  [xs] Small, possibly temporary, change to POST handling for API calls


  Commit: 3933e3300d09563980024a973c142d7991ab8208
      https://github.com/okfn/ckan/commit/3933e3300d09563980024a973c142d7991ab8208
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M doc/i18n.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: a630fda0e8e12515c0c9429ca47af5fb6f369f56
      https://github.com/okfn/ckan/commit/a630fda0e8e12515c0c9429ca47af5fb6f369f56
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/group/layout.html
  M ckan/templates/package/history.html
  M ckan/templates/package/layout.html

  Log Message:
  -----------
  [#1788]: IE7 compatibility upgrades to Dataset pages.


  Commit: d368bbbbd5853026b620cc31a508692a169799f4
      https://github.com/okfn/ckan/commit/d368bbbbd5853026b620cc31a508692a169799f4
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/layout.html

  Log Message:
  -----------
  [#1788]: Further package fixes for IE7. JS errors solved. Edge cases repaired.


  Commit: 4a15b945e4a42687bc2d0adc7c470e8d594a0c18
      https://github.com/okfn/ckan/commit/4a15b945e4a42687bc2d0adc7c470e8d594a0c18
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#1788]: Fixed dragging on IE7; imported latest recline.js from repo.


  Commit: 21a3b1f50fb06f3692b83e26779863b3f8c168ce
      https://github.com/okfn/ckan/commit/21a3b1f50fb06f3692b83e26779863b3f8c168ce
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  A ckan/public/img/logo_64px_wide.png

  Log Message:
  -----------
  [#1788]: Created a 64px wide logo to look good on older browsers, because it doesnt need downscaling


  Commit: c7132903d0caafc2d1a4e71ff8d59ce77ee322cd
      https://github.com/okfn/ckan/commit/c7132903d0caafc2d1a4e71ff8d59ce77ee322cd
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    A ckan/public/images/dragbars.png

  Log Message:
  -----------
  [#1788]: Missing image


  Commit: efccdebc7cadcf9c53f8e22438aeb4387b1ba28e
      https://github.com/okfn/ckan/commit/efccdebc7cadcf9c53f8e22438aeb4387b1ba28e
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/css/style.css
  M ckan/public/scripts/templates.js
  M ckan/templates/group/new_group_form.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#1788]: Fixed the many markdown editors in IE7.


  Commit: 210b64b44c225441d00d25f70056461b543660d0
      https://github.com/okfn/ckan/commit/210b64b44c225441d00d25f70056461b543660d0
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/controllers/admin.py
  M ckan/lib/base.py
  M ckan/tests/functional/api/model/test_package.py

  Log Message:
  -----------
  Merge branch 'master' into feature-1788-browser-compatibility


  Commit: 0ac4e201a6255b040d39b0d0ff8cb88b13491e26
      https://github.com/okfn/ckan/commit/0ac4e201a6255b040d39b0d0ff8cb88b13491e26
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/templates/_util.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#1788]: Moved markdown editor from helpers to utilities; solved test problems


  Commit: 781fa3a4f09a93757a72c0e5b21fb74c1a9278ab
      https://github.com/okfn/ckan/commit/781fa3a4f09a93757a72c0e5b21fb74c1a9278ab
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/logic/action/get.py

  Log Message:
  -----------
  [1819] change package_show_rest to package_show when indexing


  Commit: d37198f58c3b039dde90e64d8cc7f47478e24dce
      https://github.com/okfn/ckan/commit/d37198f58c3b039dde90e64d8cc7f47478e24dce
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/lib/search/index.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [1819] make package dictize show capacity of dataset in group


  Commit: 3119a58bab86cdc3246b7a7d0318db46a2d55574
      https://github.com/okfn/ckan/commit/3119a58bab86cdc3246b7a7d0318db46a2d55574
  Author: kindly <kindly at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M bin/running_stats.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/ckan.pot
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  A ckan/i18n/lv/LC_MESSAGES/ckan.mo
  A ckan/i18n/lv/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  A ckan/i18n/sk/LC_MESSAGES/ckan.mo
  A ckan/i18n/sk/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.po
  A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
  A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
  M ckan/lib/cli.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/logic/action/get.py
  M ckan/tests/lib/test_dictization.py
  M doc/apiv3.rst

  Log Message:
  -----------
  Merge branch 'release-v1.6.1'


  Commit: 4381150126eb94e5fb5e717cca0f9e2b446bab5f
      https://github.com/okfn/ckan/commit/4381150126eb94e5fb5e717cca0f9e2b446bab5f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M bin/running_stats.py
  M ckan/config/deployment.ini_tmpl
  M ckan/controllers/authorization_group.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/ckan.pot
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  A ckan/i18n/lv/LC_MESSAGES/ckan.mo
  A ckan/i18n/lv/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  A ckan/i18n/sk/LC_MESSAGES/ckan.mo
  A ckan/i18n/sk/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.po
  A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
  A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
  M ckan/lib/cli.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/logic/action/get.py
  M ckan/public/css/style.css
  A ckan/public/images/dragbars.png
  A ckan/public/img/logo_64px_wide.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_util.html
  M ckan/templates/admin/layout.html
  M ckan/templates/authorization_group/layout.html
  M ckan/templates/group/history.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/package/form_fields.html
  M ckan/templates/package/history.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/revision/layout.html
  M ckan/templates/revision/list.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/templates/user/read.html
  M ckan/tests/lib/test_dictization.py
  M doc/apiv3.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: 1336ae5568b388fd3b742b5f7fa9041abaecacb2
      https://github.com/okfn/ckan/commit/1336ae5568b388fd3b742b5f7fa9041abaecacb2
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M ckan/lib/search/index.py

  Log Message:
  -----------
  [2255] Ensures that the capacity of the dataset group membership is indexed


  Commit: e46e3668d0a6e48e09c06aec158ef09e18d66cf7
      https://github.com/okfn/ckan/commit/e46e3668d0a6e48e09c06aec158ef09e18d66cf7
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M bin/running_stats.py
  M ckan/config/deployment.ini_tmpl
  M ckan/controllers/admin.py
  M ckan/controllers/authorization_group.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/ckan.pot
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  A ckan/i18n/lv/LC_MESSAGES/ckan.mo
  A ckan/i18n/lv/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  A ckan/i18n/sk/LC_MESSAGES/ckan.mo
  A ckan/i18n/sk/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.po
  A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
  A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
  M ckan/lib/base.py
  M ckan/lib/cli.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/logic/action/get.py
  M ckan/public/css/style.css
  A ckan/public/images/dragbars.png
  A ckan/public/img/logo_64px_wide.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_util.html
  M ckan/templates/admin/layout.html
  M ckan/templates/authorization_group/layout.html
  M ckan/templates/group/history.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/package/form_fields.html
  M ckan/templates/package/history.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/revision/layout.html
  M ckan/templates/revision/list.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/templates/user/read.html
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/lib/test_dictization.py
  M doc/apiv3.rst

  Log Message:
  -----------
  Merge branch 'master' into enhancement-2257-clean-template-vars

Conflicts:
	ckan/templates/package/layout.html


Compare: https://github.com/okfn/ckan/compare/2887edc...e46e366

More information about the ckan-changes mailing list