Merge branch 'deleted_email_hang' into dev (a65a4550) · Commits · Hexang 息壤平台 / persona · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

persona
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

a65a4550

Commit a65a4550 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'deleted_email_hang' into dev

parents b4f63352 82744a3f

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

browserid/static/dialog/controllers/dialog_controller.js 9 additions, 4 deletions

browserid/static/dialog/controllers/dialog_controller.js
browserid/static/dialog/controllers/pickemail_controller.js 44 additions, 20 deletions

browserid/static/dialog/controllers/pickemail_controller.js
browserid/static/dialog/resources/user.js 10 additions, 0 deletions

browserid/static/dialog/resources/user.js
browserid/static/dialog/test/qunit/user_unit_test.js 24 additions, 4 deletions

browserid/static/dialog/test/qunit/user_unit_test.js

with 87 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment