Merge remote branch 'origin/dev' into start_unit_tests (980ec644) · 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

980ec644

Commit 980ec644 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge remote branch 'origin/dev' into start_unit_tests

Moved the assertion generation into BrowserIDIdentities. Adding tests for this.

Conflicts:
	browserid/static/dialog/controllers/dialog_controller.js

parents 6f0334d6 5b0ecf7b

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

browserid/static/dialog/controllers/addemail_controller.js 1 addition, 4 deletions

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

...erid/static/dialog/controllers/authenticate_controller.js
browserid/static/dialog/controllers/checkregistration_controller.js 1 addition, 4 deletions

...static/dialog/controllers/checkregistration_controller.js
browserid/static/dialog/controllers/createaccount_controller.js 1 addition, 7 deletions

...rid/static/dialog/controllers/createaccount_controller.js
browserid/static/dialog/controllers/dialog_controller.js 11 additions, 20 deletions

browserid/static/dialog/controllers/dialog_controller.js
browserid/static/dialog/controllers/forgotpassword_controller.js 1 addition, 5 deletions

...id/static/dialog/controllers/forgotpassword_controller.js
browserid/static/dialog/controllers/page_controller.js 18 additions, 1 deletion

browserid/static/dialog/controllers/page_controller.js
browserid/static/dialog/resources/browserid-identities.js 20 additions, 0 deletions

browserid/static/dialog/resources/browserid-identities.js
browserid/static/dialog/test/qunit/browserid-identities_test.js 11 additions, 0 deletions

...rid/static/dialog/test/qunit/browserid-identities_test.js

with 65 additions and 45 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