lp:~cimi/unity8/card_emblems_single_container

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:unity8

Michał Sawicz: Disapprove on 2014-08-04

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-07-28

Albert Astals Cid (community): Needs Fixing on 2014-07-10

Diff: 1046 lines (+524/-286)

11 files modified

plugins/Dash/CardCreator.js (+111/-28)
tests/plugins/Dash/cardcreator/1.res (+2/-1)
tests/plugins/Dash/cardcreator/2.res (+94/-89)
tests/plugins/Dash/cardcreator/3.res (+50/-48)
tests/plugins/Dash/cardcreator/4.res (+72/-68)
tests/plugins/Dash/cardcreator/5.res (+50/-50)
tests/plugins/Dash/cardcreator/6.res (+115/-0)
tests/plugins/Dash/cardcreator/6.tst (+3/-0)
tests/plugins/Dash/cardcreatortest.cpp (+8/-2)
tests/qmltests/Dash/CardHelpers.js (+1/-0)
tests/qmltests/Dash/tst_Card.qml (+18/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

943. By Andrea Cimitan on 2014-06-27

[ Michael Terry ]
* Fix path in launcher mock after moving our mock icons, to avoid a
  lot of "icon not found" warnings during qmluitests.
* Fix the testMultiGreeter qmluitest. Incoming method variables are
  apparently read-only in Qt5.3. (LP: #1332488)
[ CI bot ]
* Resync trunk
[ Michał Sawicz ]
* Adapt scope mock to new api and quiet unused variable warnings.
* Fix dynamic overlay height. (LP: #1334879)
* Don't center items in CardVerticalJournal, kind of beats the
  purpose... Also don't bind unnecessarily.
[ Ying-Chun Liu ]
* Fix LP:1330957 Fix some failed test cases. (LP: #1330957)
[ Albert Astals ]
* Don't seem to need this waitForRendering And makes test fail in 5.3
[ Alberto Aguirre ]
* Update Powerd plugin and Shell.qml to accommodate changes in the
  display power state notification.

942. By Andrea Cimitan on 2014-06-26

[ Ying-Chun Liu ]
* Add logout support. Reviewed by: Daniel d'Andrada (LP: #1302213)
[ Michał Sawicz ]
* Make so that fixedArtShapeSize actually fixes artShapeSize.
[ Albert Astals ]
* Add VerticalJournal integration to Dash/scopes/QML (LP: #1326467)
* Make so that fixedArtShapeSize actually fixes artShapeSize.
[ Mirco Müller ]
* Added the frontend-part of sound-hint support for notifications with
  updated QML-tests.
* New rebuild forced
[ Albert Astals ]
* Departments support (LP: #1320847)

941. By Andrea Cimitan on 2014-06-20

var rename

940. By Andrea Cimitan on 2014-06-20

Works

939. By Andrea Cimitan on 2014-06-20

WIP AND BROKEN

938. By Andrea Cimitan on 2014-06-03

Add parsing test for emblem

937. By Andrea Cimitan on 2014-06-03

Add tests for emblem

936. By Andrea Cimitan on 2014-06-03

Test pass again

935. By Andrea Cimitan on 2014-06-02

Some fixes for the emblem

934. By Andrea Cimitan on 2014-05-29

Better tests