Merge branch 'master' into db
(resolved) Conflicts: README.md browserid/lib/wsapi.js
Showing
- README.md 2 additions, 0 deletionsREADME.md
- browserid/app.js 71 additions, 34 deletionsbrowserid/app.js
- browserid/compress.sh 22 additions, 0 deletionsbrowserid/compress.sh
- browserid/lib/wsapi.js 22 additions, 20 deletionsbrowserid/lib/wsapi.js
- browserid/static/css/browserid.min.css 1 addition, 0 deletionsbrowserid/static/css/browserid.min.css
- browserid/static/css/style.css 95 additions, 64 deletionsbrowserid/static/css/style.css
- browserid/static/dialog/controllers/dialog_controller.js 51 additions, 15 deletionsbrowserid/static/dialog/controllers/dialog_controller.js
- browserid/static/i/browserid_logo.png 0 additions, 0 deletionsbrowserid/static/i/browserid_logo.png
- browserid/static/i/browserid_logo_sm.png 0 additions, 0 deletionsbrowserid/static/i/browserid_logo_sm.png
- browserid/static/i/check.png 0 additions, 0 deletionsbrowserid/static/i/check.png
- browserid/static/i/developers.png 0 additions, 0 deletionsbrowserid/static/i/developers.png
- browserid/static/i/id.png 0 additions, 0 deletionsbrowserid/static/i/id.png
- browserid/static/i/labs-logo.png 0 additions, 0 deletionsbrowserid/static/i/labs-logo.png
- browserid/static/i/lock.png 0 additions, 0 deletionsbrowserid/static/i/lock.png
- browserid/static/i/people.png 0 additions, 0 deletionsbrowserid/static/i/people.png
- browserid/static/i/sign_in_blue.png 0 additions, 0 deletionsbrowserid/static/i/sign_in_blue.png
- browserid/static/i/sign_in_green.png 0 additions, 0 deletionsbrowserid/static/i/sign_in_green.png
- browserid/static/i/sign_in_grey.png 0 additions, 0 deletionsbrowserid/static/i/sign_in_grey.png
- browserid/static/i/sign_in_orange.png 0 additions, 0 deletionsbrowserid/static/i/sign_in_orange.png
- browserid/static/i/sign_in_red.png 0 additions, 0 deletionsbrowserid/static/i/sign_in_red.png
Loading
Please register or sign in to comment