← Back to branch summary

~mterry/unity8/dismiss-old-pam-prompts

~mterry/unity8/dismiss-old-pam-prompts

Viewing all changes in revision 964.1.3.

Committer: Albert Astals
Date: 2014-06-13 07:54:13 UTC
mfrom: (962.1.3 unsplit)
mto: This revision was merged to the branch mainline in revision 971.
Revision ID: albert.astals@canonical.com-20140613075413-0nnthxzc7eh75t05

Merge ~mterry/unity8/unsplit/

files added:
tests/mocks/LightDM/demo

tests/mocks/LightDM/demo/CMakeLists.txt

tests/mocks/LightDM/demo/GreeterPrivate.cpp

tests/mocks/LightDM/demo/UsersModelPrivate.cpp

tests/mocks/LightDM/qmldir

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

data/unity8-greeter-init.conf

data/unity8-greeter-wrapper

data/unity8-greeter.desktop.in

debian/unity8-greeter.install

plugins/LightDM/URLDispatcher.cpp

plugins/LightDM/URLDispatcher.h

plugins/SessionManager

plugins/SessionManager/CMakeLists.txt

plugins/SessionManager/SessionManager.cpp

plugins/SessionManager/SessionManager.h

plugins/SessionManager/plugin.cpp

plugins/SessionManager/plugin.h

plugins/SessionManager/qmldir

qml/Components/BasicShell.qml

qml/Greeter/GreeterEdgeDemo.qml

qml/GreeterShell.qml

tests/autopilot/unity8/application_lifecycle/tests/test_greeter.py

tests/mocks/SessionManager

tests/mocks/SessionManager/CMakeLists.txt

tests/mocks/SessionManager/SessionManager.cpp

tests/mocks/SessionManager/SessionManager.h

tests/mocks/SessionManager/plugin.cpp

tests/mocks/SessionManager/plugin.h

tests/mocks/SessionManager/qmldir

tests/plugins/SessionManager

tests/plugins/SessionManager/CMakeLists.txt

tests/plugins/SessionManager/LightDMSessionServer.cpp

tests/plugins/SessionManager/LightDMSessionServer.h

tests/plugins/SessionManager/LoginManagerServer.cpp

tests/plugins/SessionManager/LoginManagerServer.h

tests/plugins/SessionManager/LoginSessionServer.cpp

tests/plugins/SessionManager/LoginSessionServer.h

tests/plugins/SessionManager/client.cpp

tests/plugins/SessionManager/interfaces.xml

tests/plugins/SessionManager/server.cpp

tests/qmltests/tst_GreeterShell.qml

files renamed:
tests/mocks/liblightdm/ => tests/mocks/LightDM/

files modified:
CMakeLists.txt

data/CMakeLists.txt

debian/changelog

debian/control

debian/copyright

debian/rules

debian/unity8-private.install

debian/unity8.install

plugins/AccountsService/AccountsService.cpp

plugins/AccountsService/AccountsService.h

plugins/CMakeLists.txt

plugins/LightDM/CMakeLists.txt

plugins/LightDM/Greeter.cpp

plugins/LightDM/Greeter.h

plugins/LightDM/plugin.cpp

plugins/SessionBroadcast/SessionBroadcast.cpp

plugins/SessionBroadcast/SessionBroadcast.h

plugins/Unity/Launcher/backend/launcherbackend.cpp

plugins/Unity/Launcher/backend/launcherbackend.h

plugins/Unity/Launcher/launcheritem.cpp

plugins/Unity/Launcher/launcheritem.h

plugins/Unity/Launcher/launchermodel.cpp

plugins/Unity/Launcher/launchermodel.h

qml/Components/EdgeDemo.qml

qml/Components/Lockscreen.qml

qml/Components/PageHeader.qml

qml/Dash/ScopeListView.qml

qml/Greeter/Clock.qml

qml/Greeter/Greeter.qml

qml/Greeter/GreeterContent.qml

qml/Greeter/Infographics.qml

qml/Hud/Hud.qml

qml/Notifications/NotificationMenuItemFactory.qml

qml/Shell.qml

run.sh

src/CMakeLists.txt

src/main.cpp

tests/autopilot/unity8/application_lifecycle/tests/__init__.py

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py

tests/autopilot/unity8/indicators/tests/test_indicators.py

tests/autopilot/unity8/process_helpers.py

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

tests/autopilot/unity8/shell/tests/disabled_test_hud.py

tests/autopilot/unity8/shell/tests/test_emulators.py

tests/autopilot/unity8/shell/tests/test_lock_screen.py

tests/autopilot/unity8/shell/tests/test_notifications.py

tests/mocks/AccountsService/AccountsService.cpp

tests/mocks/AccountsService/AccountsService.h

tests/mocks/CMakeLists.txt

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/LightDM/Greeter.cpp

tests/mocks/LightDM/Greeter.h

tests/mocks/LightDM/full/CMakeLists.txt

tests/mocks/LightDM/single-passphrase/CMakeLists.txt

tests/mocks/LightDM/single-pin/CMakeLists.txt

tests/mocks/LightDM/single/CMakeLists.txt

tests/plugins/CMakeLists.txt

tests/plugins/LightDM/CMakeLists.txt

tests/qmltests/CMakeLists.txt

tests/qmltests/Greeter/tst_Lockscreen.qml

tests/qmltests/Greeter/tst_SingleGreeter.qml

tests/qmltests/tst_Shell.qml

tools/unlock-device

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

debian/changelog

debian/copyright

debian/unity8-greeter.install

debian/unity8-private.install

debian/unity8.install

plugins/AccountsService/AccountsService.cpp

plugins/AccountsService/AccountsService.h

plugins/CMakeLists.txt

plugins/LightDM/CMakeLists.txt

plugins/LightDM/Greeter.cpp

plugins/LightDM/Greeter.h

plugins/LightDM/URLDispatcher.cpp

plugins/LightDM/URLDispatcher.h

plugins/LightDM/plugin.cpp

plugins/SessionBroadcast/SessionBroadcast.cpp

plugins/SessionBroadcast/SessionBroadcast.h

plugins/SessionManager/

plugins/SessionManager/CMakeLists.txt

plugins/SessionManager/SessionManager.cpp

plugins/SessionManager/SessionManager.h

plugins/SessionManager/plugin.cpp

plugins/SessionManager/plugin.h

plugins/SessionManager/qmldir

plugins/Unity/Launcher/backend/launcherbackend.cpp

plugins/Unity/Launcher/backend/launcherbackend.h

plugins/Unity/Launcher/launcheritem.cpp

plugins/Unity/Launcher/launcheritem.h

plugins/Unity/Launcher/launchermodel.cpp

plugins/Unity/Launcher/launchermodel.h

qml/Components/BasicShell.qml

qml/Components/EdgeDemo.qml

qml/Components/Lockscreen.qml

qml/Components/PageHeader.qml

qml/Dash/ScopeListView.qml

qml/Greeter/Clock.qml

qml/Greeter/Greeter.qml

qml/Greeter/GreeterContent.qml

qml/Greeter/GreeterEdgeDemo.qml

qml/Greeter/Infographics.qml

qml/GreeterShell.qml

qml/Hud/Hud.qml

qml/Notifications/NotificationMenuItemFactory.qml

src/CMakeLists.txt

tests/autopilot/unity8/application_lifecycle/tests/__init__.py

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py

tests/autopilot/unity8/application_lifecycle/tests/test_greeter.py

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py

tests/autopilot/unity8/indicators/tests/test_indicators.py

tests/autopilot/unity8/process_helpers.py

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

tests/autopilot/unity8/shell/tests/disabled_test_hud.py

tests/autopilot/unity8/shell/tests/test_emulators.py

tests/autopilot/unity8/shell/tests/test_lock_screen.py

tests/autopilot/unity8/shell/tests/test_notifications.py

tests/mocks/AccountsService/AccountsService.cpp

tests/mocks/AccountsService/AccountsService.h

tests/mocks/CMakeLists.txt

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/LightDM/Greeter.cpp

tests/mocks/LightDM/Greeter.h

tests/mocks/LightDM/demo/

tests/mocks/LightDM/demo/CMakeLists.txt

tests/mocks/LightDM/demo/GreeterPrivate.cpp

tests/mocks/LightDM/demo/UsersModelPrivate.cpp

tests/mocks/LightDM/full/CMakeLists.txt

tests/mocks/LightDM/qmldir

tests/mocks/LightDM/single-passphrase/CMakeLists.txt

tests/mocks/LightDM/single-pin/CMakeLists.txt

tests/mocks/LightDM/single/CMakeLists.txt

tests/mocks/SessionManager/

tests/mocks/SessionManager/CMakeLists.txt

tests/mocks/SessionManager/SessionManager.cpp

tests/mocks/SessionManager/SessionManager.h

tests/mocks/SessionManager/plugin.cpp

tests/mocks/SessionManager/plugin.h

tests/mocks/SessionManager/qmldir

tests/plugins/CMakeLists.txt

tests/plugins/LightDM/CMakeLists.txt

tests/plugins/SessionManager/

tests/plugins/SessionManager/CMakeLists.txt

tests/plugins/SessionManager/LightDMSessionServer.cpp

tests/plugins/SessionManager/LightDMSessionServer.h

tests/plugins/SessionManager/LoginManagerServer.cpp

tests/plugins/SessionManager/LoginManagerServer.h

tests/plugins/SessionManager/LoginSessionServer.cpp

tests/plugins/SessionManager/LoginSessionServer.h

tests/plugins/SessionManager/client.cpp

tests/plugins/SessionManager/interfaces.xml

tests/plugins/SessionManager/server.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Greeter/tst_Lockscreen.qml

tests/qmltests/Greeter/tst_SingleGreeter.qml

tests/qmltests/tst_GreeterShell.qml

tests/qmltests/tst_Shell.qml

tools/unlock-device

Older »