← Back to branch summary

~aacid/unity8/scopeSearchHintText

~aacid/unity8/scopeSearchHintText

Viewing all changes in revision 1090.

Committer: Albert Astals
Date: 2014-08-05 17:59:46 UTC
mfrom: (982.6.112 scopeActivatePreview)
Revision ID: albert.astals@canonical.com-20140805175946-wr5atv8lho9tvi3s

Merge

files added:
data/unity8-dash.conf

data/unity8-dash.desktop.in

plugins/Unity/DashCommunicator

plugins/Unity/DashCommunicator/CMakeLists.txt

plugins/Unity/DashCommunicator/dashcommunicator.cpp

plugins/Unity/DashCommunicator/dashcommunicator.h

plugins/Unity/DashCommunicator/dashcommunicatorservice.cpp

plugins/Unity/DashCommunicator/dashcommunicatorservice.h

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h

plugins/Unity/DashCommunicator/plugin.cpp

plugins/Unity/DashCommunicator/plugin.h

plugins/Unity/DashCommunicator/qmldir

qml/Dash/DashApplication.qml

qml/Dash/graphics/phone/screenshots/unity8-dash@12.png

src/Dash

src/Dash/CMakeLists.txt

src/Dash/main.cpp

tests/autopilot/unity8/fixture_setup.py

tests/mocks/Unity/DashCommunicator

tests/mocks/Unity/DashCommunicator/CMakeLists.txt

tests/mocks/Unity/DashCommunicator/dashcommunicator.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicator.h

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.h

tests/mocks/Unity/DashCommunicator/plugin.cpp

tests/mocks/Unity/DashCommunicator/plugin.h

tests/mocks/Unity/DashCommunicator/qmldir

files removed:
qml/Dash/Apps

files modified:
CMakeLists.txt

data/CMakeLists.txt

data/unity8.conf

debian/changelog

debian/unity8.install

plugins/Unity/CMakeLists.txt

plugins/Unity/Launcher/launchermodel.cpp

po/am.po

po/el.po

po/fa.po

po/hu.po

po/is.po

po/km.po

po/pl.po

po/pt_BR.po

po/ru.po

po/sv.po

po/unity8.pot

qml/Components/EdgeDemo.qml

qml/Dash/Dash.qml

qml/Dash/GenericScopeView.qml

qml/Dash/ScopeListView.qml

qml/Launcher/Launcher.qml

qml/Shell.qml

qml/Stages/PhoneStage.qml

qml/Stages/SpreadDelegate.qml

qml/Stages/TabletStage.qml

qml/Stages/TransformedSpreadDelegate.qml

qml/Stages/TransformedTabletSpreadDelegate.qml

src/CMakeLists.txt

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

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

tests/autopilot/unity8/process_helpers.py

tests/autopilot/unity8/shell/emulators/dash.py

tests/autopilot/unity8/shell/emulators/greeter.py

tests/autopilot/unity8/shell/emulators/main_window.py

tests/autopilot/unity8/shell/tests/__init__.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/autopilot/unity8/shell/tests/test_upstart.py

tests/mocks/Unity/Application/ApplicationInfo.cpp

tests/mocks/Unity/Application/ApplicationInfo.h

tests/mocks/Unity/Application/ApplicationManager.cpp

tests/mocks/Unity/Application/ApplicationManager.h

tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp

tests/mocks/Unity/CMakeLists.txt

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Stages/tst_PhoneStage.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

Show diffs side-by-side

added added

removed removed

data/CMakeLists.txt

data/unity8-dash.conf

data/unity8-dash.desktop.in

data/unity8.conf

debian/changelog

debian/unity8.install

plugins/Unity/CMakeLists.txt

plugins/Unity/DashCommunicator/

plugins/Unity/DashCommunicator/CMakeLists.txt

plugins/Unity/DashCommunicator/dashcommunicator.cpp

plugins/Unity/DashCommunicator/dashcommunicator.h

plugins/Unity/DashCommunicator/dashcommunicatorservice.cpp

plugins/Unity/DashCommunicator/dashcommunicatorservice.h

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h

plugins/Unity/DashCommunicator/plugin.cpp

plugins/Unity/DashCommunicator/plugin.h

plugins/Unity/DashCommunicator/qmldir

plugins/Unity/Launcher/launchermodel.cpp

qml/Components/EdgeDemo.qml

qml/Dash/Dash.qml

qml/Dash/DashApplication.qml

qml/Dash/GenericScopeView.qml

qml/Dash/ScopeListView.qml

qml/Dash/graphics/phone/screenshots/unity8-dash@12.png

qml/Launcher/Launcher.qml

qml/Stages/PhoneStage.qml

qml/Stages/SpreadDelegate.qml

qml/Stages/TabletStage.qml

qml/Stages/TransformedSpreadDelegate.qml

qml/Stages/TransformedTabletSpreadDelegate.qml

src/CMakeLists.txt

src/Dash/CMakeLists.txt

src/Dash/main.cpp

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

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

tests/autopilot/unity8/fixture_setup.py

tests/autopilot/unity8/process_helpers.py

tests/autopilot/unity8/shell/emulators/dash.py

tests/autopilot/unity8/shell/emulators/greeter.py

tests/autopilot/unity8/shell/emulators/main_window.py

tests/autopilot/unity8/shell/tests/__init__.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/autopilot/unity8/shell/tests/test_upstart.py

tests/mocks/Unity/Application/ApplicationInfo.cpp

tests/mocks/Unity/Application/ApplicationInfo.h

tests/mocks/Unity/Application/ApplicationManager.cpp

tests/mocks/Unity/Application/ApplicationManager.h

tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp

tests/mocks/Unity/CMakeLists.txt

tests/mocks/Unity/DashCommunicator/

tests/mocks/Unity/DashCommunicator/CMakeLists.txt

tests/mocks/Unity/DashCommunicator/dashcommunicator.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicator.h

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cpp

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.h

tests/mocks/Unity/DashCommunicator/plugin.cpp

tests/mocks/Unity/DashCommunicator/plugin.h

tests/mocks/Unity/DashCommunicator/qmldir

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Stages/tst_PhoneStage.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

Older »