Merge lp://qastaging/~rockstar/ubuntuone-ios-music/simplify-view-controller into lp://qastaging/ubuntuone-ios-music
Proposed by
Paul Hummer
| Status: | Merged |
|---|---|
| Approved by: | Zachery Bir |
| Approved revision: | 265 |
| Merged at revision: | 238 |
| Proposed branch: | lp://qastaging/~rockstar/ubuntuone-ios-music/simplify-view-controller |
| Merge into: | lp://qastaging/ubuntuone-ios-music |
| Prerequisite: | lp://qastaging/~rockstar/ubuntuone-ios-music/pass-token |
| Diff against target: |
636 lines (+143/-215) 7 files modified
Other Sources/U1MusicAppDelegate.m (+5/-5) U1Music.xcodeproj/project.pbxproj (+0/-6) view_controllers/UOMusicLoginController.h (+0/-31) view_controllers/UOMusicLoginController.m (+0/-108) view_controllers/UOSSOCredentialsViewController.h (+6/-1) view_controllers/UOSSOCredentialsViewController.m (+45/-8) view_controllers/UOSSOCredentialsViewController.xib (+87/-56) |
| To merge this branch: | bzr merge lp://qastaging/~rockstar/ubuntuone-ios-music/simplify-view-controller |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zachery Bir | Approve | ||
|
Review via email:
|
|||
Commit message
Simplify the view controllers for handling login.
Description of the change
We had two view controllers for handling login. Now we only have one. It's simpler, and everything still works the same way (though in testing, I discovered a bug in UbuntuOneAuthKit).
To post a comment you must log in.
Revision history for this message
| Zachery Bir (urbanape) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
