lp:~paulliu/unity8/logout

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity8 at revision 983

Michał Sawicz: Approve on 2014-06-24

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-06-20

Daniel d'Andrada (community): Approve on 2014-06-13

Albert Astals Cid (community): Needs Fixing on 2014-06-02

Diff: 418 lines (+334/-0)

12 files modified

plugins/Unity/CMakeLists.txt (+1/-0)
plugins/Unity/Session/CMakeLists.txt (+17/-0)
plugins/Unity/Session/dbusunitysessionservice.cpp (+46/-0)
plugins/Unity/Session/dbusunitysessionservice.h (+82/-0)
plugins/Unity/Session/plugin.cpp (+40/-0)
plugins/Unity/Session/plugin.h (+34/-0)
plugins/Unity/Session/qmldir (+3/-0)
qml/Shell.qml (+25/-0)
src/main.cpp (+1/-0)
tests/plugins/Unity/CMakeLists.txt (+1/-0)
tests/plugins/Unity/Session/CMakeLists.txt (+20/-0)
tests/plugins/Unity/Session/sessionbackendtest.cpp (+64/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1302213: API to bring down the session

Undecided

Invalid

Link a bug report

Related blueprints

853. By Ying-Chun Liu on 2014-06-20

Add back quit signal connect.

852. By Ying-Chun Liu on 2014-06-13

clean CMakefile.txt again

851. By Ying-Chun Liu on 2014-06-13

Remove unnecessary lines

850. By Ying-Chun Liu on 2014-06-13

Merge trunk

[ Michael Terry ]
* Revert split greeter for now. We will bring it back as an option
  for Desktop, but use a big hammer revert right now to get Touch back
  in shape.
[ CI bot ]
* Fix build problems. Reviewed by: Michael Terry (LP: #1328850)

849. By Ying-Chun Liu on 2014-06-11

merge trunk

[ Michał Sawicz ]
* Make lockscreen buttons translatable.
[ Albert Astals ]
* Correctly mark these functions as overrides
* Remove connections to non existant signal
* Better test name
* Improvements for headerless categories LVPWH: No section name -> no
  header LVPWH: New hasSectionHeader context property for delegates
  GSV: Add topMargin if no hasSectionHeader (LP: #1326415)
* Make tryVerticalJournal, tryHorizontalJournal and tryOrganicGrid
  work again
[ Michael Zanetti ]
* Don't crash when we get an invalid app from ApplicationManager (LP:
  #1309162)
[ Andrea Cimitan ]
* Workaround for lp1324159 (LP: #1322233, #1324159)
[ CI bot ]
* Resync trunk
[ Florian Boucault ]
* Application startup: changed splash rectangle to be black instead of
  white and added a neat little animation. (LP: #1124265)

848. By Ying-Chun Liu on 2014-06-06

Merge upstream.

[ Michael Terry ]
* Bump version so ubuntu-touch-session can reference this one
[ CI bot ]
* Resync trunk
[ Michał Sawicz ]
* Move env setup past session init in greeter wrapper. (LP: #1325882)
* no change rebuild
* drop dbus-x11 dependency of unity8-greeter, it makes us end up with
  multiple session dbus daemons which breaks many AP tests in the lab
[ Michael Terry ]
* Bump version for Breaks due to unity8-greeter
* In split mode, determine whether the application identifiers in
  AccountsService are click packages or not, so we know the correct
  url prefix to use.
* Start logrotate in the greeter's session.
[ Andrea Cimitan ]
* Passes to make tryCommand -qmljsdebugger=port:3768 to enable
  debug/profiling test apps
* Fixes carousel shadow
[ Michał Sawicz ]
* Use dpkg-architecture, not gcc, to determine the machine triplet.
[ Ying-Chun Liu ]
* Fix ZoomableImage test failure. (LP: #1317254)
[ Albert Astals ]
* We don't need iconutils in this mock
* Don't reserve space for mascot if no mascot is specified (LP:
  #1319343)
* CardHeader is no more, remove stale line in CMakeLists.txt
* GenericScopeViewTest: Wait a bit more Otherwise sometimes we end
  getting up the wrong delegate (maybe one that will be garbage
  collected?) (LP: #1322279)
* Fix crash in organicgridtest
[ Daniel d'Andrada ]
* Remove Shell's underlay background image as it cannot be seen
  anymore Now that the Dash has its own, opaque, background, the
  underlay's background image can no longer be seen. So it's just a
  waste of resources to have it.
[ Michael Terry ]
* Use the same animation when dismissing a greeter slide from the
  launcher as from a normal greeter drag. (LP: #1316513)
[ Michael Zanetti ]
* enhance lockscreen add a retry indication label (e.g. 3 attempts
  left). add an additional label (e.g. phone number for multi sim).
  add a infoPopup (e.g. to display a warning for last retry). add min
  and max limit values. add tests for the above (LP: #1302050)

847. By Ying-Chun Liu on 2014-05-29

Add dbus interface test.

846. By Ying-Chun Liu on 2014-05-27

Merge upstream
[ Albert Astals ]
* Use Interface classes from unity-api
[ Ubuntu daily release ]
* New rebuild forced
[ Albert Astals ]
* Use the new displayMargin feature Also port our DashViews to use
  same naming and behaviour + update tests

845. By Ying-Chun Liu on 2014-05-27

Rename destination.

844. By Ying-Chun Liu on 2014-05-26

remove generated seq number in header.