Merge lp:~qqworini/ubuntu-rssreader-app/fix-bug-1335871-1335876 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

fix bug 1335871 & 1335876

fix bug 1335871 & 1335876

Roman said there's another "author" issue from autopilot test, but I can tell that's an error from U1DB, it did not store the latest setting data which cause the autopilot test failed.
So I suggest someone clear all data of Shorts (only needed this time, not every time)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:247
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/239/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/726/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/18/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/239/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Trunk is now fixed and working properly. Kicking off a rebuild for this MP which should reflect any issues properly

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:247
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/242/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/828
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/828/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/21

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/242/rebuild

review: Approve (continuous-integration)

[Joey Chan (qqworini)]

lol

THX !

=== modified file 'ArticleViewItem.qml'
--- ArticleViewItem.qml	2014-05-14 05:28:12 +0000
+++ ArticleViewItem.qml	2014-07-01 03:45:26 +0000
@@ -191,6 +191,7 @@
                     anchors.horizontalCenter: parent.horizontalCenter
                     width: parent.width - units.gu(4)
                     wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                    visible: text !== "" && text !== '""'
                 }
 
                 Label {

=== modified file 'ShortsTab.qml'
--- ShortsTab.qml	2014-04-30 17:33:12 +0000
+++ ShortsTab.qml	2014-07-01 03:45:26 +0000
@@ -155,6 +155,7 @@
                 "title" : cart.title,
                 "content" : cart.content,
                 "link" : cart.link,
+                "author": cart.author,
                 "description" : cart.description,
                 "pubdate" : cart.pubdate,
                 "status" : cart.status,