Merge remote branch 'origin/dev' into start_unit_tests
Conflicts: browserid/static/js/browserid.js
Showing
- browserid/lib/db_json.js 4 additions, 0 deletionsbrowserid/lib/db_json.js
- browserid/lib/db_mysql.js 29 additions, 27 deletionsbrowserid/lib/db_mysql.js
- browserid/lib/wsapi.js 27 additions, 4 deletionsbrowserid/lib/wsapi.js
- browserid/static/dialog/resources/browserid-network.js 1 addition, 1 deletionbrowserid/static/dialog/resources/browserid-network.js
- browserid/static/js/browserid.js 2 additions, 2 deletionsbrowserid/static/js/browserid.js
- browserid/tests/lib/wsapi.js 11 additions, 115 deletionsbrowserid/tests/lib/wsapi.js
- browserid/tests/set-key-wsapi-test.js 123 additions, 0 deletionsbrowserid/tests/set-key-wsapi-test.js
- browserid/tests/sync-emails-wsapi-test.js 156 additions, 0 deletionsbrowserid/tests/sync-emails-wsapi-test.js
- libs/wsapi_client.js 7 additions, 1 deletionlibs/wsapi_client.js
- performance/lib/add_email.js 54 additions, 3 deletionsperformance/lib/add_email.js
- performance/lib/include_only.js 1 addition, 1 deletionperformance/lib/include_only.js
- performance/lib/reauth.js 2 additions, 6 deletionsperformance/lib/reauth.js
- performance/lib/signin.js 81 additions, 3 deletionsperformance/lib/signin.js
- performance/lib/signup.js 39 additions, 12 deletionsperformance/lib/signup.js
- performance/lib/test.js 1 addition, 1 deletionperformance/lib/test.js
- performance/lib/user_db.js 37 additions, 7 deletionsperformance/lib/user_db.js
- verifier/app.js 3 additions, 1 deletionverifier/app.js
Loading
Please register or sign in to comment