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

c08ea12b

Commit c08ea12b authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'instructions_verify_user' into dev

parents e1e3db59 1394121e

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

resources/static/css/style.css 6 additions, 2 deletions

resources/static/css/style.css
resources/static/dialog/qunit.html 5 additions, 2 deletions

resources/static/dialog/qunit.html
resources/static/dialog/test/qunit/pages/add_email_address_test.js 4 additions, 14 deletions

.../static/dialog/test/qunit/pages/add_email_address_test.js
resources/static/dialog/test/qunit/pages/verify_email_address_test.js 174 additions, 0 deletions

...atic/dialog/test/qunit/pages/verify_email_address_test.js
resources/static/dialog/test/qunit/qunit.js 1 addition, 0 deletions

resources/static/dialog/test/qunit/qunit.js
resources/static/js/pages/add_email_address.js 2 additions, 2 deletions

resources/static/js/pages/add_email_address.js
resources/static/js/pages/verify_email_address.js 42 additions, 27 deletions

resources/static/js/pages/verify_email_address.js
resources/views/verifyemail.ejs 4 additions, 3 deletions

resources/views/verifyemail.ejs
resources/views/verifyuser.ejs 11 additions, 4 deletions

resources/views/verifyuser.ejs

with 249 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