Merge remote branch 'origin/dev' into ux_iteration
Conflicts: browserid/static/dialog/controllers/dialog_controller.js
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- ChangeLog 11 additions, 1 deletionChangeLog
- DEPLOYMENT.md 10 additions, 2 deletionsDEPLOYMENT.md
- LICENSE 5 additions, 0 deletionsLICENSE
- README.md 0 additions, 1 deletionREADME.md
- browserid/app.js 71 additions, 5 deletionsbrowserid/app.js
- browserid/lib/db.js 89 additions, 369 deletionsbrowserid/lib/db.js
- browserid/lib/db_json.js 357 additions, 0 deletionsbrowserid/lib/db_json.js
- browserid/lib/db_mysql.js 457 additions, 0 deletionsbrowserid/lib/db_mysql.js
- browserid/lib/email.js 35 additions, 0 deletionsbrowserid/lib/email.js
- browserid/lib/httputils.js 35 additions, 0 deletionsbrowserid/lib/httputils.js
- browserid/lib/secrets.js 38 additions, 3 deletionsbrowserid/lib/secrets.js
- browserid/lib/webfinger.js 35 additions, 0 deletionsbrowserid/lib/webfinger.js
- browserid/lib/wsapi.js 60 additions, 25 deletionsbrowserid/lib/wsapi.js
- browserid/run.js 35 additions, 0 deletionsbrowserid/run.js
- browserid/static/css/style.css 7 additions, 1 deletionbrowserid/static/css/style.css
- browserid/static/dialog/controllers/dialog_controller.js 37 additions, 2 deletionsbrowserid/static/dialog/controllers/dialog_controller.js
- browserid/static/dialog/dialog.js 35 additions, 0 deletionsbrowserid/static/dialog/dialog.js
- browserid/static/dialog/register_iframe.js 35 additions, 3 deletionsbrowserid/static/dialog/register_iframe.js
- browserid/static/dialog/resources/channel.js 35 additions, 0 deletionsbrowserid/static/dialog/resources/channel.js
Loading
Please register or sign in to comment