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

d7d43320

Commit d7d43320 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'error_messages' into dev

parents 39ada0b5 00def287

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

browserid/static/dialog/controllers/authenticate_controller.js 5 additions, 9 deletions

...erid/static/dialog/controllers/authenticate_controller.js
browserid/static/dialog/controllers/dialog_controller.js 38 additions, 10 deletions

browserid/static/dialog/controllers/dialog_controller.js
browserid/static/dialog/controllers/pickemail_controller.js 3 additions, 2 deletions

browserid/static/dialog/controllers/pickemail_controller.js
browserid/static/dialog/resources/error-messages.js 32 additions, 2 deletions

browserid/static/dialog/resources/error-messages.js
browserid/static/dialog/resources/network.js 93 additions, 82 deletions

browserid/static/dialog/resources/network.js
browserid/static/dialog/resources/user.js 5 additions, 5 deletions

browserid/static/dialog/resources/user.js
browserid/static/dialog/test/qunit/resources/network_unit_test.js 251 additions, 8 deletions

...d/static/dialog/test/qunit/resources/network_unit_test.js
browserid/static/dialog/test/qunit/resources/user_unit_test.js 237 additions, 28 deletions

...erid/static/dialog/test/qunit/resources/user_unit_test.js

with 664 additions and 146 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