Merge lp://qastaging/~qqworini/ubuntu-rssreader-app/reboot-add-opml-support into lp://qastaging/ubuntu-rssreader-app
Proposed by
Joey Chan
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Nicholas Skaggs | ||||||||
| Approved revision: | 418 | ||||||||
| Merged at revision: | 417 | ||||||||
| Proposed branch: | lp://qastaging/~qqworini/ubuntu-rssreader-app/reboot-add-opml-support | ||||||||
| Merge into: | lp://qastaging/ubuntu-rssreader-app | ||||||||
| Diff against target: |
856 lines (+681/-38) 7 files modified
shorts/po/com.ubuntu.shorts.pot (+52/-17) shorts/qml/content/ContentPickerDialog.qml (+52/-0) shorts/qml/content/ImportFeeds.qml (+328/-0) shorts/qml/content/OpmlParser.qml (+123/-0) shorts/qml/pages/PageSettings.qml (+43/-17) shorts/qml/utils/databasemodule_v2.js (+76/-0) shorts/shorts.qrc (+7/-4) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~qqworini/ubuntu-rssreader-app/reboot-add-opml-support | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jenkins Bot | continuous-integration | Approve | |
| Ubuntu Shorts Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Add opml support.
User now can import their own opml file into Shorts. No export function yet.
Description of the change
Add opml support.
User now can import their own opml file into Shorts. No export function yet.
To post a comment you must log in.
Revision history for this message
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Jenkins Bot (ubuntu-core-apps-jenkins-bot) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:418
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/