lp:~uriboni/webbrowser-app/bookmarks-in-suggestions

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:webbrowser-app at revision 973

Olivier Tilloy: Approve on 2015-04-17

PS Jenkins bot: Approve (continuous-integration) on 2015-04-16

Diff: 1185 lines (+555/-335)

14 files modified

src/app/webbrowser/Browser.qml (+29/-5)
src/app/webbrowser/CMakeLists.txt (+1/-1)
src/app/webbrowser/Suggestion.qml (+81/-0)
src/app/webbrowser/Suggestions.qml (+57/-85)
src/app/webbrowser/history-matches-model.cpp (+0/-92)
src/app/webbrowser/history-matches-model.h (+0/-62)
src/app/webbrowser/suggestions-filter-model.cpp (+135/-0)
src/app/webbrowser/suggestions-filter-model.h (+72/-0)
src/app/webbrowser/webbrowser-app.cpp (+2/-2)
tests/autopilot/webbrowser_app/emulators/browser.py (+3/-5)
tests/autopilot/webbrowser_app/tests/test_suggestions.py (+93/-28)
tests/unittests/CMakeLists.txt (+1/-1)
tests/unittests/suggestions-filter-model/CMakeLists.txt (+2/-2)
tests/unittests/suggestions-filter-model/tst_SuggestionsFilterModelTests.cpp (+79/-52)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1351177: Suggestions improvements

Medium

Fix Released

Link a bug report

Related blueprints

995. By Ugo Riboni on 2015-04-22

Revert .pot file which was commited by mistake

994. By Ugo Riboni on 2015-04-22

Merge changes from trunk

993. By Ugo Riboni on 2015-04-16

Reach full coverage on the SuggestionsFilterModel class

992. By Ugo Riboni on 2015-04-16

Fix flake8 error

991. By Ugo Riboni on 2015-04-16

Merge two functions in suggestions AP emulator as essentially equivalent

990. By Ugo Riboni on 2015-04-16

Tiny optimization

989. By Ugo Riboni on 2015-04-16

Protect against duplicate search terms preventing a match

988. By Ugo Riboni on 2015-04-16

More permissive search, allows terms to be found across fields

987. By Ugo Riboni on 2015-04-16

Remove mistaken call to highlightTerms from within Suggestion.qml

986. By Ugo Riboni on 2015-04-16

Make code slightly more elegant (and possibly efficient) by using a JS array for the list of models