Merge branch 'authentication_error' into dev (68514eb6) · 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

68514eb6

Commit 68514eb6 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'authentication_error' into dev

parents 1dcb853a ffe27378

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

browserid/static/dialog/controllers/authenticate_controller.js 1 addition, 4 deletions

...erid/static/dialog/controllers/authenticate_controller.js
browserid/static/dialog/controllers/page_controller.js 15 additions, 1 deletion

browserid/static/dialog/controllers/page_controller.js
browserid/static/dialog/controllers/pickemail_controller.js 13 additions, 8 deletions

browserid/static/dialog/controllers/pickemail_controller.js
browserid/static/dialog/css/popup.css 18 additions, 4 deletions

browserid/static/dialog/css/popup.css
browserid/static/dialog/views/authenticate.ejs 3 additions, 3 deletions

browserid/static/dialog/views/authenticate.ejs
browserid/static/dialog/views/pickemail.ejs 10 additions, 4 deletions

browserid/static/dialog/views/pickemail.ejs

with 60 additions and 24 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