Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge with all pull request sent. #62

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Merge with all pull request sent. #62

wants to merge 40 commits into from

Commits on Oct 26, 2014

  1. Text/html alternative added for recovery email

    @ellmetha
    ellmetha committed Oct 26, 2014
    Configuration menu
    Copy the full SHA
    0f60c0e View commit details
    Browse the repository at this point in the history

  2. Fixed PEP8 compliance (E501)

    @ellmetha
    ellmetha committed Oct 26, 2014
    Configuration menu
    Copy the full SHA
    9af82f9 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2014

  1. Base email template updated to properly handle secure http

    @ellmetha
    ellmetha committed Nov 18, 2014
    Configuration menu
    Copy the full SHA
    73fb549 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2015

  1. Updated spanish translation 

    Redundant "minutos" removed from spanish translation
    @ezegolub
    ezegolub committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    342ac50 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2015

  1. Generating link both from user.pk and user.password to mitigate issue… 

    … with permanent link exposed to gain access
    @dat-boris
    dat-boris committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    bfae6dd View commit details
    Browse the repository at this point in the history

  2. Tidy up password hashing call

    @dat-boris
    dat-boris committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    46d6f2c View commit details
    Browse the repository at this point in the history

  3. Use django hasher to avoid handling hashlib different across py27 and… 

    … py33
    @dat-boris
    dat-boris committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    b4e45c9 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2016

  1. adding the ability to change case sensitivity with a django setting

    @pnurkkala
    pnurkkala committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    62aa3ab View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2016

  1. added logic to show an error page/msg if email cannot be sent as repo… 

    …rted by email smtp server. Also added optional captcha in reset page if django-simple-captcha==0.5.1 is installed
    Kuiyu CHANG committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    762a969 View commit details
    Browse the repository at this point in the history

  2. removed/cleaned django.po.original

    Kuiyu CHANG committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    ad9b1fe View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2016

  1. removed sekizai_tags from include, which broke the travis build

    Kuiyu CHANG committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    15eb17f View commit details
    Browse the repository at this point in the history

  2. fixed test cases to work with optional captchas, also unified error m… 

    …essages in forms
    Kuiyu CHANG committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    22567e8 View commit details
    Browse the repository at this point in the history

  3. added blank models.py to work with Django 1.5 or lower; Added COLON_S… 

    …UFFIX for django 1.5 tests to pass
    Kuiyu CHANG committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    c1b9563 View commit details
    Browse the repository at this point in the history

  4. fixed some lint errors

    Kuiyu CHANG committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    074a35d View commit details
    Browse the repository at this point in the history

  5. restored custom user

    Kuiyu CHANG committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    395f5a1 View commit details
    Browse the repository at this point in the history

  6. fixed lint errors

    Kuiyu CHANG committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    bae7e50 View commit details
    Browse the repository at this point in the history

  7. dummy changes to invoke lint, which was not run due to travis server … 

    …issues
    Kuiyu CHANG committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    95e7357 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2016

  1. locale: removed old zh/, create link zh to zh-hans.

    Kuiyu CHANG committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    fe83702 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/zhangguiyu/django-passwor… 

    …d-reset
    Kuiyu CHANG committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    9f50f35 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2017

  1. Adding method used to customize how to get the user into subclasses.

    @alexsilva
    alexsilva committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    ce5f13c View commit details
    Browse the repository at this point in the history

  2. Ignore ide files.

    @alexsilva
    alexsilva committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    9277411 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/ellmetha/django-password-… 

    …reset into dev
    @alexsilva
    alexsilva committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    ea97da6 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/patch-1' into dev

    @alexsilva
    alexsilva committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    f79bb52 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into dev

    @alexsilva
    alexsilva committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    168bf4d View commit details
    Browse the repository at this point in the history

  6. merge upstream.

    @alexsilva
    alexsilva committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    2d8de16 View commit details
    Browse the repository at this point in the history

  7. bug fix merge.

    @alexsilva
    alexsilva committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    65d8b63 View commit details
    Browse the repository at this point in the history

  8. Moving compatibility code.

    @alexsilva
    alexsilva committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    be56e71 View commit details
    Browse the repository at this point in the history

  9. Moving compatibility code.

    @alexsilva
    alexsilva committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    e4952c3 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2017

  1. Merge remote-tracking branch 'upstream/master' into dev 

    # Conflicts:
#	password_reset/views.py
    @alexsilva
    alexsilva committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    f759048 View commit details
    Browse the repository at this point in the history

  2. Up version.

    @alexsilva
    alexsilva committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    d6338e5 View commit details
    Browse the repository at this point in the history

  3. Fix go to link.

    @alexsilva
    alexsilva committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    c2a8d5b View commit details
    Browse the repository at this point in the history

  4. Changing logic to work with captcha.

    @alexsilva
    alexsilva committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    f71dae3 View commit details
    Browse the repository at this point in the history

  5. Up version.

    @alexsilva
    alexsilva committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    3546817 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2020

  1. Add package compat.

    @alexsilva
    alexsilva committed Sep 16, 2020
    Configuration menu
    Copy the full SHA
    519990f View commit details
    Browse the repository at this point in the history

  2. Fix import url reverse to django2.

    @alexsilva
    alexsilva committed Sep 16, 2020
    Configuration menu
    Copy the full SHA
    694802f View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2020

  1. v0.9.0

    @alexsilva
    alexsilva committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    5c1018b View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. Replace 'ugettext_lazy' with 'gettext_lazy'.

    @alexsilva
    alexsilva committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    174f9a3 View commit details
    Browse the repository at this point in the history

  2. #3122: remoção de 'providing_args'.

    @alexsilva
    alexsilva committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    0d0769b View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. update coding.

    @alexsilva
    alexsilva committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    ee22edb View commit details
    Browse the repository at this point in the history

  2. v1.0.0

    @alexsilva
    alexsilva committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    fdc5f2b View commit details
    Browse the repository at this point in the history