Merge branch 'dev' into feature_primaries (9e14abfa) · 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

9e14abfa

Commit 9e14abfa authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'dev' into feature_primaries

Conflicts:
	resources/views/verifyuser.ejs

parents 464ac4e1 c29b2268

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

bin/browserid 4 additions, 0 deletions

bin/browserid
resources/static/pages/manage_account.js 4 additions, 0 deletions

resources/static/pages/manage_account.js
resources/static/shared/validation.js 2 additions, 2 deletions

resources/static/shared/validation.js
resources/static/test/qunit/pages/manage_account_unit_test.js 31 additions, 0 deletions

...urces/static/test/qunit/pages/manage_account_unit_test.js
resources/static/test/qunit/shared/validation_unit_test.js 11 additions, 0 deletions

resources/static/test/qunit/shared/validation_unit_test.js
resources/views/index.ejs 6 additions, 5 deletions

resources/views/index.ejs
resources/views/verify_email_address.ejs 2 additions, 2 deletions

resources/views/verify_email_address.ejs
tests/post-limiting-test.js 116 additions, 0 deletions

tests/post-limiting-test.js

with 176 additions and 9 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