Merge remote-tracking branch 'origin/dev' into issue_2059_email_selection
Conflicts: resources/static/test/testHelpers/helpers.js
No related branches found
No related tags found
Showing
- ChangeLog 32 additions, 2 deletionsChangeLog
- bin/router 5 additions, 0 deletionsbin/router
- bin/static 8 additions, 4 deletionsbin/static
- docs/AWS_DEPLOYMENT.md 13 additions, 0 deletionsdocs/AWS_DEPLOYMENT.md
- example/rp/index.html 1 addition, 1 deletionexample/rp/index.html
- lib/load_gen/activities/reset_pass.js 1 addition, 2 deletionslib/load_gen/activities/reset_pass.js
- lib/load_gen/activities/signup.js 1 addition, 2 deletionslib/load_gen/activities/signup.js
- lib/metrics.js 3 additions, 0 deletionslib/metrics.js
- lib/static/views.js 1 addition, 3 deletionslib/static/views.js
- lib/wsapi/complete_reset.js 1 addition, 2 deletionslib/wsapi/complete_reset.js
- lib/wsapi/complete_user_creation.js 1 addition, 2 deletionslib/wsapi/complete_user_creation.js
- lib/wsapi/email_for_token.js 16 additions, 17 deletionslib/wsapi/email_for_token.js
- lib/wsapi/password_reset_status.js 1 addition, 1 deletionlib/wsapi/password_reset_status.js
- resources/static/common/js/network.js 2 additions, 9 deletionsresources/static/common/js/network.js
- resources/static/common/js/user.js 34 additions, 13 deletionsresources/static/common/js/user.js
- resources/static/common/js/validation.js 1 addition, 1 deletionresources/static/common/js/validation.js
- resources/static/dialog/css/m.css 8 additions, 0 deletionsresources/static/dialog/css/m.css
- resources/static/dialog/js/misc/state.js 49 additions, 22 deletionsresources/static/dialog/js/misc/state.js
- resources/static/dialog/js/modules/check_registration.js 8 additions, 8 deletionsresources/static/dialog/js/modules/check_registration.js
- resources/static/dialog/js/modules/required_email.js 4 additions, 2 deletionsresources/static/dialog/js/modules/required_email.js
Loading
Please register or sign in to comment