merge with dev
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- bin/browserid 2 additions, 2 deletionsbin/browserid
- config/aws.json 1 addition, 0 deletionsconfig/aws.json
- example/primary/provision.html 3 additions, 6 deletionsexample/primary/provision.html
- example/primary/sign_in.html 8 additions, 15 deletionsexample/primary/sign_in.html
- example/rp/index.html 0 additions, 13 deletionsexample/rp/index.html
- lib/browserid/fake_verification.js 0 additions, 0 deletionslib/browserid/fake_verification.js
- lib/configuration.js 0 additions, 4 deletionslib/configuration.js
- lib/email.js 58 additions, 14 deletionslib/email.js
- lib/static/email_templates/add.ejs 9 additions, 0 deletionslib/static/email_templates/add.ejs
- lib/static/email_templates/new.ejs 9 additions, 0 deletionslib/static/email_templates/new.ejs
- lib/static/email_templates/reset.ejs 9 additions, 0 deletionslib/static/email_templates/reset.ejs
- lib/static/prove_template.ejs 0 additions, 10 deletionslib/static/prove_template.ejs
- lib/static_resources.js 102 additions, 99 deletionslib/static_resources.js
- package.json 1 addition, 1 deletionpackage.json
- resources/static/authentication_api.js 2 additions, 3 deletionsresources/static/authentication_api.js
- resources/static/common/css/ie8.css 1 addition, 1 deletionresources/static/common/css/ie8.css
- resources/static/common/css/style.css 131 additions, 50 deletionsresources/static/common/css/style.css
- resources/static/common/fonts/LICENSE.txt 203 additions, 203 deletionsresources/static/common/fonts/LICENSE.txt
- resources/static/common/fonts/OpenSans-Bold.eot 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Bold.eot
Loading
Please register or sign in to comment