Merge branch 'error_message_missing_relay' into dev (29c578ae) · 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

29c578ae

Commit 29c578ae authored 13 years ago by Shane Tomlinson

Downloads
- Plain Diff

Merge branch 'error_message_missing_relay' into dev

parents 08aa90c6 ae88f7ed

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

resources/static/dialog/controllers/dialog_controller.js
resources/static/dialog/resources/channel.js 11 additions, 6 deletions

resources/static/dialog/resources/channel.js
resources/static/dialog/resources/error-messages.js 6 additions, 0 deletions

resources/static/dialog/resources/error-messages.js
resources/static/dialog/test/qunit/controllers/dialog_controller_unit_test.js 35 additions, 16 deletions

...log/test/qunit/controllers/dialog_controller_unit_test.js
resources/static/dialog/test/qunit/resources/channel_unit_test.js 26 additions, 1 deletion

...s/static/dialog/test/qunit/resources/channel_unit_test.js

with 86 additions and 25 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