[ckan-changes] [ckan/ckan] b151c7: Merge branch 'master', remote-tracking branch 'ups...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: b151c70cd79aad411d2ff2efce81e8ee613ae153
      https://github.com/ckan/ckan/commit/b151c70cd79aad411d2ff2efce81e8ee613ae153
  Author: george <george at orion.(none)>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Log Message:
  -----------
  Merge branch 'master', remote-tracking branch 'upstream/master'


  Commit: b96df5ef3552af4a8e316191ae7511a6d2cce44a
      https://github.com/ckan/ckan/commit/b96df5ef3552af4a8e316191ae7511a6d2cce44a
  Author: george-sattler <george.sattler at xvt.com.au>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#1940] Old password needs to be verified before allowing password to be changed.

Currently a user can change their password without requiring them to enter their current password.

With this change, an 'Old Password' fields is added to the user edit page and will display an error if the password is entered incorrectly.


  Commit: 133a6c8c645fbbab97c1c8866ad0a0c39393fcf9
      https://github.com/ckan/ckan/commit/133a6c8c645fbbab97c1c8866ad0a0c39393fcf9
  Author: george-sattler <george.sattler at xvt.com.au>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  be gone with you, embarrassing print statement!


  Commit: 158cfa8856e5dec0d90e5cbc171072b618be60a7
      https://github.com/ckan/ckan/commit/158cfa8856e5dec0d90e5cbc171072b618be60a7
  Author: george-sattler <george.sattler at xvt.com.au>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    A ckan/new_tests/controllers/test_user.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Adds a new file for testing the user controller with two tests for checking the validity of the old password before updating the password.

Adds "id" tag to user_edit_form.html so that it can be reliably found by when the tests want to get the form from the page.


  Commit: b093dc6a8b24cf71d27b86eb09a463f79b7e285f
      https://github.com/ckan/ckan/commit/b093dc6a8b24cf71d27b86eb09a463f79b7e285f
  Author: george-sattler <george.sattler at xvt.com.au>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_user.py

  Log Message:
  -----------
  fixes pep8 issue in test_user.py file


  Commit: 6c67fe2b40ecbe8f8403ac3c0cdb9b84422294e3
      https://github.com/ckan/ckan/commit/6c67fe2b40ecbe8f8403ac3c0cdb9b84422294e3
  Author: george <george.sattler at xvt.com.au>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  wraps error messages in internationalisation helper methods


  Commit: 1357527f9de0c66fc3234226cc10ce581d4369a0
      https://github.com/ckan/ckan/commit/1357527f9de0c66fc3234226cc10ce581d4369a0
  Author: george <george.sattler at xvt.com.au>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

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

  Log Message:
  -----------
  changes form id attribute to align with new naming convention


  Commit: 0f6b894c656d06ea1a8e70e6448846ad36de74fb
      https://github.com/ckan/ckan/commit/0f6b894c656d06ea1a8e70e6448846ad36de74fb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    A ckan/new_tests/controllers/test_user.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge branch '1940-check-old-password-on-user-password-update' of https://github.com/george-sattler/ckan into george-sattler-1940-check-old-password-on-user-password-update

Conflicts:
	ckan/templates/user/edit_user_form.html


  Commit: ae633a76809a83cb0655f36078ceae8626818c0a
      https://github.com/ckan/ckan/commit/ae633a76809a83cb0655f36078ceae8626818c0a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    A ckan/new_tests/controllers/test_user.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge branch 'george-sattler-1940-check-old-password-on-user-password-update'


Compare: https://github.com/ckan/ckan/compare/f077267d82ca...ae633a76809a