merge fixes from train-2012.04.11 (57cfd76d) · 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

57cfd76d

Commit 57cfd76d authored 12 years ago by Lloyd Hilaiel

Downloads
- Plain Diff

merge fixes from train-2012.04.11

parents 1f30cde4 57ea50a3

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 6 additions, 0 deletions

ChangeLog
lib/wsapi/complete_email_addition.js 13 additions, 8 deletions

lib/wsapi/complete_email_addition.js
resources/static/dialog/controllers/check_registration.js 4 additions, 1 deletion

resources/static/dialog/controllers/check_registration.js
resources/static/dialog/controllers/dialog.js 1 addition, 1 deletion

resources/static/dialog/controllers/dialog.js
resources/static/dialog/resources/state.js 2 additions, 0 deletions

resources/static/dialog/resources/state.js
resources/static/dialog/views/is_this_your_computer.ejs 1 addition, 2 deletions

resources/static/dialog/views/is_this_your_computer.ejs
resources/static/test/cases/controllers/check_registration.js 11 additions, 3 deletions

...urces/static/test/cases/controllers/check_registration.js
resources/static/test/cases/resources/state.js 8 additions, 0 deletions

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

resources/static/test/mocks/xhr.js
scripts/browserid.spec 1 addition, 1 deletion

scripts/browserid.spec
tests/primary-then-secondary-test.js 19 additions, 1 deletion

tests/primary-then-secondary-test.js

with 67 additions and 17 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