Merge branch 'issue1757' of https://github.com/zaach/browserid into dev (c54c6e1d) · Commits · Hexang 息壤平台 / persona · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

persona
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

c54c6e1d

Commit c54c6e1d authored 12 years ago by Lloyd Hilaiel

Downloads
- Plain Diff

Merge branch 'issue1757' of https://github.com/zaach/browserid into dev

parents 51ac3a5c d30f742c

Loading

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

bin/browserid 9 additions, 40 deletions

bin/browserid
bin/router 31 additions, 8 deletions

bin/router
bin/static 106 additions, 0 deletions

bin/static
config/local.json 1 addition, 0 deletions

config/local.json
config/production.json 3 additions, 1 deletion

config/production.json
lib/configuration.js 4 additions, 0 deletions

lib/configuration.js
lib/email.js 1 addition, 1 deletion

lib/email.js
lib/static/email_templates/add.ejs 0 additions, 0 deletions

lib/static/email_templates/add.ejs
lib/static/email_templates/new.ejs 0 additions, 0 deletions

lib/static/email_templates/new.ejs
lib/static/email_templates/reset.ejs 0 additions, 0 deletions

lib/static/email_templates/reset.ejs
lib/static/views.js 2 additions, 0 deletions

lib/static/views.js
lib/wsapi.js 102 additions, 96 deletions

lib/wsapi.js
lib/wsapi/create_account_with_assertion.js 1 addition, 1 deletion

lib/wsapi/create_account_with_assertion.js
scripts/run_locally.js 2 additions, 0 deletions

scripts/run_locally.js
tests/heartbeat-test.js 60 additions, 0 deletions

tests/heartbeat-test.js
tests/internal-wsapi-test.js 35 additions, 0 deletions

tests/internal-wsapi-test.js

with 357 additions and 147 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment