[ckan-changes] [okfn/ckan] 008077: Have groups per page as 21 or as 7x3 grid.

Tue Dec 18 15:25:15 UTC 2012

  Branch: refs/heads/1635-feature-email-notifications-for-activity-streams
  Home:   https://github.com/okfn/ckan
  Commit: 008077701caa5a7f4952f4b57076b55d52f493d5
      https://github.com/okfn/ckan/commit/008077701caa5a7f4952f4b57076b55d52f493d5
  Author: Aleksi Suomalainen <aleksi.suomalainen at nomovok.com>
  Date:   2012-12-14 (Fri, 14 Dec 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Have groups per page as 21 or as 7x3 grid.

  Commit: 1b650f4e9e68563035fa1bf6015cf0d5994ad2d9
      https://github.com/okfn/ckan/commit/1b650f4e9e68563035fa1bf6015cf0d5994ad2d9
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-16 (Sun, 16 Dec 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  remove all _context calls and session.removes

  Commit: 08970c943e54f454fdff0e25e3a80f236c25bdff
      https://github.com/okfn/ckan/commit/08970c943e54f454fdff0e25e3a80f236c25bdff
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-16 (Sun, 16 Dec 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/user.py
    M ckan/lib/email_notifications.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/model/user.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/functional/api/test_email_notifications.py
    M ckan/tests/lib/test_dictization.py
    M doc/email-notifications.rst
    M test-core.ini

  Log Message:
  -----------
  [#1635] Rename ckan.email_notifications -> activity_streams_email_notifications

This makes things more extensible

  Commit: 56540910ec87131ba1c6b291bd28d603bc3cd5e4
      https://github.com/okfn/ckan/commit/56540910ec87131ba1c6b291bd28d603bc3cd5e4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-16 (Sun, 16 Dec 2012)

  Changed paths:
    M ckan/tests/functional/api/test_email_notifications.py

  Log Message:
  -----------
  [#1635] Remove an unnecessary line

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

  Changed paths:
    M ckan/lib/email_notifications.py
    M ckan/tests/lib/test_email_notifications.py

  Log Message:
  -----------
  [#1635] Fix an email_notifications_since bug

Fix the error response when ckan.email_notifications_since is an invalid
string.

  Commit: 94bf606561cdb4a09fb6e0d82068d500064b07f6
      https://github.com/okfn/ckan/commit/94bf606561cdb4a09fb6e0d82068d500064b07f6
  Author: amercader <amercadero at gmail.com>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Merge branch 'fix-context-hacks'

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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge pull request #212 from kata-csc/kata-csc-fix-group-numbers

Have groups per page as 21 or as 7x3 grid.

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

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less
    M ckan/templates/macros/form.html
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge branch '1635-feature-email-notifications-for-activity-streams' of github.com:okfn/ckan into 1635-feature-email-notifications-for-activity-streams

Conflicts:
	ckan/templates/user/edit_user_form.html

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

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

  Log Message:
  -----------
  [#1635] User preference text tweak

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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1635-feature-email-notifications-for-activity-streams

  Commit: 38126ace2c57ee182da949256a9adfda2cbaf933
      https://github.com/okfn/ckan/commit/38126ace2c57ee182da949256a9adfda2cbaf933
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#1635] Fix a typo in a test case

  Commit: 6bfce0101c7840299060099ae58191f15e1a49d4
      https://github.com/okfn/ckan/commit/6bfce0101c7840299060099ae58191f15e1a49d4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/less/forms.less
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  Merge branch '1635-feature-email-notifications-for-activity-streams' of github.com:okfn/ckan into 1635-feature-email-notifications-for-activity-streams

Conflicts:
	ckan/templates/user/edit_user_form.html

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

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

  Log Message:
  -----------
  [#1635] Fix a merge error

Compare: https://github.com/okfn/ckan/compare/7a3431400f37...c3e817462fcb