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

f0ec4ad6

Commit f0ec4ad6 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'cancel_email' into dev

parents 6229c1ac 402537d2

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

resources/static/dialog/controllers/checkregistration_controller.js 30 additions, 15 deletions

...static/dialog/controllers/checkregistration_controller.js
resources/static/dialog/controllers/dialog_controller.js 20 additions, 2 deletions

resources/static/dialog/controllers/dialog_controller.js
resources/static/shared/user.js 24 additions, 2 deletions

resources/static/shared/user.js
resources/static/test/qunit/controllers/checkregistration_controller_unit_test.js 17 additions, 10 deletions

...nit/controllers/checkregistration_controller_unit_test.js
resources/static/test/qunit/pages/browserid_unit_test.js 1 addition, 1 deletion

resources/static/test/qunit/pages/browserid_unit_test.js
resources/static/test/qunit/qunit.js 2 additions, 0 deletions

resources/static/test/qunit/qunit.js
resources/static/test/qunit/shared/user_unit_test.js 67 additions, 24 deletions

resources/static/test/qunit/shared/user_unit_test.js

with 161 additions and 54 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