Unity

Merge lp://qastaging/~ken-vandine/unity/trunk_with_social_preview into lp://qastaging/unity

  1. trunk_with_social_preview
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Ken VanDine
Approved revision: no longer in the source branch.
Merged at revision: 2704
Proposed branch: lp://qastaging/~ken-vandine/unity/trunk_with_social_preview
Merge into: lp://qastaging/unity
Diff against target: 1884 lines (+1716/-0)
17 files modified
UnityCore/CMakeLists.txt (+2/-0)
UnityCore/Preview.cpp (+5/-0)
UnityCore/SocialPreview.cpp (+105/-0)
UnityCore/SocialPreview.h (+77/-0)
dash/previews/CMakeLists.txt (+10/-0)
dash/previews/Preview.cpp (+5/-0)
dash/previews/SocialPreview.cpp (+309/-0)
dash/previews/SocialPreview.h (+93/-0)
dash/previews/SocialPreviewComments.cpp (+193/-0)
dash/previews/SocialPreviewComments.h (+78/-0)
dash/previews/SocialPreviewContent.cpp (+325/-0)
dash/previews/SocialPreviewContent.h (+86/-0)
dash/previews/StandaloneSocialPreview.cpp (+287/-0)
tests/CMakeLists.txt (+4/-0)
tests/test_previews_social.cpp (+110/-0)
unity-shared/PreviewStyle.cpp (+15/-0)
unity-shared/PreviewStyle.h (+12/-0)
To merge this branch: bzr merge lp://qastaging/~ken-vandine/unity/trunk_with_social_preview
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+124516@code.qastaging.launchpad.net

Commit message

Added SocialPreview

Description of the change

Added SocialPreview

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Looks good and works well, approved.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1312/console reported an error when processing this lp:~ken-vandine/unity/trunk_with_social_preview branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1319/console reported an error when processing this lp:~ken-vandine/unity/trunk_with_social_preview branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1321/console reported an error when processing this lp:~ken-vandine/unity/trunk_with_social_preview branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1322/console reported an error when processing this lp:~ken-vandine/unity/trunk_with_social_preview branch.
Not merging it.

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Hmm odd it isn't grabbing the new libunity...
Unpacking libunity9:amd64 (from .../libunity9_5.96.0+bzr173ubuntu0+140_amd64.deb) ..

Al the libunitys are grabbing the rev 173...which your fix is inserted at 176. :(

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1324/console reported an error when processing this lp:~ken-vandine/unity/trunk_with_social_preview branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1325/console reported an error when processing this lp:~ken-vandine/unity/trunk_with_social_preview branch.
Not merging it.

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

@Ken

The problem is being looking at. When a solution comes up this will get merged :)

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.