Merge remote-tracking branch 'origin/dev' into state_machine_refactor
Conflicts: resources/static/dialog/js/misc/state.js
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- ChangeLog 32 additions, 2 deletionsChangeLog
- bin/browserid 1 addition, 1 deletionbin/browserid
- bin/keysigner 6 additions, 4 deletionsbin/keysigner
- bin/router 5 additions, 0 deletionsbin/router
- bin/static 9 additions, 5 deletionsbin/static
- bin/verifier 2 additions, 0 deletionsbin/verifier
- config/aws.json 2 additions, 2 deletionsconfig/aws.json
- config/production.json 0 additions, 1 deletionconfig/production.json
- docs/AWS_DEPLOYMENT.md 13 additions, 0 deletionsdocs/AWS_DEPLOYMENT.md
- docs/TESTING.md 13 additions, 0 deletionsdocs/TESTING.md
- example/rp/index.html 1 addition, 1 deletionexample/rp/index.html
- lib/configuration.js 21 additions, 2 deletionslib/configuration.js
- lib/i18n.js 59 additions, 68 deletionslib/i18n.js
- 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/primary.js 35 additions, 10 deletionslib/primary.js
- lib/sanitize.js 0 additions, 44 deletionslib/sanitize.js
- lib/static/views.js 44 additions, 19 deletionslib/static/views.js
Loading
Please register or sign in to comment