lp:~mterry/unity8/greeter-apps

Branch merges

Merged into lp:unity8 at revision 2631

Daniel d'Andrada: Pending requested 2016-08-11

Michał Sawicz: Pending requested 2016-08-11

Unity8 CI Bot: Pending (continuous-integration) requested 2016-08-11

Diff: 1286 lines (+904/-28)

31 files modified

data/unity8-greeter-wrapper (+11/-3)
debian/control (+1/-0)
plugins/SessionBroadcast/SessionBroadcast.cpp (+36/-10)
plugins/SessionBroadcast/SessionBroadcast.h (+10/-3)
plugins/Utils/CMakeLists.txt (+1/-0)
plugins/Utils/URLDispatcher.cpp (+77/-0)
plugins/Utils/URLDispatcher.h (+47/-0)
plugins/Utils/plugin.cpp (+2/-0)
qml/Greeter/Greeter.qml (+2/-2)
qml/Shell.qml (+35/-10)
tests/mocks/CMakeLists.txt (+1/-0)
tests/mocks/SessionBroadcast/CMakeLists.txt (+8/-0)
tests/mocks/SessionBroadcast/SessionBroadcast.cpp (+34/-0)
tests/mocks/SessionBroadcast/SessionBroadcast.h (+39/-0)
tests/mocks/SessionBroadcast/plugin.cpp (+31/-0)
tests/mocks/SessionBroadcast/plugin.h (+32/-0)
tests/mocks/SessionBroadcast/qmldir (+2/-0)
tests/mocks/Utils/CMakeLists.txt (+1/-0)
tests/mocks/Utils/URLDispatcher.cpp (+38/-0)
tests/mocks/Utils/URLDispatcher.h (+47/-0)
tests/mocks/Utils/plugin.cpp (+2/-0)
tests/plugins/CMakeLists.txt (+1/-0)
tests/plugins/SessionBroadcast/BroadcastServer.cpp (+33/-0)
tests/plugins/SessionBroadcast/BroadcastServer.h (+40/-0)
tests/plugins/SessionBroadcast/CMakeLists.txt (+45/-0)
tests/plugins/SessionBroadcast/interfaces.xml (+18/-0)
tests/plugins/SessionBroadcast/server.cpp (+37/-0)
tests/plugins/SessionBroadcast/sessionbroadcasttest.cpp (+111/-0)
tests/plugins/Utils/CMakeLists.txt (+9/-0)
tests/plugins/Utils/URLDispatcherTest.cpp (+78/-0)
tests/qmltests/tst_Shell.qml (+75/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2510. By Michael Terry on 2016-09-06

Merge session-chooser-gui

2509. By Michael Terry on 2016-08-29

Merge from session-chooser-gui

2508. By Michael Terry on 2016-08-11

Merge session-chooser-gui

2507. By Michael Terry on 2016-08-11

Merge from trunk

2506. By Michael Terry on 2016-08-03

merge from parent

2505. By Michael Terry on 2016-07-20

Move new tst_Shell tests, to avoid conflict

2504. By Michael Terry on 2016-07-20

Merge in keyboardIndicator, since we conflict

2503. By Michael Terry on 2016-07-19

Fix race with upstart socket

2502. By Michael Terry on 2016-07-18

Save dbus-session in /run/ again, in attempt to make dialer-app launching more reliable

2501. By Michael Terry on 2016-07-18

Address review comments