Merge lp://qastaging/ubuntu-facebook-app into lp://qastaging/~kedazo/ubuntu-facebook-app/ci-fix
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/ubuntu-facebook-app |
| Merge into: | lp://qastaging/~kedazo/ubuntu-facebook-app/ci-fix |
| Diff against target: |
1500 lines (+812/-130) (has conflicts) 34 files modified
.bzr-builddeb/default.conf (+2/-0) .bzrignore (+7/-0) AuthModel.qml (+1/-0) CommentsPanel.qml (+236/-0) LoginPopup.qml (+4/-2) NewsPage.qml (+72/-66) StatusUpdatePopup.qml (+138/-0) ThreadView.qml (+132/-0) artwork/PageHeaderBaseDivider@18.sci (+5/-0) artwork/PageHeaderBaseDividerLight@18.sci (+5/-0) artwork/TabLeftSelected@8.sci (+7/-0) artwork/TabLeftUnselected@8.sci (+7/-0) artwork/TabMiddleSelected@8.sci (+7/-0) artwork/TabMiddleUnselected@8.sci (+7/-0) artwork/TabRightSelected@8.sci (+7/-0) artwork/TabRightUnselected@8.sci (+7/-0) artwork/ubuntushape_medium_radius_idle@18.sci (+5/-0) artwork/ubuntushape_medium_radius_pressed@18.sci (+5/-0) artwork/ubuntushape_medium_radius_shape@18.sci (+5/-0) artwork/ubuntushape_small_radius_idle@18.sci (+5/-0) artwork/ubuntushape_small_radius_pressed@18.sci (+5/-0) artwork/ubuntushape_small_radius_shape@18.sci (+5/-0) auth.js (+18/-13) debian/compat (+1/-1) debian/control (+7/-6) debian/copyright (+5/-5) debian/rules (+3/-21) debian/source/format (+1/-1) debian/ubuntu-facebook-app.install (+4/-3) facebook.js (+49/-0) facebook.qmlproject (+1/-1) ubuntu-facebook-app (+1/-1) ubuntu-facebook-app.desktop (+1/-1) ubuntu-facebook-app.qml (+47/-9) Contents conflict in facebook.qmlproject.user |
| To merge this branch: | bzr merge lp://qastaging/ubuntu-facebook-app |
| Related bugs: | |
| Related blueprints: |
Facebook application implementation
(Undefined)
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Kedves | Pending | ||
|
Review via email:
|
|||
Description of the change
Dropped the shldibdeps, as there are no binaries in the package.
Unmerged revisions
- 8. By Robert Bruce Park
-
Stop using deprecated image://gicon.
- 7. By Florian Boucault
-
Remove use of theming because the theming infrastructure in the toolkit is going to change drastically.
The theme was copied over almost entirely from the toolkit which should not be done. There was however one significant difference: the header background and height were customized. That capability might be introduced differently in the future. For now no custom header unfortunately.
Approved by Ubuntu Phone Apps Jenkins Bot, Hugo Miguel Barbarrica Rodrigues Lima.
- 6. By Riccardo Padovani
-
Fix #1173261. Fixes: https:/
/bugs.launchpad .net/bugs/ 1173261. Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.
- 5. By Hugo Miguel Barbarrica Rodrigues Lima
-
Initial development:
- List comments and likes
- Post a comment
- Like / Unlike post.Approved by Michael Hall, Ubuntu Phone Apps Jenkins Bot.
- 4. By Hugo Miguel Barbarrica Rodrigues Lima
-
Initial version with login and news feed.
Approved by Ubuntu Phone Apps Jenkins Bot, Michael Hall.
- 3. By Michael Hall
-
Updates packaging and icon for a better install.
Approved by Hugo Miguel Barbarrica Rodrigues Lima, Ubuntu Phone Apps Jenkins Bot.
