[ckan-changes] [okfn/ckan] d61e34: [#236] Stripped tags from description fields from ...

Thu Dec 20 21:57:07 UTC 2012

  Branch: refs/heads/3028-dashboard-activity-stream-filtering
  Home:   https://github.com/okfn/ckan
  Commit: d61e3491c357af9c184d6686253fd5637ec01b51
      https://github.com/okfn/ckan/commit/d61e3491c357af9c184d6686253fd5637ec01b51
  Author: John Martin <me at johnmart.in>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    M ckan/templates/ajax_snippets/popover_context_dataset.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/ajax_snippets/popover_context_user.html

  Log Message:
  -----------
  [#236] Stripped tags from description fields from within popovers


  Commit: b2085724d021b0da6622acc95722e1205e54b09b
      https://github.com/okfn/ckan/commit/b2085724d021b0da6622acc95722e1205e54b09b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    M ckan/templates/ajax_snippets/popover_context_dataset.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/ajax_snippets/popover_context_user.html

  Log Message:
  -----------
  Merge branch '236-html-in-popovers'


  Commit: 9e1ce7bc6550b08fe9b3aed884981f039ec10e51
      https://github.com/okfn/ckan/commit/9e1ce7bc6550b08fe9b3aed884981f039ec10e51
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    M ckan/templates/ajax_snippets/popover_context_dataset.html
    M ckan/templates/ajax_snippets/popover_context_group.html
    M ckan/templates/ajax_snippets/popover_context_user.html

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


  Commit: 68fc6b825455b2c0e502f0a860d9fbab8fd229fc
      https://github.com/okfn/ckan/commit/68fc6b825455b2c0e502f0a860d9fbab8fd229fc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-20 (Thu, 20 Dec 2012)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/popover-context.js

  Log Message:
  -----------
  Merge branch '3028-dashboard-activity-stream-filtering' of github.com:okfn/ckan into 3028-dashboard-activity-stream-filtering


Compare: https://github.com/okfn/ckan/compare/4b94315640be...68fc6b825455