-
Committer:
Ying-Chun Liu
-
Date:
2014-06-06 12:32:58 UTC
-
mfrom:
(833.1.114 unity8)
-
Revision ID:
paul.liu@canonical.com-20140606123258-ta37j8ss2f1g24he
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)