Nicholas Staples ff9d3d72ad Fixed merge conflicts with master. ...

Code quality fixes.

2016-03-30 10:26:01 +01:00

..

__init__.py

…

_jobs.py

…

add_service.py

Merge with master.

2016-03-29 22:50:40 +01:00

all_services.py

Merge with master.

2016-03-29 22:50:40 +01:00

api_keys.py

…

choose_service.py

Merge with master.

2016-03-29 22:50:40 +01:00

code_not_received.py

…

dashboard.py

Fixed merge conflicts with master.

2016-03-30 10:26:01 +01:00

email.py

…

forgot_password.py

…

index.py

Add Terms of use page

2016-03-23 10:26:21 +00:00

invites.py

Merge with master.

2016-03-29 22:50:40 +01:00

jobs.py

Fixed merge conflicts with master.

2016-03-30 10:26:01 +01:00

manage_users.py

Merge with master.

2016-03-29 22:50:40 +01:00

new_password.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

register.py

…

send.py

Fixed merge conflicts with master.

2016-03-30 10:26:01 +01:00

service_settings.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

sign_in.py

Merge with master.

2016-03-29 22:50:40 +01:00

sign_out.py

…

styleguide.py

Set permissions with checkboxes, not yes/no inputs

2016-03-22 17:18:43 +00:00

templates.py

Fixed merge conflicts with master.

2016-03-30 10:26:01 +01:00

two_factor.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

user_profile.py

Merging conflict with two_factor.py

2016-03-30 10:11:06 +01:00

verify.py

Better flash message for users with active accounts who click on

2016-03-29 13:21:51 +01:00