Merge branch 'design' of github.com:mozilla/browserid into design
Conflicts: browserid/app.js browserid/static/js/browserid.js
Showing
- ChangeLog 17 additions, 0 deletionsChangeLog
- DEPLOYMENT.md 0 additions, 2 deletionsDEPLOYMENT.md
- browserid/app.js 11 additions, 0 deletionsbrowserid/app.js
- browserid/compress.sh 14 additions, 2 deletionsbrowserid/compress.sh
- browserid/static/css/style.css.bak 322 additions, 0 deletionsbrowserid/static/css/style.css.bak
- browserid/static/dialog/controllers/authenticate_controller.js 5 additions, 5 deletions...erid/static/dialog/controllers/authenticate_controller.js
- browserid/static/dialog/controllers/checkregistration_controller.js 1 addition, 1 deletion...static/dialog/controllers/checkregistration_controller.js
- browserid/static/dialog/controllers/dialog_controller.js 2 additions, 1 deletionbrowserid/static/dialog/controllers/dialog_controller.js
- browserid/static/dialog/dialog.js 13 additions, 2 deletionsbrowserid/static/dialog/dialog.js
- browserid/static/dialog/resources/base64.js 69 additions, 0 deletionsbrowserid/static/dialog/resources/base64.js
- browserid/static/dialog/resources/browserid-identities.js 77 additions, 40 deletionsbrowserid/static/dialog/resources/browserid-identities.js
- browserid/static/dialog/resources/browserid-network.js 24 additions, 0 deletionsbrowserid/static/dialog/resources/browserid-network.js
- browserid/static/dialog/resources/channel.js 80 additions, 42 deletionsbrowserid/static/dialog/resources/channel.js
- browserid/static/dialog/style.css 2 additions, 1 deletionbrowserid/static/dialog/style.css
- browserid/static/dialog/test/qunit/browserid-identities_functional_test.js 0 additions, 0 deletions...dialog/test/qunit/browserid-identities_functional_test.js
- browserid/static/dialog/test/qunit/browserid-identities_unit_test.js 460 additions, 0 deletions...tatic/dialog/test/qunit/browserid-identities_unit_test.js
- browserid/static/dialog/test/qunit/browserid-network_test.js 19 additions, 0 deletionsbrowserid/static/dialog/test/qunit/browserid-network_test.js
- browserid/static/dialog/test/qunit/qunit.js 2 additions, 1 deletionbrowserid/static/dialog/test/qunit/qunit.js
- browserid/static/dialog/views/addemail.ejs 1 addition, 1 deletionbrowserid/static/dialog/views/addemail.ejs
- browserid/static/dialog/views/authenticate.ejs 1 addition, 1 deletionbrowserid/static/dialog/views/authenticate.ejs
Loading
Please register or sign in to comment