Upstream merge
Showing
- ChangeLog 29 additions, 1 deletionChangeLog
- example/primary/sign_in.html 8 additions, 0 deletionsexample/primary/sign_in.html
- lib/browserid/views.js 2 additions, 3 deletionslib/browserid/views.js
- resources/static/dialog/controllers/actions.js 4 additions, 0 deletionsresources/static/dialog/controllers/actions.js
- resources/static/dialog/controllers/dialog.js 14 additions, 6 deletionsresources/static/dialog/controllers/dialog.js
- resources/static/dialog/resources/state.js 33 additions, 13 deletionsresources/static/dialog/resources/state.js
- resources/static/dialog/views/cannot_verify_required_email.ejs 12 additions, 0 deletions...rces/static/dialog/views/cannot_verify_required_email.ejs
- resources/static/dialog/views/test_template_no_input.ejs 0 additions, 2 deletionsresources/static/dialog/views/test_template_no_input.ejs
- resources/static/dialog/views/test_template_with_input.ejs 0 additions, 2 deletionsresources/static/dialog/views/test_template_with_input.ejs
- resources/static/dialog/views/verify_primary_user.ejs 0 additions, 2 deletionsresources/static/dialog/views/verify_primary_user.ejs
- resources/static/shared/wait-messages.js 1 addition, 1 deletionresources/static/shared/wait-messages.js
- resources/static/test/cases/controllers/actions.js 12 additions, 0 deletionsresources/static/test/cases/controllers/actions.js
- resources/static/test/cases/controllers/dialog.js 6 additions, 4 deletionsresources/static/test/cases/controllers/dialog.js
- resources/static/test/cases/resources/state.js 45 additions, 16 deletionsresources/static/test/cases/resources/state.js
- resources/views/dialog_layout.ejs 1 addition, 1 deletionresources/views/dialog_layout.ejs
- resources/views/verify_email_address.ejs 1 addition, 1 deletionresources/views/verify_email_address.ejs
- scripts/browserid.spec 1 addition, 1 deletionscripts/browserid.spec
- scripts/deploy.js 20 additions, 11 deletionsscripts/deploy.js
- scripts/deploy/dns.js 4 additions, 4 deletionsscripts/deploy/dns.js
- scripts/deploy/git.js 63 additions, 0 deletionsscripts/deploy/git.js
Loading
Please register or sign in to comment