Merge branch 'relay_race_condition' into dev (f580eef2) · 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

f580eef2

Commit f580eef2 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'relay_race_condition' into dev

parents 91256e07 67453c80

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

browserid/compress.sh 1 addition, 1 deletion

browserid/compress.sh
browserid/static/dialog/resources/channel.js 59 additions, 62 deletions

browserid/static/dialog/resources/channel.js
browserid/static/dialog/test/qunit/qunit.js 2 additions, 0 deletions

browserid/static/dialog/test/qunit/qunit.js
browserid/static/dialog/test/qunit/relay/relay_unit_test.js 183 additions, 0 deletions

browserid/static/dialog/test/qunit/relay/relay_unit_test.js
browserid/static/dialog/test/qunit/resources/channel_unit_test.js 137 additions, 0 deletions

...d/static/dialog/test/qunit/resources/channel_unit_test.js
browserid/static/relay/relay.js 99 additions, 26 deletions

browserid/static/relay/relay.js
browserid/views/relay.ejs 12 additions, 0 deletions

browserid/views/relay.ejs

with 493 additions and 89 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