Merge branch 'dev' of github.com:mozilla/browserid into dev (350636a2) · 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

350636a2

Commit 350636a2 authored 12 years ago by Austin King

Downloads
- Plain Diff

Merge branch 'dev' of github.com:mozilla/browserid into dev

parents c82698ab dced8e24

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

package.json 1 addition, 1 deletion

package.json
resources/static/dialog/controllers/check_registration.js 3 additions, 9 deletions

resources/static/dialog/controllers/check_registration.js
resources/static/dialog/resources/state.js 11 additions, 9 deletions

resources/static/dialog/resources/state.js
resources/static/dialog/views/confirm_email.ejs 2 additions, 2 deletions

resources/static/dialog/views/confirm_email.ejs
resources/static/shared/user.js 31 additions, 1 deletion

resources/static/shared/user.js
resources/static/test/cases/controllers/check_registration.js 7 additions, 6 deletions

...urces/static/test/cases/controllers/check_registration.js
resources/static/test/cases/shared/user.js 86 additions, 49 deletions

resources/static/test/cases/shared/user.js
resources/static/test/mocks/xhr.js 1 addition, 0 deletions

resources/static/test/mocks/xhr.js

with 142 additions and 77 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