Merge remote-tracking branch 'upstream/dev' into dev
No related branches found
No related tags found
Showing
- lib/db/json.js 1 addition, 1 deletionlib/db/json.js
- lib/db/mysql.js 6 additions, 5 deletionslib/db/mysql.js
- lib/static_resources.js 3 additions, 0 deletionslib/static_resources.js
- lib/wsapi/complete_email_addition.js 45 additions, 1 deletionlib/wsapi/complete_email_addition.js
- lib/wsapi/complete_user_creation.js 70 additions, 13 deletionslib/wsapi/complete_user_creation.js
- lib/wsapi/email_for_token.js 55 additions, 15 deletionslib/wsapi/email_for_token.js
- resources/static/css/style.css 2 additions, 2 deletionsresources/static/css/style.css
- resources/static/pages/verify_secondary_address.js 19 additions, 2 deletionsresources/static/pages/verify_secondary_address.js
- resources/static/shared/models/interaction_data.js 163 additions, 0 deletionsresources/static/shared/models/interaction_data.js
- resources/static/shared/models/models.js 7 additions, 0 deletionsresources/static/shared/models/models.js
- resources/static/shared/modules/interaction_data.js 49 additions, 56 deletionsresources/static/shared/modules/interaction_data.js
- resources/static/shared/storage.js 12 additions, 95 deletionsresources/static/shared/storage.js
- resources/static/test/cases/pages/verify_secondary_address.js 85 additions, 0 deletions...urces/static/test/cases/pages/verify_secondary_address.js
- resources/static/test/cases/shared/models/interaction_data.js 108 additions, 0 deletions...urces/static/test/cases/shared/models/interaction_data.js
- resources/static/test/cases/shared/modules/interaction_data.js 66 additions, 44 deletions...rces/static/test/cases/shared/modules/interaction_data.js
- resources/static/test/cases/shared/storage.js 0 additions, 32 deletionsresources/static/test/cases/shared/storage.js
- resources/static/test/mocks/xhr.js 41 additions, 33 deletionsresources/static/test/mocks/xhr.js
- resources/static/test/testHelpers/helpers.js 6 additions, 1 deletionresources/static/test/testHelpers/helpers.js
- resources/views/add_email_address.ejs 14 additions, 0 deletionsresources/views/add_email_address.ejs
- resources/views/test.ejs 5 additions, 0 deletionsresources/views/test.ejs
Loading
Please register or sign in to comment