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
No related branches found
No related tags found
Showing
- browserid/static/dialog/controllers/addemail_controller.js 1 addition, 4 deletionsbrowserid/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 deletionsbrowserid/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 deletionbrowserid/static/dialog/controllers/page_controller.js
- browserid/static/dialog/resources/browserid-identities.js 20 additions, 0 deletionsbrowserid/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
Loading
Please register or sign in to comment