Merge branch 'dev' of github.com:mozilla/browserid into dev
Showing
- lib/browserid/views.js 13 additions, 11 deletionslib/browserid/views.js
- resources/static/css/style.css 15 additions, 0 deletionsresources/static/css/style.css
- resources/static/dialog/controllers/pick_email.js 17 additions, 5 deletionsresources/static/dialog/controllers/pick_email.js
- resources/static/dialog/resources/state.js 3 additions, 1 deletionresources/static/dialog/resources/state.js
- resources/static/dialog/views/authenticate.ejs 2 additions, 2 deletionsresources/static/dialog/views/authenticate.ejs
- resources/static/lib/dom-jquery.js 14 additions, 0 deletionsresources/static/lib/dom-jquery.js
- resources/static/test/cases/controllers/authenticate.js.bak 0 additions, 257 deletionsresources/static/test/cases/controllers/authenticate.js.bak
- resources/static/test/cases/controllers/pick_email.js 33 additions, 3 deletionsresources/static/test/cases/controllers/pick_email.js
- resources/static/test/cases/pages/add_email_address_test.js 1 addition, 4 deletionsresources/static/test/cases/pages/add_email_address_test.js
- resources/static/test/cases/pages/manage_account.js 2 additions, 6 deletionsresources/static/test/cases/pages/manage_account.js
- resources/static/test/cases/pages/verify_email_address_test.js 32 additions, 0 deletions...rces/static/test/cases/pages/verify_email_address_test.js
- resources/static/test/cases/resources/state.js 4 additions, 3 deletionsresources/static/test/cases/resources/state.js
- resources/static/test/testHelpers/helpers.js 11 additions, 0 deletionsresources/static/test/testHelpers/helpers.js
- resources/views/add_email_address.ejs 1 addition, 1 deletionresources/views/add_email_address.ejs
- resources/views/index.ejs 4 additions, 0 deletionsresources/views/index.ejs
- resources/views/verify_email_address.ejs 2 additions, 2 deletionsresources/views/verify_email_address.ejs
- scripts/browserid.spec 3 additions, 1 deletionscripts/browserid.spec
- tests/page-requests-test.js 1 addition, 1 deletiontests/page-requests-test.js
Loading
Please register or sign in to comment