← Back to branch summary

~ci-train-bot/unity8/unity8-ubuntu-zesty-2167

~ci-train-bot/unity8/unity8-ubuntu-zesty-2167

Viewing all changes in revision 2490.10.1.

Committer: Michael Terry
Date: 2016-06-23 18:05:39 UTC
mfrom: (1789.3.181 slim_greeter_real_lightdm)
mto: (2552.4.4 greeter-mock-bg) (2608.4.28 unity8) (2607.2.28 unity8)
mto: This revision was merged to the branch mainline in revision 2631.
Revision ID: michael.terry@canonical.com-20160623180539-4lbz1ngtpqroo1dc

Merge in slim_greeter_real_lightdm

files added:
data/51-unity8-greeter.conf

data/unity8-greeter-init.conf

data/unity8-greeter-wrapper

data/unity8-greeter.desktop.in

data/unity8-greeter.pkla

debian/unity8-greeter.install

plugins/LightDM/FullLightDM

plugins/LightDM/FullLightDM/CMakeLists.txt

plugins/LightDM/FullLightDM/qmldir

plugins/LightDM/IntegratedLightDM

plugins/LightDM/IntegratedLightDM/CMakeLists.txt

plugins/LightDM/IntegratedLightDM/qmldir

qml/Greeter/FullLightDMImpl.qml

qml/Greeter/qmldir

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/LightDM/IntegratedLightDM

tests/plugins/LightDM/CMakeLists.txt

tests/plugins/LightDM/IntegratedLightDM

files removed:
plugins/IntegratedLightDM/qmldir

qml/Stages/ShimStage.qml

tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.h

tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.h

files renamed:
plugins/IntegratedLightDM/ => plugins/LightDM/

plugins/IntegratedLightDM/liblightdm/ => plugins/LightDM/IntegratedLightDM/liblightdm/

qml/Greeter/LightDM.qml => qml/Greeter/LightDMService.qml

tests/mocks/IntegratedLightDM/ => tests/mocks/LightDM/

tests/mocks/IntegratedLightDM/CMakeLists.txt => tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt

tests/mocks/IntegratedLightDM/MockGreeter.cpp => tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp

tests/mocks/IntegratedLightDM/MockGreeter.h => tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h

tests/mocks/IntegratedLightDM/MockUsersModel.cpp => tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp

tests/mocks/IntegratedLightDM/MockUsersModel.h => tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h

tests/mocks/IntegratedLightDM/QLightDM/ => tests/mocks/LightDM/IntegratedLightDM/QLightDM/

tests/mocks/IntegratedLightDM/liblightdm/ => tests/mocks/LightDM/IntegratedLightDM/liblightdm/

tests/mocks/IntegratedLightDM/plugin.cpp => tests/mocks/LightDM/IntegratedLightDM/plugin.cpp

tests/mocks/IntegratedLightDM/plugin.h => tests/mocks/LightDM/IntegratedLightDM/plugin.h

tests/mocks/IntegratedLightDM/qmldir => tests/mocks/LightDM/IntegratedLightDM/qmldir

tests/plugins/IntegratedLightDM/ => tests/plugins/LightDM/

tests/plugins/IntegratedLightDM/CMakeLists.txt => tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt

tests/plugins/IntegratedLightDM/dbus.cpp => tests/plugins/LightDM/IntegratedLightDM/dbus.cpp

tests/plugins/IntegratedLightDM/greeter.qml => tests/plugins/LightDM/IntegratedLightDM/greeter.qml

tests/plugins/IntegratedLightDM/integrated.cpp => tests/plugins/LightDM/IntegratedLightDM/integrated.cpp

tests/plugins/IntegratedLightDM/pam.cpp => tests/plugins/LightDM/IntegratedLightDM/pam.cpp

tests/plugins/IntegratedLightDM/usersmodel.cpp => tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp

files modified:
CMakeLists.txt

data/CMakeLists.txt

debian/control

debian/rules

debian/unity8-private.install

plugins/CMakeLists.txt

plugins/LightDM/CMakeLists.txt

plugins/LightDM/DBusGreeter.cpp

plugins/LightDM/Greeter.cpp

plugins/LightDM/Greeter.h

plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt

plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp

plugins/LightDM/plugin.cpp

plugins/LightDM/plugin.h

plugins/Unity/Indicators/indicatorsmanager.cpp

qml/Components/Dialogs.qml

qml/Greeter/Greeter.qml

qml/Greeter/IntegratedLightDMImpl.qml

qml/Greeter/LoginList.qml

qml/Greeter/WideView.qml

qml/Shell.qml

qml/Wizard/Wizard.qml

src/ShellApplication.cpp

tests/CMakeLists.txt

tests/autopilot/unity8/fixture_setup.py

tests/autopilot/unity8/greeter/tests/test_args.py

tests/autopilot/unity8/shell/tests/__init__.py

tests/mocks/CMakeLists.txt

tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h

tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h

tests/plugins/CMakeLists.txt

tests/qmltests/Greeter/TestView.qml

tests/qmltests/Greeter/tst_Greeter.qml

tests/qmltests/Greeter/tst_Infographics.qml

tests/qmltests/Greeter/tst_NarrowView.qml

tests/qmltests/Greeter/tst_WideView.qml

tests/qmltests/Tutorial/tst_Tutorial.qml

tests/qmltests/tst_OrientedShell.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

Show diffs side-by-side

added added

removed removed

data/51-unity8-greeter.conf

data/CMakeLists.txt

data/unity8-greeter-init.conf

data/unity8-greeter-wrapper

data/unity8-greeter.desktop.in

data/unity8-greeter.pkla

debian/unity8-greeter.install

debian/unity8-private.install

plugins/CMakeLists.txt

plugins/IntegratedLightDM/qmldir

plugins/LightDM/CMakeLists.txt

plugins/LightDM/DBusGreeter.cpp

plugins/LightDM/FullLightDM/

plugins/LightDM/FullLightDM/CMakeLists.txt

plugins/LightDM/FullLightDM/qmldir

plugins/LightDM/Greeter.cpp

plugins/LightDM/Greeter.h

plugins/LightDM/IntegratedLightDM/

plugins/LightDM/IntegratedLightDM/CMakeLists.txt

plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt

plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp

plugins/LightDM/IntegratedLightDM/qmldir

plugins/LightDM/plugin.cpp

plugins/LightDM/plugin.h

plugins/Unity/Indicators/indicatorsmanager.cpp

qml/Components/Dialogs.qml

qml/Greeter/FullLightDMImpl.qml

qml/Greeter/Greeter.qml

qml/Greeter/IntegratedLightDMImpl.qml

qml/Greeter/LightDMService.qml

qml/Greeter/LoginList.qml

qml/Greeter/WideView.qml

qml/Greeter/qmldir

qml/Stages/ShimStage.qml

qml/Wizard/Wizard.qml

src/ShellApplication.cpp

tests/CMakeLists.txt

tests/autopilot/unity8/fixture_setup.py

tests/autopilot/unity8/greeter/tests/test_args.py

tests/autopilot/unity8/shell/tests/__init__.py

tests/mocks/CMakeLists.txt

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/LightDM/IntegratedLightDM/

tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt

tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp

tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h

tests/mocks/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h

tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h

tests/mocks/LightDM/IntegratedLightDM/plugin.cpp

tests/mocks/LightDM/IntegratedLightDM/plugin.h

tests/mocks/LightDM/IntegratedLightDM/qmldir

tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.h@

tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.h@

tests/plugins/CMakeLists.txt

tests/plugins/LightDM/CMakeLists.txt

tests/plugins/LightDM/IntegratedLightDM/

tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt

tests/plugins/LightDM/IntegratedLightDM/greeter.qml

tests/qmltests/Greeter/TestView.qml

tests/qmltests/Greeter/tst_Greeter.qml

tests/qmltests/Greeter/tst_Infographics.qml

tests/qmltests/Greeter/tst_NarrowView.qml

tests/qmltests/Greeter/tst_WideView.qml

tests/qmltests/Tutorial/tst_Tutorial.qml

tests/qmltests/tst_OrientedShell.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

Older »