Merge lp://qastaging/~qqworini/ubuntu-rssreader-app/new-settings-help into lp://qastaging/ubuntu-rssreader-app
Proposed by
Joey Chan
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Joey Chan | ||||
| Approved revision: | 422 | ||||
| Merged at revision: | 437 | ||||
| Proposed branch: | lp://qastaging/~qqworini/ubuntu-rssreader-app/new-settings-help | ||||
| Merge into: | lp://qastaging/ubuntu-rssreader-app | ||||
| Diff against target: |
7285 lines (+3809/-1224) 51 files modified
shorts/CMakeLists.txt (+1/-1) shorts/main.cpp (+1/-1) shorts/po/com.ubuntu.shorts.pot (+152/-64) shorts/qml/components/NetworkManager.qml (+2/-2) shorts/qml/components/OptionsKeeper.qml (+47/-22) shorts/qml/components/SettingsItem.qml (+120/-0) shorts/qml/icons/CMakeLists.txt (+1/-1) shorts/qml/nongoogle/Positioner.qml (+8/-5) shorts/qml/nongoogle/XmlNetwork.qml (+7/-1) shorts/qml/pages/PageHelp.qml (+371/-0) shorts/qml/pages/PageInfo.qml (+79/-0) shorts/qml/pages/PageSettings.qml (+15/-2) shorts/qml/shorts-app.qml (+44/-31) shorts/qml/utils/databasemodule_v2.js (+3/-3) shorts/qml/utils/xml2json.js (+242/-0) shorts/shorts.pro (+2/-2) shorts/shorts.qrc (+8/-0) shorts/utilities.cpp (+68/-0) shorts/utilities.h (+28/-0) shorts/xml2json/rapidjson/allocators.h (+42/-26) shorts/xml2json/rapidjson/document.h (+256/-95) shorts/xml2json/rapidjson/encodedstream.h (+38/-58) shorts/xml2json/rapidjson/encodings.h (+89/-84) shorts/xml2json/rapidjson/error/en.h (+27/-24) shorts/xml2json/rapidjson/error/error.h (+29/-24) shorts/xml2json/rapidjson/filereadstream.h (+24/-19) shorts/xml2json/rapidjson/filewritestream.h (+27/-20) shorts/xml2json/rapidjson/internal/biginteger.h (+31/-35) shorts/xml2json/rapidjson/internal/diyfp.h (+37/-47) shorts/xml2json/rapidjson/internal/dtoa.h (+29/-37) shorts/xml2json/rapidjson/internal/ieee754.h (+32/-45) shorts/xml2json/rapidjson/internal/itoa.h (+21/-23) shorts/xml2json/rapidjson/internal/meta.h (+14/-22) shorts/xml2json/rapidjson/internal/pow10.h (+15/-19) shorts/xml2json/rapidjson/internal/stack.h (+36/-23) shorts/xml2json/rapidjson/internal/strfunc.h (+15/-19) shorts/xml2json/rapidjson/internal/strtod.h (+48/-63) shorts/xml2json/rapidjson/internal/swap.h (+37/-0) shorts/xml2json/rapidjson/memorybuffer.h (+13/-19) shorts/xml2json/rapidjson/memorystream.h (+23/-19) shorts/xml2json/rapidjson/msinttypes/inttypes.h (+4/-0) shorts/xml2json/rapidjson/msinttypes/stdint.h (+8/-4) shorts/xml2json/rapidjson/pointer.h (+1326/-0) shorts/xml2json/rapidjson/prettywriter.h (+21/-25) shorts/xml2json/rapidjson/rapidjson.h (+88/-32) shorts/xml2json/rapidjson/reader.h (+195/-119) shorts/xml2json/rapidjson/stringbuffer.h (+13/-19) shorts/xml2json/rapidjson/writer.h (+46/-47) shorts/xml2json/utilities.cpp (+0/-46) shorts/xml2json/utilities.h (+0/-24) shorts/xml2json/xml2json.hpp (+26/-52) |
||||
| To merge this branch: | bzr merge lp://qastaging/~qqworini/ubuntu-rssreader-app/new-settings-help | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jenkins Bot | continuous-integration | Approve | |
| Ubuntu Shorts Developers | Pending | ||
|
Review via email:
|
|||
Commit message
0. replace U1DB with QSettings
1. add a help page
2. add an info page
To all reviewers, in those new added pages, some words, sentences or statements may NOT right or NOT clear, pls help me to correct them before merge :)
Description of the change
0. replace U1DB with QSettings
1. add a help page
2. add an info page
To post a comment you must log in.
Revision history for this message
| Roman Shchekin (mrqtros) wrote | # |
Revision history for this message
| Roman Shchekin (mrqtros) wrote | # |
Revision history for this message
| Roman Shchekin (mrqtros) wrote | # |
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
Great work, mate! Give me some time to test it :)
As you may know I am preparing a lot of changes right now, so I foresee a lot of merge conflicts =\