Merge branch 'list_email' into dev (ae4bc23d) · 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

ae4bc23d

Commit ae4bc23d authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'list_email' into dev

parents 353cedeb 7b840efe

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

browserid/static/dialog/controllers/authenticate_controller.js 1 addition, 6 deletions

...erid/static/dialog/controllers/authenticate_controller.js
browserid/static/dialog/controllers/dialog_controller.js 1 addition, 1 deletion

browserid/static/dialog/controllers/dialog_controller.js
browserid/static/dialog/resources/user.js 4 additions, 19 deletions

browserid/static/dialog/resources/user.js
browserid/static/dialog/test/qunit/resources/user_unit_test.js 29 additions, 52 deletions

...erid/static/dialog/test/qunit/resources/user_unit_test.js
browserid/static/js/pages/signin.js 2 additions, 2 deletions

browserid/static/js/pages/signin.js

with 37 additions and 80 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