Merge lp://qastaging/~rockstar/ubuntuone-ios-music/storyboard-20api-views into lp://qastaging/ubuntuone-ios-music
| Status: | Merged |
|---|---|
| Approved by: | Paul Hummer |
| Approved revision: | 249 |
| Merged at revision: | 241 |
| Proposed branch: | lp://qastaging/~rockstar/ubuntuone-ios-music/storyboard-20api-views |
| Merge into: | lp://qastaging/ubuntuone-ios-music |
| Diff against target: |
4631 lines (+3809/-252) 52 files modified
Music/Models/Album.h (+29/-0) Music/Models/Album.m (+94/-0) Music/Models/Artist.h (+24/-0) Music/Models/Artist.m (+61/-0) Music/Models/Playlist.h (+21/-0) Music/Models/Playlist.m (+52/-0) Music/Models/Song.h (+45/-0) Music/Models/Song.m (+179/-0) Music/Models/UOModel.h (+25/-0) Music/Models/UOModel.m (+66/-0) Music/Storyboard_iPhone.storyboard (+892/-0) Music/UOAppDelegate.h (+28/-0) Music/UOAppDelegate.m (+208/-0) Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents (+60/-0) Music/Utilities/UOWebServiceController.h (+39/-0) Music/Utilities/UOWebServiceController.m (+208/-0) Music/View Controllers/AlbumViewController.h (+17/-0) Music/View Controllers/AlbumViewController.m (+149/-0) Music/View Controllers/AlbumsViewController.h (+12/-0) Music/View Controllers/AlbumsViewController.m (+60/-0) Music/View Controllers/ArtistViewController.h (+17/-0) Music/View Controllers/ArtistViewController.m (+140/-0) Music/View Controllers/ArtistsViewController.h (+12/-0) Music/View Controllers/ArtistsViewController.m (+64/-0) Music/View Controllers/PlayerViewController.h (+31/-0) Music/View Controllers/PlayerViewController.m (+118/-0) Music/View Controllers/PlaylistsViewController.h (+12/-0) Music/View Controllers/PlaylistsViewController.m (+48/-0) Music/View Controllers/SettingsAboutViewController.h (+13/-0) Music/View Controllers/SettingsAboutViewController.m (+42/-0) Music/View Controllers/SettingsAuthenticationViewController.h (+13/-0) Music/View Controllers/SettingsAuthenticationViewController.m (+117/-0) Music/View Controllers/SettingsViewController.h (+13/-0) Music/View Controllers/SettingsViewController.m (+60/-0) Music/View Controllers/SongsViewController.h (+12/-0) Music/View Controllers/SongsViewController.m (+70/-0) Music/View Controllers/UOIndexedViewController.h (+31/-0) Music/View Controllers/UOIndexedViewController.m (+169/-0) Music/Views/PlayerHeaderView.h (+21/-0) Music/Views/PlayerHeaderView.m (+25/-0) Music/Views/Table Cells/AlbumCell.h (+14/-0) Music/Views/Table Cells/AlbumCell.m (+32/-0) Music/Views/Table Cells/ArtistCell.h (+14/-0) Music/Views/Table Cells/ArtistCell.m (+37/-0) Music/Views/Table Cells/PlaylistCell.h (+14/-0) Music/Views/Table Cells/PlaylistCell.m (+26/-0) Music/Views/Table Cells/SongCell.h (+14/-0) Music/Views/Table Cells/SongCell.m (+32/-0) Music/main.m (+2/-2) U1Music-Info.plist (+3/-3) U1Music.xcodeproj/project.pbxproj (+320/-247) U1Music_Prefix.pch (+4/-0) |
| To merge this branch: | bzr merge lp://qastaging/~rockstar/ubuntuone-ios-music/storyboard-20api-views |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Karnicki (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Use 2.0 Music API
Description of the change
This branch is the mother branch. It looks huge. It's not. A majority of this code has already been reviewed and merged into the re-write branch. Basically, revision 244+ is what needs to be reviewed. I'll make it easy on you by linking to the individual revisions (I tried to keep them making sense).
http://
http://
http://
http://
http://
http://
| Michał Karnicki (karni) | # |
