Merge lp://staging/~nick-dedekind/unity8/side-stage-redesign-tutorial into lp://staging/unity8

Proposed by Nick Dedekind
Status: Superseded
Proposed branch: lp://staging/~nick-dedekind/unity8/side-stage-redesign-tutorial
Merge into: lp://staging/unity8
Prerequisite: lp://staging/~nick-dedekind/unity8/side-stage-redesign
Diff against target: 817 lines (+470/-45)
13 files modified
qml/Components/Showable.qml (+2/-2)
qml/Shell.qml (+2/-1)
qml/Stages/SideStage.qml (+2/-1)
qml/Stages/TabletSideStageTouchGesture.qml (+2/-0)
qml/Stages/TabletStage.qml (+25/-0)
qml/Tutorial/EdgesTutorial.qml (+8/-1)
qml/Tutorial/EdgesTutorialContent.qml (+7/-6)
qml/Tutorial/SideStageTutorial.qml (+63/-0)
qml/Tutorial/SideStageTutorialPage.qml (+250/-0)
qml/Tutorial/TutorialPage.qml (+8/-1)
tests/qmltests/Stages/tst_TabletStage.qml (+12/-0)
tests/qmltests/Tutorial/tst_Tutorial.qml (+74/-32)
tests/qmltests/tst_Shell.qml (+15/-1)
To merge this branch: bzr merge lp://staging/~nick-dedekind/unity8/side-stage-redesign-tutorial
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity8 CI Bot continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+281506@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2016-03-11.

Commit message

Added progressive discovery tutorial for Side stage.
Renamed some of the tutorial pages.

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~nick-dedekind/unity8/side-stage-redesign/+merge/281522
https://code.launchpad.net/~nick-dedekind/qtmir/side-stage-redesign/+merge/279309
https://code.launchpad.net/~nick-dedekind/unity-api/side-stage-redesign/+merge/279308

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
Yes

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2040
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/107/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/107/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2040
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/107/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/107/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2040
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/107/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/107/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
2041. By Nick Dedekind

merged with parent

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
2042. By Nick Dedekind

reverted touch point change

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

2042. By Nick Dedekind

reverted touch point change

2041. By Nick Dedekind

merged with parent

2040. By Nick Dedekind

fixes

2039. By Nick Dedekind

moved sidestage to separate tutorial

2038. By Nick Dedekind

merged with parent

2037. By Nick Dedekind

better side-stage tutorial

2036. By Nick Dedekind

added sidestage tutorial

2035. By Nick Dedekind

split sidestage gesture component

2034. By Nick Dedekind

use design image

2033. By Nick Dedekind

merged updateMouseTouchAdaptor

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