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

ef0336d9

Commit ef0336d9 authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'keep_signed_in_frontend' into dev

parents ac748df9 c0631a3a

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

resources/static/dialog/controllers/dialog_controller.js
resources/static/dialog/controllers/pickemail_controller.js 24 additions, 14 deletions

resources/static/dialog/controllers/pickemail_controller.js
resources/static/dialog/views/pickemail.ejs 6 additions, 4 deletions

resources/static/dialog/views/pickemail.ejs
resources/static/test/qunit/controllers/pickemail_controller_unit_test.js 44 additions, 9 deletions

.../test/qunit/controllers/pickemail_controller_unit_test.js

with 79 additions and 29 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