Resolved conflict
Showing
- browserid/.gitignore 2 additions, 0 deletionsbrowserid/.gitignore
- browserid/app.js 9 additions, 3 deletionsbrowserid/app.js
- browserid/static/dialog/compressed/production.js 0 additions, 442 deletionsbrowserid/static/dialog/compressed/production.js
- browserid/static/dialog/controllers/dialog_controller.js 23 additions, 19 deletionsbrowserid/static/dialog/controllers/dialog_controller.js
- browserid/static/dialog/dialog.css 0 additions, 2 deletionsbrowserid/static/dialog/dialog.css
- browserid/static/dialog/dialog.html 0 additions, 15 deletionsbrowserid/static/dialog/dialog.html
- browserid/static/dialog/dialog.js 22 additions, 22 deletionsbrowserid/static/dialog/dialog.js
- browserid/static/dialog/html5shim.js 4 additions, 0 deletionsbrowserid/static/dialog/html5shim.js
- browserid/static/dialog/register_iframe.html 2 additions, 1 deletionbrowserid/static/dialog/register_iframe.html
- browserid/static/dialog/resources/crypto-api.js 38 additions, 0 deletionsbrowserid/static/dialog/resources/crypto-api.js
- browserid/static/dialog/resources/crypto-stubs.js 0 additions, 41 deletionsbrowserid/static/dialog/resources/crypto-stubs.js
- browserid/static/dialog/resources/crypto.js 1 addition, 1 deletionbrowserid/static/dialog/resources/crypto.js
- browserid/static/dialog/scripts/build.js 4 additions, 2 deletionsbrowserid/static/dialog/scripts/build.js
- browserid/static/dialog/style.css 29 additions, 35 deletionsbrowserid/static/dialog/style.css
- browserid/static/dialog/test_crypto_stubs.htm 2 additions, 2 deletionsbrowserid/static/dialog/test_crypto_stubs.htm
- browserid/static/dialog/views/body.ejs 11 additions, 7 deletionsbrowserid/static/dialog/views/body.ejs
- browserid/static/i/a_better_way.png 0 additions, 0 deletionsbrowserid/static/i/a_better_way.png
- browserid/static/i/browserid_logo_lil.png 0 additions, 0 deletionsbrowserid/static/i/browserid_logo_lil.png
- browserid/static/i/labs-logo-small.png 0 additions, 0 deletionsbrowserid/static/i/labs-logo-small.png
- browserid/static/i/sprite.png 0 additions, 0 deletionsbrowserid/static/i/sprite.png
Loading
Please register or sign in to comment