Adam Shimali bfd7291426 resolve merge conflicts

2016-01-12 10:43:23 +00:00

..

dao

When the user request a reset password link, the user.state is set to request_password_reset.

2016-01-11 12:23:08 +00:00

notifications

Updated generate_token to use encrypt the entire url.

2016-01-11 15:18:37 +00:00

views

resolve merge conflicts

2016-01-12 10:43:23 +00:00

__init__.py

Add a styleguide page

2016-01-11 14:27:31 +00:00

encryption.py

…

forms.py

resolve merge conflicts

2016-01-12 10:43:23 +00:00

validators.py

First slice of csv upload of phone numbers for sending messages.

2016-01-11 15:00:51 +00:00