merge fix for mismatch between client and server times: closes #329
Conflicts: browserid/static/dialog/resources/browserid-identities.js browserid/static/dialog/resources/browserid-network.js browserid/static/dialog/test/qunit/browserid-network_test.js browserid/views/developers.ejs
Showing
- ChangeLog 1 addition, 0 deletionsChangeLog
- browserid/lib/wsapi.js 31 additions, 28 deletionsbrowserid/lib/wsapi.js
- browserid/static/dialog/resources/browserid-identities.js 30 additions, 27 deletionsbrowserid/static/dialog/resources/browserid-identities.js
- browserid/static/dialog/resources/browserid-network.js 84 additions, 40 deletionsbrowserid/static/dialog/resources/browserid-network.js
- browserid/static/dialog/test/qunit/browserid-identities_unit_test.js 4 additions, 0 deletions...tatic/dialog/test/qunit/browserid-identities_unit_test.js
- browserid/static/dialog/test/qunit/browserid-network_test.js 12 additions, 0 deletionsbrowserid/static/dialog/test/qunit/browserid-network_test.js
- browserid/static/js/pages/manage_account.js 1 addition, 1 deletionbrowserid/static/js/pages/manage_account.js
- browserid/tests/password-length-test.js 5 additions, 1 deletionbrowserid/tests/password-length-test.js
- browserid/tests/registration-status-wsapi-test.js 4 additions, 4 deletionsbrowserid/tests/registration-status-wsapi-test.js
- libs/wsapi_client.js 9 additions, 4 deletionslibs/wsapi_client.js
Loading
Please register or sign in to comment