Ubuntu Shorts App

Merge lp://qastaging/~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml into lp://qastaging/ubuntu-rssreader-app

  1. fix-crash-rewrite-opml
  2. Merge into reboot
Proposed by Joey Chan
Status: Merged
Approved by: Joey Chan
Approved revision: 428
Merged at revision: 453
Proposed branch: lp://qastaging/~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml
Merge into: lp://qastaging/ubuntu-rssreader-app
Diff against target: 9146 lines (+5314/-1200)
42 files modified
.bzrignore (+1/-0)
shorts/po/com.ubuntu.shorts.pot (+28/-28)
shorts/po/zh_CN.po (+0/-458)
shorts/qml/components/ArticleViewItem.qml (+6/-1)
shorts/qml/content/ContentPickerDialog.qml (+4/-0)
shorts/qml/content/ImportFeeds.qml (+10/-2)
shorts/qml/content/OpmlParser.qml (+42/-19)
shorts/qml/nongoogle/AppendNGFeedPage.qml (+14/-9)
shorts/qml/nongoogle/XmlNetwork.qml (+57/-42)
shorts/qml/shorts-app.qml (+2/-0)
shorts/qml/utils/databasemodule_v2.js (+7/-5)
shorts/utilities.cpp (+89/-15)
shorts/utilities.h (+20/-1)
shorts/xml2json/rapidjson/allocators.h (+3/-1)
shorts/xml2json/rapidjson/document.h (+607/-160)
shorts/xml2json/rapidjson/encodedstream.h (+30/-1)
shorts/xml2json/rapidjson/encodings.h (+77/-0)
shorts/xml2json/rapidjson/filereadstream.h (+1/-1)
shorts/xml2json/rapidjson/filewritestream.h (+1/-1)
shorts/xml2json/rapidjson/fwd.h (+151/-0)
shorts/xml2json/rapidjson/internal/diyfp.h (+1/-1)
shorts/xml2json/rapidjson/internal/dtoa.h (+33/-6)
shorts/xml2json/rapidjson/internal/ieee754.h (+1/-0)
shorts/xml2json/rapidjson/internal/regex.h (+705/-0)
shorts/xml2json/rapidjson/internal/stack.h (+39/-5)
shorts/xml2json/rapidjson/internal/strfunc.h (+17/-1)
shorts/xml2json/rapidjson/internal/strtod.h (+0/-1)
shorts/xml2json/rapidjson/internal/swap.h (+9/-0)
shorts/xml2json/rapidjson/istreamwrapper.h (+110/-0)
shorts/xml2json/rapidjson/memorybuffer.h (+1/-1)
shorts/xml2json/rapidjson/memorystream.h (+3/-3)
shorts/xml2json/rapidjson/ostreamwrapper.h (+76/-0)
shorts/xml2json/rapidjson/pointer.h (+55/-27)
shorts/xml2json/rapidjson/prettywriter.h (+52/-10)
shorts/xml2json/rapidjson/rapidjson.h (+76/-150)
shorts/xml2json/rapidjson/reader.h (+539/-200)
shorts/xml2json/rapidjson/schema.h (+2017/-0)
shorts/xml2json/rapidjson/stream.h (+179/-0)
shorts/xml2json/rapidjson/stringbuffer.h (+25/-1)
shorts/xml2json/rapidjson/writer.h (+222/-48)
shorts/xml2json/rapidxml/rapidxml.hpp (+1/-1)
shorts/xml2json/xml2json.hpp (+3/-1)
To merge this branch: bzr merge lp://qastaging/~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+297077@code.qastaging.launchpad.net

Commit message

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995.

And a new help page.

Description of the change

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995.

And a new help page.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:424
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/21/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/916/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/21/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-autolanding/951/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5757/console

review: Needs Fixing (continuous-integration)
lp://qastaging/~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml updated
425. By Joey Chan

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995. fix Po file conflict. version 2

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:425
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/22/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/923/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/22/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml updated
426. By Joey Chan

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995. fix Po file conflict. version 2

427. By Joey Chan

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995. fix Po file conflict. version 3

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:427
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/23/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/924/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/23/rebuild

review: Approve (continuous-integration)
lp://qastaging/~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml updated
428. By Joey Chan

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995. Update zh_CN Po file conflict. version 4

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:428
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/24/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/925/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/24/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches