Merge branch 'design' into dev
Conflicts: browserid/static/dialog/controllers/authenticate_controller.js
No related branches found
No related tags found
Showing
- browserid/app.js 4 additions, 0 deletionsbrowserid/app.js
- browserid/static/dialog/controllers/authenticate_controller.js 136 additions, 117 deletions...erid/static/dialog/controllers/authenticate_controller.js
- browserid/static/dialog/controllers/dialog_controller.js 4 additions, 1 deletionbrowserid/static/dialog/controllers/dialog_controller.js
- browserid/static/dialog/controllers/pickemail_controller.js 79 additions, 61 deletionsbrowserid/static/dialog/controllers/pickemail_controller.js
- browserid/static/dialog/css/popup.css 22 additions, 13 deletionsbrowserid/static/dialog/css/popup.css
- browserid/static/dialog/test/qunit/browserid-identities_unit_test.js 1 addition, 1 deletion...tatic/dialog/test/qunit/browserid-identities_unit_test.js
- browserid/static/dialog/test/qunit/browserid-storage_unit_test.js 100 additions, 0 deletions...d/static/dialog/test/qunit/browserid-storage_unit_test.js
- browserid/static/dialog/test/qunit/qunit.js 1 addition, 0 deletionsbrowserid/static/dialog/test/qunit/qunit.js
- browserid/static/dialog/views/authenticate.ejs 1 addition, 1 deletionbrowserid/static/dialog/views/authenticate.ejs
- browserid/static/dialog/views/pickemail.ejs 31 additions, 23 deletionsbrowserid/static/dialog/views/pickemail.ejs
- browserid/views/signin.ejs 1 addition, 1 deletionbrowserid/views/signin.ejs
- browserid/views/signup.ejs 10 additions, 18 deletionsbrowserid/views/signup.ejs
Loading
Please register or sign in to comment