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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntu-rssreader-app at revision 453

Jenkins Bot: Approve (continuous-integration) on 2016-06-15

Ubuntu Shorts Developers: Pending requested 2016-06-10

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1543736: [RSS Reader] crashes when refreshing and no pics shown	Medium	Fix Committed
Bug #1543995: Shorts converts & into & when reading RDF feeds	Medium	Fix Committed
Bug #1546443: Shorts App crashes when fetching updates if "Use Google Search" is disabled	Medium	Fix Committed
Bug #1562315: Typo in Shorts	Undecided	Fix Committed
Bug #1565406: Adult feeds excluded on OPML import	Medium	Fix Committed

Link a bug report

Related blueprints

428. By Joey Chan on 2016-06-15

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

427. By Joey Chan on 2016-06-15

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

426. By Joey Chan on 2016-06-15

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

425. By Joey Chan on 2016-06-15

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

424. By Joey Chan on 2016-06-10

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

423. By Joey Chan on 2016-04-22

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

422. By Joey Chan on 2016-03-18

use qsettings to replace U1DB, and a new help page, a new info page, fix .pro config

421. By Joey Chan on 2016-03-11

use qsettings to replace U1DB, and a new help page, a new info page

420. By Joey Chan on 2016-03-04

use qsettings to replace U1DB, and a new help page

419. By Launchpad Translations on behalf of ubuntu-shorts-dev on 2016-02-19

Launchpad automatic translations update.