Merge branch 'throttle_staging' into dev (71e2abe7) · 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

71e2abe7

Commit 71e2abe7 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'throttle_staging' into dev

parents b2267674 525808fe

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

resources/static/dialog/controllers/authenticate_controller.js 16 additions, 24 deletions

...rces/static/dialog/controllers/authenticate_controller.js
resources/static/dialog/qunit.html 1 addition, 1 deletion

resources/static/dialog/qunit.html
resources/static/dialog/resources/network.js 15 additions, 2 deletions

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

resources/static/dialog/resources/user.js
resources/static/dialog/test/qunit/controllers/authenticate_controller_unit_test.js 94 additions, 0 deletions

...st/qunit/controllers/authenticate_controller_unit_test.js
resources/static/dialog/test/qunit/qunit.js 1 addition, 0 deletions

resources/static/dialog/test/qunit/qunit.js
resources/static/dialog/test/qunit/resources/network_unit_test.js 34 additions, 2 deletions

...s/static/dialog/test/qunit/resources/network_unit_test.js
resources/static/dialog/test/qunit/resources/user_unit_test.js 31 additions, 5 deletions

...rces/static/dialog/test/qunit/resources/user_unit_test.js
resources/static/dialog/views/authenticate.ejs 8 additions, 0 deletions

resources/static/dialog/views/authenticate.ejs
resources/static/dialog/views/pickemail.ejs 1 addition, 1 deletion

resources/static/dialog/views/pickemail.ejs

with 206 additions and 47 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