lp://staging/~artmello/webbrowser-app/webbrowser-app-bookmark_folders

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/webbrowser-app at revision 1077

Olivier Tilloy: Approve on 2015-07-03

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

Bill Filler (community): Needs Fixing on 2015-06-17

Diff: 2658 lines (+1979/-70)

27 files modified

src/app/webbrowser/AddressBar.qml (+7/-0)
src/app/webbrowser/BookmarkOptions.qml (+166/-0)
src/app/webbrowser/BookmarksFolderListView.qml (+157/-0)
src/app/webbrowser/Browser.qml (+64/-4)
src/app/webbrowser/CMakeLists.txt (+2/-0)
src/app/webbrowser/Chrome.qml (+2/-0)
src/app/webbrowser/NewTabView.qml (+27/-9)
src/app/webbrowser/UrlsList.qml (+2/-2)
src/app/webbrowser/bookmarks-folder-model.cpp (+84/-0)
src/app/webbrowser/bookmarks-folder-model.h (+60/-0)
src/app/webbrowser/bookmarks-folderlist-model.cpp (+217/-0)
src/app/webbrowser/bookmarks-folderlist-model.h (+79/-0)
src/app/webbrowser/bookmarks-model.cpp (+164/-8)
src/app/webbrowser/bookmarks-model.h (+15/-3)
src/app/webbrowser/webbrowser-app.cpp (+2/-0)
tests/autopilot/webbrowser_app/emulators/browser.py (+52/-0)
tests/autopilot/webbrowser_app/tests/test_addressbar_bookmark.py (+3/-0)
tests/autopilot/webbrowser_app/tests/test_bookmark_options.py (+243/-0)
tests/autopilot/webbrowser_app/tests/test_keyboard.py (+6/-2)
tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+150/-22)
tests/autopilot/webbrowser_app/tests/test_suggestions.py (+2/-2)
tests/unittests/CMakeLists.txt (+2/-0)
tests/unittests/bookmarks-folder-model/CMakeLists.txt (+6/-0)
tests/unittests/bookmarks-folder-model/tst_BookmarksFolderModelTests.cpp (+123/-0)
tests/unittests/bookmarks-folderlist-model/CMakeLists.txt (+6/-0)
tests/unittests/bookmarks-folderlist-model/tst_BookmarksFolderListModelTests.cpp (+269/-0)
tests/unittests/bookmarks-model/tst_BookmarksModelTests.cpp (+69/-18)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1259247: [browser] bookmarks don't support folders	Medium	Fix Released
Bug #1351147: [browser] Missing popover on bookmarking the current page	High	Fix Released

Link a bug report

Related blueprints

1125. By Arthur Mello on 2015-07-02

Accept return key to close bookmark options

1124. By Arthur Mello on 2015-07-02

Change icon color

1123. By Arthur Mello on 2015-07-02

Remove populate_config call

1122. By Arthur Mello on 2015-07-02

Change get buttons methods click buttons

1121. By Arthur Mello on 2015-07-02

Add check to make sure that bookmark options is closed

1120. By Arthur Mello on 2015-07-02

Add missing include to unittests

1119. By Arthur Mello on 2015-07-01

Fix add to bookmark call

1118. By Arthur Mello on 2015-07-01

Improve skip message for AP test

1117. By Arthur Mello on 2015-07-01

Do not show BookmarkOptions for the contextual action

1116. By Arthur Mello on 2015-07-01

Bookmark name field should have predictive text turned off