webbrowser-app

Merge lp://qastaging/~uriboni/webbrowser-app/bookmark-drag-to-folder into lp://qastaging/webbrowser-app

  1. bookmark-drag-to-folder
  2. Merge into trunk
Proposed by Ugo Riboni
Status: Needs review
Proposed branch: lp://qastaging/~uriboni/webbrowser-app/bookmark-drag-to-folder
Merge into: lp://qastaging/webbrowser-app
Diff against target: 94 lines (+13/-16)
3 files modified
src/app/webbrowser/BookmarksFoldersViewWide.qml (+2/-3)
src/app/webbrowser/DraggableUrlDelegateWide.qml (+5/-1)
tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+6/-12)
To merge this branch: bzr merge lp://qastaging/~uriboni/webbrowser-app/bookmark-drag-to-folder
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+275846@code.qastaging.launchpad.net

Commit message

Fix dragging bookmarks to folders.

Description of the change

Fix dragging bookmarks to folders.
This only works when the UITK from the staging branch is installed, as it depends on this fix: https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/listItemContentDrag/+merge/275691

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1259
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2408/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4853/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4850/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2408/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://qastaging/~uriboni/webbrowser-app/bookmark-drag-to-folder updated
1260. By Ugo Riboni

Merge changes from trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1260
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2420/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4904/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4901/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2420/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://qastaging/~uriboni/webbrowser-app/bookmark-drag-to-folder updated
1261. By Ugo Riboni

Merge changes from trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1261
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2470/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1224/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1224/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1224/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5173/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2470/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1261
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/120/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/120/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/120/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/120/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/120/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/120/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/120/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/120/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/120/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/120/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/120/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/120/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

1261. By Ugo Riboni

Merge changes from trunk

1260. By Ugo Riboni

Merge changes from trunk

1259. By Ugo Riboni

Remove hack from AP tests

1258. By Ugo Riboni

Fix references to the BookmarksModel

1257. By Ugo Riboni

Disable swipe-to-delete when draggign or hovering over the drag grip

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: