Merge lp:~sil/libubuntuone/restrict-domains into lp:libubuntuone
Proposed by
Stuart Langridge
Status: | Merged |
---|---|
Approved by: | Rodrigo Moya |
Approved revision: | 72 |
Merged at revision: | not available |
Proposed branch: | lp:~sil/libubuntuone/restrict-domains |
Merge into: | lp:libubuntuone |
Diff against target: |
348 lines (+234/-55) 4 files modified
data/Makefile.am (+2/-0) data/outside_domain.html (+56/-0) data/trying_sso.html (+58/-0) libubuntuone/u1-music-store.c (+118/-55) |
To merge this branch: | bzr merge lp:~sil/libubuntuone/restrict-domains |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Rodrigo Moya (community) | Approve | ||
Tim Cole (community) | Approve | ||
Review via email: mp+22063@code.launchpad.net |
Commit message
Trap URLs that lead out of the Music Store (either to the non-U1 7digital.com, or to Ubuntu One authentication URLs) and show an error page instead, along with a way of logging the error in querystrings so that we can identify that it happened.
Description of the change
Trap URLs that lead out of the Music Store (either to the non-U1 7digital.com, or to Ubuntu One authentication URLs) and show an error page instead, along with a way of logging the error in querystrings so that we can identify that it happened.
To post a comment you must log in.
59 +<h2>There was a problem with what you just tried to do. Please go back and try something different.</h2>
I'm not sure that's the best error message ever written.
122 +<h2>An error has occurred. Please ensure that your
123 +computer is connected to Ubuntu One.</h2>
How about a link to somewhere explaining how to do that? I guess that would be an external link :)
Can you open up something in firefox though? or explain right there and then?