Nicholas Staples ecc3485d72 Merge conflicts with master.

2016-01-05 17:24:13 +00:00

..

__init__.py

109898688: Implementation of text-not-received and email-not-received

2015-12-17 14:33:20 +00:00

add_service.py

Move and rename macro.html

2016-01-04 15:50:26 +00:00

code_not_received.py

Refactor for code_not_received, sign_in, two_factor and verify.

2016-01-05 17:08:50 +00:00

index.py

109898688: Implement get method for email-not-received and text-not-received

2015-12-17 14:33:20 +00:00

register.py

Update register view form and template.

2016-01-05 12:41:20 +00:00

sign_in.py

Small comments.

2016-01-05 17:11:44 +00:00

sms.py

Small comments.

2016-01-05 17:11:44 +00:00

two_factor.py

Merge conflicts with master.

2016-01-05 17:24:13 +00:00

verify.py

Merge conflicts with master.

2016-01-05 17:24:13 +00:00