[ckan-changes] [okfn/ckan] 4f2887: Fix password reset (inserted manually from e7fa2c1...

Thu Jun 7 17:16:47 UTC 2012

  Branch: refs/heads/release-v1.7.1
  Home:   https://github.com/okfn/ckan
  Commit: 4f28876ad907a918916dcb4b3b4f2ae507019dc8
      https://github.com/okfn/ckan/commit/4f28876ad907a918916dcb4b3b4f2ae507019dc8
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

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

  Log Message:
  -----------
  Fix password reset (inserted manually from e7fa2c1)

  Commit: 1b64e79a1c6359fbfb9b0aef9f6edcb791d98be5
      https://github.com/okfn/ckan/commit/1b64e79a1c6359fbfb9b0aef9f6edcb791d98be5
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [2383] Properly convert microseconds in date_str_to_datetime helper.

Stop this helper function from incorrectly parsing a UTC offset "+0100" as
100 microseconds.

Now, if passed UTC offset as "+0100", this function will not parse the
timestamp.  The same behaviour as when it's passed "+01:00" as a UTC
offset.

  Commit: 9d192d72135159660a63c9714b5fc18f3a092e8f
      https://github.com/okfn/ckan/commit/9d192d72135159660a63c9714b5fc18f3a092e8f
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [2383] Adding descriptive message to ValueError

And added test that explicitely tests the second form of UTC offset.

Compare: https://github.com/okfn/ckan/compare/60bc98c...9d192d7