lp://staging/~osomon/webbrowser-app/bookmarks-proxy-model

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/webbrowser-app

system-apps-ci-bot: Needs Fixing (continuous-integration) on 2016-04-06

PS Jenkins bot: Approve (continuous-integration) on 2015-12-07

Ubuntu Phablet Team: Pending requested 2015-12-02

Diff: 2398 lines (+1610/-331)

20 files modified

src/app/webbrowser/BookmarksFoldersView.qml (+92/-156)
src/app/webbrowser/BookmarksView.qml (+3/-3)
src/app/webbrowser/CMakeLists.txt (+1/-0)
src/app/webbrowser/NewTabView.qml (+9/-7)
src/app/webbrowser/bookmarks-model.cpp (+1/-1)
src/app/webbrowser/collapsible-bookmarks-model.cpp (+572/-0)
src/app/webbrowser/collapsible-bookmarks-model.h (+98/-0)
src/app/webbrowser/webbrowser-app.cpp (+2/-0)
tests/autopilot/webbrowser_app/emulators/browser.py (+83/-43)
tests/autopilot/webbrowser_app/tests/__init__.py (+1/-6)
tests/autopilot/webbrowser_app/tests/test_bookmark_options.py (+33/-29)
tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+43/-77)
tests/autopilot/webbrowser_app/tests/test_private.py (+4/-2)
tests/autopilot/webbrowser_app/tests/test_site_previews.py (+1/-1)
tests/unittests/CMakeLists.txt (+1/-0)
tests/unittests/collapsible-bookmarks-model/CMakeLists.txt (+13/-0)
tests/unittests/collapsible-bookmarks-model/tst_CollapsibleBookmarksModelTests.cpp (+645/-0)
tests/unittests/qml/CMakeLists.txt (+1/-0)
tests/unittests/qml/tst_BookmarksView.qml (+5/-6)
tests/unittests/qml/tst_QmlTests.cpp (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1505731: Memory usage and load time of new tab view on mobile is proportional to number of bookmarks	Medium	In Progress
Bug #1515659: Bookmarks view initially empty	Medium	Triaged

Link a bug report

Related blueprints

1308. By Olivier Tilloy on 2015-12-02

Add documentation to the CollapsibleBookmarksModel class.

1307. By Olivier Tilloy on 2015-12-02

Use the top-level bookmarks view in test_bookmark_options.py, instead of going through the new tab view.

1306. By Olivier Tilloy on 2015-12-02

Minor autopilot test improvements.

1305. By Olivier Tilloy on 2015-12-02

Fix a number of autopilot test failures.

1304. By Olivier Tilloy on 2015-12-01

More test coverage.

1303. By Olivier Tilloy on 2015-12-01

More test coverage.

1302. By Olivier Tilloy on 2015-12-01

More test coverage.

1301. By Olivier Tilloy on 2015-12-01

More test coverage.

1300. By Olivier Tilloy on 2015-11-30

More test coverage.

1299. By Olivier Tilloy on 2015-11-30

More test coverage.