Merge lp://qastaging/~mardy/ubuntuone-credentials/default-token-name into lp://qastaging/ubuntuone-credentials
Proposed by
Alberto Mardegan
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~mardy/ubuntuone-credentials/default-token-name |
| Merge into: | lp://qastaging/ubuntuone-credentials |
| Diff against target: |
1403 lines (+1071/-53) 15 files modified
CMakeLists.txt (+3/-3) debian/control (+3/-2) debian/libubuntuoneauth-2.0-0.symbols (+4/-0) debian/signon-plugin-ubuntuone.install (+1/-1) libubuntuoneauth/CMakeLists.txt (+13/-3) libubuntuoneauth/tests/test_token.cpp (+7/-0) libubuntuoneauth/tests/test_token.h (+1/-0) libubuntuoneauth/token.cpp (+58/-11) libubuntuoneauth/token.h (+4/-0) signon-plugin/CMakeLists.txt (+14/-4) signon-plugin/tests/CMakeLists.txt (+51/-0) signon-plugin/tests/test_plugin.cpp (+550/-0) signon-plugin/ubuntuone-plugin.cpp (+297/-19) signon-plugin/ubuntuone-plugin.h (+41/-7) signon-plugin/ubuntuonedata.h (+24/-3) |
| To merge this branch: | bzr merge lp://qastaging/~mardy/ubuntuone-credentials/default-token-name |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity API Team | Pending | ||
|
Review via email:
|
|||
Commit message
If no token name is given, use a default one
Description of the change
If no token name is given, use a default one
If we don't do something like this, then we need to accept this:
https:/
(which would be my recommendation, actually).
To post a comment you must log in.
Unmerged revisions
- 243. By Alberto Mardegan
-
Fix stored token response
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
