Merge branch 'master' of github.com:mozilla/mozidhacks (99effaa6) · 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

99effaa6

Commit 99effaa6 authored 14 years ago by mhanson@gmail.com

Downloads
- Plain Diff

Merge branch 'master' of github.com:mozilla/mozidhacks

Conflicts:
	authority/static/dialog/crypto-stubs.js

parents 6e56801f 99fac794

Loading

Changes 14

Expand all Hide whitespace changes

Inline Side-by-side

Showing

README.md 17 additions, 8 deletions

README.md
authority/server/run.js 2 additions, 2 deletions

authority/server/run.js
authority/server/webfinger.js 12 additions, 15 deletions

authority/server/webfinger.js
authority/server/webfinger_template.xml 11 additions, 0 deletions

authority/server/webfinger_template.xml
authority/static/dialog/crypto-stubs.js 9 additions, 7 deletions

authority/static/dialog/crypto-stubs.js
authority/static/dialog/crypto.js 250 additions, 0 deletions

authority/static/dialog/crypto.js
authority/static/dialog/index.html 2 additions, 0 deletions

authority/static/dialog/index.html
rp/index.html 4 additions, 4 deletions

rp/index.html
rp/jquery-min.js 0 additions, 0 deletions

rp/jquery-min.js
rp/server/httputils.js 0 additions, 52 deletions

rp/server/httputils.js
rp/server/run.js 0 additions, 45 deletions

rp/server/run.js
rp/server/verify.js 0 additions, 52 deletions

rp/server/verify.js
rp/server/wsapi.js 0 additions, 37 deletions

rp/server/wsapi.js
verifier/server/wsapi.js 11 additions, 1 deletion

verifier/server/wsapi.js

with 318 additions and 223 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