[ckan-changes] [okfn/ckan] c8c64f: [#2375] Update CSS for production

GitHub noreply at github.com
Thu Aug 16 15:25:22 UTC 2012 

  Branch: refs/heads/2375-demo-theme-development
  Home:   https://github.com/okfn/ckan
  Commit: c8c64f735b874dca363acb0431dcdc936e69b5b9
      https://github.com/okfn/ckan/commit/c8c64f735b874dca363acb0431dcdc936e69b5b9
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  [#2375] Update CSS for production


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

  Changed paths:
    M bin/less
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_tags.py
    M ckan/logic/auth/get.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/loading-spinner.gif
    A ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/confirm-delete.js
    A ckan/public/base/javascript/modules/resource-form.js
    A ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/select-switch.js
    M ckan/public/base/javascript/modules/slug-preview.js
    A ckan/public/base/javascript/notify.js
    A ckan/public/base/javascript/plugins/jquery.date-helpers.js
    A ckan/public/base/javascript/plugins/jquery.inherit.js
    A ckan/public/base/javascript/plugins/jquery.proxy-all.js
    M ckan/public/base/javascript/sandbox.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/ckan.spec.js
    A ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/modules/confirm-delete.spec.js
    A ckan/public/base/test/spec/modules/resource-form.spec.js
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    A ckan/public/base/test/spec/notify.spec.js
    A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.js
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    M ckan/public/base/test/vendor/sinon.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload-ui.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.iframe-transport.js
    A ckan/public/base/vendor/jquery.ui.widget.js
    M ckan/templates/base.html
    A ckan/templates/group/base_form_page.html
    A ckan/templates/group/confirm_delete.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/new.html
    M ckan/templates/group/new_group_form.html
    R ckan/templates/group/pages/form_page.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    A ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/new_resource.html
    R ckan/templates/package/pages/form_page.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/search.html
    A ckan/templates/package/snippets/data-api-button.html
    M ckan/templates/package/snippets/package_form.html
    A ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/page.html
    A ckan/templates/related/base_form_page.html
    M ckan/templates/related/edit.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/related/new.html
    R ckan/templates/related/pages/form.html
    R ckan/templates/related/pages/form_page.html
    A ckan/templates/related/snippets/related_form.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/scripts.html
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2375-demo-theme-stable


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/templates/package/snippets/package_form.html

  Log Message:
  -----------
  [#2691] fix 404 and stage issues on add dataset


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

  Changed paths:
    A ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/package/snippets/data-api-button.html

  Log Message:
  -----------
  [#2375] data api button

Conflicts:
	ckan/templates/package/snippets/data-api-button.html

	modeal removed by aron


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

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  auto summary in validationError

Conflicts:
	ckan/templates/package/new_package_form.html


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

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  ValidationError more cleanups


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

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  fix some other silly lines


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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  clean the validation errors in logic action


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

  Changed paths:
    M .gitignore
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    A ckan/lib/jinja_extensions.py
    R ckan/lib/jinja_tags.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/public/base/css/main.css
    R ckan/public/base/css/vendor/font-awesome-ie7.css
    R ckan/public/base/fonts/fontawesome-webfont.eot
    R ckan/public/base/fonts/fontawesome-webfont.svg
    R ckan/public/base/fonts/fontawesome-webfont.ttf
    R ckan/public/base/fonts/fontawesome-webfont.woff
    R ckan/public/base/images/bootstrap-glyphicons-halflings-white.png
    R ckan/public/base/images/bootstrap-glyphicons-halflings.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/api-info.js
    A ckan/public/base/javascript/modules/autocomplete.js
    A ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-delete.js
    M ckan/public/base/javascript/modules/select-switch.js
    A ckan/public/base/javascript/plugins/jquery.form-warning.js
    R ckan/public/base/javascript/vendor/bootstrap.js
    R ckan/public/base/javascript/vendor/html5.js
    R ckan/public/base/javascript/vendor/jquery.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/less/vendor/bootstrap/accordion.less
    R ckan/public/base/less/vendor/bootstrap/alerts.less
    R ckan/public/base/less/vendor/bootstrap/bootstrap.less
    R ckan/public/base/less/vendor/bootstrap/breadcrumbs.less
    R ckan/public/base/less/vendor/bootstrap/button-groups.less
    R ckan/public/base/less/vendor/bootstrap/buttons.less
    R ckan/public/base/less/vendor/bootstrap/carousel.less
    R ckan/public/base/less/vendor/bootstrap/close.less
    R ckan/public/base/less/vendor/bootstrap/code.less
    R ckan/public/base/less/vendor/bootstrap/component-animations.less
    R ckan/public/base/less/vendor/bootstrap/dropdowns.less
    R ckan/public/base/less/vendor/bootstrap/forms.less
    R ckan/public/base/less/vendor/bootstrap/grid.less
    R ckan/public/base/less/vendor/bootstrap/hero-unit.less
    R ckan/public/base/less/vendor/bootstrap/labels-badges.less
    R ckan/public/base/less/vendor/bootstrap/layouts.less
    R ckan/public/base/less/vendor/bootstrap/mixins.less
    R ckan/public/base/less/vendor/bootstrap/modals.less
    R ckan/public/base/less/vendor/bootstrap/navbar.less
    R ckan/public/base/less/vendor/bootstrap/navs.less
    R ckan/public/base/less/vendor/bootstrap/pager.less
    R ckan/public/base/less/vendor/bootstrap/pagination.less
    R ckan/public/base/less/vendor/bootstrap/popovers.less
    R ckan/public/base/less/vendor/bootstrap/progress-bars.less
    R ckan/public/base/less/vendor/bootstrap/reset.less
    R ckan/public/base/less/vendor/bootstrap/responsive-1200px-min.less
    R ckan/public/base/less/vendor/bootstrap/responsive-767px-max.less
    R ckan/public/base/less/vendor/bootstrap/responsive-768px-979px.less
    R ckan/public/base/less/vendor/bootstrap/responsive-navbar.less
    R ckan/public/base/less/vendor/bootstrap/responsive-utilities.less
    R ckan/public/base/less/vendor/bootstrap/responsive.less
    R ckan/public/base/less/vendor/bootstrap/scaffolding.less
    R ckan/public/base/less/vendor/bootstrap/sprites.less
    R ckan/public/base/less/vendor/bootstrap/tables.less
    R ckan/public/base/less/vendor/bootstrap/thumbnails.less
    R ckan/public/base/less/vendor/bootstrap/tooltip.less
    R ckan/public/base/less/vendor/bootstrap/type.less
    R ckan/public/base/less/vendor/bootstrap/utilities.less
    R ckan/public/base/less/vendor/bootstrap/variables.less
    R ckan/public/base/less/vendor/bootstrap/wells.less
    R ckan/public/base/less/vendor/font-awesome/font-awesome-ie7.less
    R ckan/public/base/less/vendor/font-awesome/font-awesome.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/modules/autocomplete.spec.js
    A ckan/public/base/test/spec/modules/basic-form.spec.js
    M ckan/public/base/test/spec/modules/confirm-delete.spec.js
    A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.js
    M ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.js
    M ckan/public/base/test/spec/plugins/jquery.slug.spec.js
    A ckan/public/base/vendor/bootstrap.js
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    A ckan/public/base/vendor/bootstrap/less/accordion.less
    A ckan/public/base/vendor/bootstrap/less/alerts.less
    A ckan/public/base/vendor/bootstrap/less/bootstrap.less
    A ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    A ckan/public/base/vendor/bootstrap/less/button-groups.less
    A ckan/public/base/vendor/bootstrap/less/buttons.less
    A ckan/public/base/vendor/bootstrap/less/carousel.less
    A ckan/public/base/vendor/bootstrap/less/close.less
    A ckan/public/base/vendor/bootstrap/less/code.less
    A ckan/public/base/vendor/bootstrap/less/component-animations.less
    A ckan/public/base/vendor/bootstrap/less/dropdowns.less
    A ckan/public/base/vendor/bootstrap/less/forms.less
    A ckan/public/base/vendor/bootstrap/less/grid.less
    A ckan/public/base/vendor/bootstrap/less/hero-unit.less
    A ckan/public/base/vendor/bootstrap/less/labels-badges.less
    A ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/mixins.less
    A ckan/public/base/vendor/bootstrap/less/modals.less
    A ckan/public/base/vendor/bootstrap/less/navbar.less
    A ckan/public/base/vendor/bootstrap/less/navs.less
    A ckan/public/base/vendor/bootstrap/less/pager.less
    A ckan/public/base/vendor/bootstrap/less/pagination.less
    A ckan/public/base/vendor/bootstrap/less/popovers.less
    A ckan/public/base/vendor/bootstrap/less/progress-bars.less
    A ckan/public/base/vendor/bootstrap/less/reset.less
    A ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    A ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    A ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    A ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    A ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    A ckan/public/base/vendor/bootstrap/less/responsive.less
    A ckan/public/base/vendor/bootstrap/less/scaffolding.less
    A ckan/public/base/vendor/bootstrap/less/sprites.less
    A ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/thumbnails.less
    A ckan/public/base/vendor/bootstrap/less/tooltip.less
    A ckan/public/base/vendor/bootstrap/less/type.less
    A ckan/public/base/vendor/bootstrap/less/utilities.less
    A ckan/public/base/vendor/bootstrap/less/variables.less
    A ckan/public/base/vendor/bootstrap/less/wells.less
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    A ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/html5.js
    A ckan/public/base/vendor/jed.js
    A ckan/public/base/vendor/jquery.js
    A ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.js
    A ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/spinner.gif
    A ckan/templates/admin/authz.html
    A ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/base.html
    M ckan/templates/error_document_template.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/confirm_delete.html
    A ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/data-api-button.html
    A ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/search_form.html
    A ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/language_selector.html
    M ckan/templates/snippets/scripts.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates/user/read.html
    A jshint.json
    M setup.py

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2375-demo-theme-stable

Conflicts:
	ckan/templates/ajax_snippets/api_info.html
	ckan/templates/package/snippets/data_api_button.html

minor changes should all be fine :)


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

  Changed paths:
    M ckan/templates/package/new_resource.html

  Log Message:
  -----------
  [#2747] fix breadcrumb in new resource


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

  Changed paths:
    M ckan/templates/package/new_resource.html

  Log Message:
  -----------
  [#2375] broken title fix


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2752] highlight groups main nav link on group index


  Commit: 42f4c1536ffa91498ca544e141c3a7beaf9c669a
      https://github.com/okfn/ckan/commit/42f4c1536ffa91498ca544e141c3a7beaf9c669a
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  [#2744] Give the text in the select boxes breathing room


  Commit: aca322694245f5c18dee1e44621217676368220f
      https://github.com/okfn/ckan/commit/aca322694245f5c18dee1e44621217676368220f
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/less/media.less
    M ckan/templates/user/list.html

  Log Message:
  -----------
  [#2720] Add padding around gravatars on user listing


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

  Changed paths:
    M ckan/templates/package/read.html
    M ckan/templates/snippets/related.html

  Log Message:
  -----------
  [#2754] add plus icons on dataset read


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

  Changed paths:
    M ckan/templates/user/list.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  [#2753] fix user breadcrumbs


  Commit: 1a76da45f60368245edfefc7f724703d6f14c13f
      https://github.com/okfn/ckan/commit/1a76da45f60368245edfefc7f724703d6f14c13f
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#2375] Tweak truncation in resource_read.html


  Commit: 2ac24b76f922cd12cf13ed8496c8597c95222083
      https://github.com/okfn/ckan/commit/2ac24b76f922cd12cf13ed8496c8597c95222083
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#2375] fix typo in template


  Commit: b26f3303c4f666abb7d99e04f9d2c7fd22ca495c
      https://github.com/okfn/ckan/commit/b26f3303c4f666abb7d99e04f9d2c7fd22ca495c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M CHANGELOG.txt
    M LICENSE.txt
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/html_resources/__init__.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/extract.py
    A ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/059_add_related_count_and_flag.py
    A ckan/migration/versions/060_add_system_info_table.py
    M ckan/model/__init__.py
    M ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/related.py
    M ckan/model/resource.py
    A ckan/model/system_info.py
    M ckan/new_authz.py
    A ckan/public/base/css/fuchsia.css
    A ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    A ckan/public/base/css/maroon.css
    A ckan/public/base/css/red.css
    A ckan/public/base/i18n/bg.js
    A ckan/public/base/i18n/ca.js
    A ckan/public/base/i18n/cs_CZ.js
    A ckan/public/base/i18n/de.js
    A ckan/public/base/i18n/el.js
    A ckan/public/base/i18n/es.js
    A ckan/public/base/i18n/fi.js
    A ckan/public/base/i18n/fr.js
    A ckan/public/base/i18n/hu.js
    A ckan/public/base/i18n/it.js
    A ckan/public/base/i18n/lt.js
    A ckan/public/base/i18n/lv.js
    A ckan/public/base/i18n/nl.js
    A ckan/public/base/i18n/no.js
    A ckan/public/base/i18n/pl.js
    A ckan/public/base/i18n/pt_BR.js
    A ckan/public/base/i18n/ro.js
    A ckan/public/base/i18n/ru.js
    A ckan/public/base/i18n/sk.js
    A ckan/public/base/i18n/sl.js
    A ckan/public/base/i18n/sq.js
    A ckan/public/base/i18n/sr.js
    A ckan/public/base/i18n/sr_Latn.js
    A ckan/public/base/i18n/sv.js
    A ckan/public/base/i18n/zh_TW.js
    A ckan/public/base/images/flags.png
    M ckan/public/base/javascript/client.js
    A ckan/public/base/javascript/config.ini
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/api-info.js
    M ckan/public/base/javascript/modules/autocomplete.js
    A ckan/public/base/javascript/modules/confirm-action.js
    R ckan/public/base/javascript/modules/confirm-delete.js
    A ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    A ckan/public/base/javascript/plugins/jquery.truncator.js
    M ckan/public/base/javascript/pubsub.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/primer/index.html
    M ckan/public/base/test/spec/ckan.spec.js
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/module.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    A ckan/public/base/test/spec/modules/confirm-action.spec.js
    R ckan/public/base/test/spec/modules/confirm-delete.spec.js
    A ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/test/spec/modules/related-item.spec.js
    A ckan/public/base/test/spec/pubsub.spec.js
    M ckan/public/base/vendor/html5.js
    M ckan/public/base/vendor/select2/README.md
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    A ckan/public/scripts/vendor/moment/1.6.2/moment.js
    A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    A ckan/public/scripts/vendor/recline/css/recline.css
    A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/slickgrid/images/actions.gif
    R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
    R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
    R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
    R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
    R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
    R ckan/public/scripts/vendor/slickgrid/images/down.gif
    R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
    R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/expand.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/help.png
    R ckan/public/scripts/vendor/slickgrid/images/info.gif
    R ckan/public/scripts/vendor/slickgrid/images/listview.gif
    R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
    R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
    R ckan/public/scripts/vendor/slickgrid/images/stripes.png
    R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
    R ckan/public/scripts/vendor/slickgrid/images/tick.png
    R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
    R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
    R ckan/public/scripts/vendor/slickgrid/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/slick.grid.js
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    M ckan/templates/admin/authz.html
    A ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    A ckan/templates/ajax_snippets/custom_fields.html
    A ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/base.html
    M ckan/templates/development/snippets/form.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/index.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    A ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/related_list.html
    A ckan/templates/package/resource_api_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    A ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/related/confirm_delete.html
    A ckan/templates/related/dashboard.html
    M ckan/templates/related/edit.html
    M ckan/templates/related/new.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/custom_form_fields.html
    M ckan/templates/snippets/debug.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    A ckan/templates/snippets/internal-tracking.html
    M ckan/templates/snippets/language_selector.html
    M ckan/templates/snippets/package_grid.html
    A ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/recline-extra-footer.html
    M ckan/templates/snippets/recline-extra-header.html
    M ckan/templates/snippets/related.html
    M ckan/templates/snippets/scripts.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/login_form.html
    A ckan/templates/user/snippets/things_to_do.html
    M ckan/templates_legacy/_util.html
    A ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/activity_streams/added_tag.html
    R ckan/templates_legacy/activity_streams/changed_group.html
    R ckan/templates_legacy/activity_streams/changed_package.html
    R ckan/templates_legacy/activity_streams/changed_package_extra.html
    R ckan/templates_legacy/activity_streams/changed_resource.html
    R ckan/templates_legacy/activity_streams/changed_user.html
    R ckan/templates_legacy/activity_streams/deleted_group.html
    R ckan/templates_legacy/activity_streams/deleted_package.html
    R ckan/templates_legacy/activity_streams/deleted_package_extra.html
    R ckan/templates_legacy/activity_streams/deleted_resource.html
    R ckan/templates_legacy/activity_streams/new_group.html
    R ckan/templates_legacy/activity_streams/new_package.html
    R ckan/templates_legacy/activity_streams/new_package_extra.html
    R ckan/templates_legacy/activity_streams/new_resource.html
    R ckan/templates_legacy/activity_streams/new_user.html
    R ckan/templates_legacy/activity_streams/removed_tag.html
    M ckan/templates_legacy/facets.html
    M ckan/templates_legacy/group/read.html
    M ckan/templates_legacy/js_strings.html
    M ckan/templates_legacy/layout_base.html
    A ckan/templates_legacy/package/followers.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read.html
    M ckan/templates_legacy/package/related_list.html
    M ckan/templates_legacy/package/resource_embedded_dataviewer.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/templates_legacy/package/search.html
    A ckan/templates_legacy/related/add-related.html
    A ckan/templates_legacy/related/dashboard.html
    A ckan/templates_legacy/related/related_list.html
    A ckan/templates_legacy/snippets/internal-tracking.html
    A ckan/templates_legacy/snippets/recline-extra-footer.html
    A ckan/templates_legacy/snippets/recline-extra-header.html
    A ckan/templates_legacy/user/dashboard.html
    M ckan/templates_legacy/user/edit_user_form.html
    A ckan/templates_legacy/user/followers.html
    M ckan/templates_legacy/user/read.html
    M ckan/tests/forms/test_authz.py
    M ckan/tests/forms/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_datastore.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_related.py
    M ckan/tests/functional/test_revision.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/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/models/test_user.py
    M ckan/tests/pylons_controller.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/forms.py
    M ckanext/publisher_form/templates/publisher_read.html
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    A ckanext/stats/public/ckanext/stats/css/stats.css
    A ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
    A ckanext/stats/public/ckanext/stats/javascript/modules/stats-nav.js
    A ckanext/stats/public/ckanext/stats/test/fixtures/table.html
    A ckanext/stats/public/ckanext/stats/test/index.html
    A ckanext/stats/public/ckanext/stats/test/spec/modules/plot.spec.js
    A ckanext/stats/public/ckanext/stats/test/spec/modules/stats-nav.spec.js
    A ckanext/stats/public/ckanext/stats/vendor/excanvas.js
    A ckanext/stats/public/ckanext/stats/vendor/jquery.flot.js
    R ckanext/stats/templates/__init__.py
    R ckanext/stats/templates/ckanext/__init__.py
    R ckanext/stats/templates/ckanext/stats/__init__.py
    M ckanext/stats/templates/ckanext/stats/index.html
    R ckanext/stats/templates/ckanext/stats/leaderboard.html
    A ckanext/stats/templates_legacy/__init__.py
    A ckanext/stats/templates_legacy/ckanext/__init__.py
    A ckanext/stats/templates_legacy/ckanext/stats/__init__.py
    A ckanext/stats/templates_legacy/ckanext/stats/index.html
    A ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
    A doc/apps-ideas.rst
    M doc/coding-standards.rst
    M doc/configuration.rst
    M doc/extension-templating.rst
    A doc/frontend-development.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/javascript-module-tutorial.rst
    M doc/paster.rst
    M doc/solr-setup.rst
    A doc/template-tutorial.rst
    M doc/templating.rst
    A doc/toolkit.rst
    M pip-requirements.txt
    M setup.cfg
    M setup.py

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2375-demo-theme-stable

Conflicts:
	ckan/lib/helpers.py

    _nav_named_link conflict but use new code

	ckan/templates/package/new_resource.html

    trivial title to subtitle change


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

  Changed paths:
    M ckan/templates/user/read.html

  Log Message:
  -----------
  [#2871] Show user decription on user read


Compare: https://github.com/okfn/ckan/compare/ef1b588e3b5e...07bfcda2ce78

More information about the ckan-changes mailing list