← Back to branch summary

~macslow/unity8/use-set-progress-api

~macslow/unity8/use-set-progress-api

Viewing all changes in revision 1847.

Committer: Mirco Müller
Date: 2015-07-23 10:31:56 UTC
mfrom: (1777.1.63 unity8-launcher-icon-wobble)
Revision ID: mirco.mueller@canonical.com-20150723103156-frhfi6v5sajiod82

Merged launcher-icon-wobble branch and solved all conflicts.

files added:
po/ga.po

qml/Dash/Previews/PreviewComment.qml

qml/Dash/Previews/PreviewCommentInput.qml

tests/autopilot/unity8/settings_wizard

tests/autopilot/unity8/settings_wizard/__init__.py

tests/autopilot/unity8/settings_wizard/fixture_setup.py

tests/autopilot/unity8/settings_wizard/ofono_helper.py

tests/autopilot/unity8/settings_wizard/tests

tests/autopilot/unity8/settings_wizard/tests/__init__.py

tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py

tests/qmltests/Dash/Previews/tst_PreviewComment.qml

tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml

tests/scripts

tests/scripts/README

tests/scripts/alert-launcher-icon.sh

tests/scripts/get-progress.sh

tests/scripts/list-launcher-icons.sh

tests/scripts/set-count-visible.sh

tests/scripts/set-count.sh

tests/scripts/set-progress.sh

tools/unix-signal-handler.cpp

tools/unix-signal-handler.h

files removed:
tests/scripts

tests/scripts/README

tests/scripts/get-progress.sh

tests/scripts/list-launcher-icons.sh

tests/scripts/set-count-visible.sh

tests/scripts/set-count.sh

tests/scripts/set-progress.sh

files modified:
debian/changelog

debian/control

plugins/AccountsService/AccountsService.cpp

plugins/AccountsService/AccountsService.h

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

plugins/AccountsService/AccountsServiceDBusAdaptor.h

plugins/Greeter/Unity/Launcher/CMakeLists.txt

plugins/Greeter/Unity/Launcher/launcheritem.cpp

plugins/Greeter/Unity/Launcher/launcheritem.h

plugins/Greeter/Unity/Launcher/launchermodelas.cpp

plugins/Greeter/Unity/Launcher/launchermodelas.h

plugins/Lights/Lights.cpp

plugins/Ubuntu/SystemImage/SystemImage.cpp

plugins/Ubuntu/SystemImage/SystemImage.h

plugins/Unity/Connectivity/Connectivity.cpp

plugins/Unity/Connectivity/Connectivity.h

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h

plugins/Unity/DashCommunicator/plugin.cpp

plugins/Unity/Launcher/CMakeLists.txt

plugins/Unity/Launcher/dbusinterface.cpp

plugins/Unity/Launcher/dbusinterface.h

plugins/Unity/Launcher/launcheritem.cpp

plugins/Unity/Launcher/launcheritem.h

plugins/Unity/Launcher/launchermodel.cpp

plugins/Unity/Launcher/launchermodel.h

plugins/Unity/Session/dbusunitysessionservice.cpp

plugins/Unity/Session/dbusunitysessionservice.h

plugins/Wizard/System.cpp

po/ar.po

po/sw.po

qml/Dash/Previews/PreviewWidgetFactory.qml

qml/Launcher/LauncherDelegate.qml

qml/Launcher/LauncherPanel.qml

qml/Notifications/Notifications.qml

qml/Panel/IndicatorItem.qml

qml/Panel/Indicators/IndicatorBase.qml

qml/Tutorial/TutorialLeft.qml

tests/mocks/QMenuModel/QDBusActionGroup.qml

tests/mocks/QMenuModel/actiondata.h

tests/mocks/Unity/Launcher/CMakeLists.txt

tests/mocks/Unity/Launcher/MockLauncherItem.cpp

tests/mocks/Unity/Launcher/MockLauncherItem.h

tests/mocks/Unity/Launcher/MockLauncherModel.cpp

tests/mocks/Unity/Launcher/MockLauncherModel.h

tests/plugins/AccountsService/client.cpp

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt

tests/plugins/LightDM/CMakeLists.txt

tests/plugins/Unity/Launcher/CMakeLists.txt

tests/plugins/Unity/Launcher/launchermodeltest.cpp

tests/plugins/Unity/Session/sessionbackendtest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml

tests/qmltests/Launcher/tst_Launcher.qml

tests/qmltests/Tutorial/tst_Tutorial.qml

tests/qmltests/tst_ShellWithPin.qml

tools/CMakeLists.txt

tools/scopetool.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

plugins/AccountsService/AccountsService.cpp

plugins/AccountsService/AccountsService.h

plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

plugins/AccountsService/AccountsServiceDBusAdaptor.h

plugins/Greeter/Unity/Launcher/CMakeLists.txt

plugins/Greeter/Unity/Launcher/launcheritem.cpp

plugins/Greeter/Unity/Launcher/launcheritem.h

plugins/Greeter/Unity/Launcher/launchermodelas.cpp

plugins/Greeter/Unity/Launcher/launchermodelas.h

plugins/Lights/Lights.cpp

plugins/Ubuntu/SystemImage/SystemImage.cpp

plugins/Ubuntu/SystemImage/SystemImage.h

plugins/Unity/Connectivity/Connectivity.cpp

plugins/Unity/Connectivity/Connectivity.h

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h

plugins/Unity/DashCommunicator/plugin.cpp

plugins/Unity/Launcher/CMakeLists.txt

plugins/Unity/Launcher/dbusinterface.cpp

plugins/Unity/Launcher/dbusinterface.h

plugins/Unity/Launcher/launcheritem.cpp

plugins/Unity/Launcher/launcheritem.h

plugins/Unity/Launcher/launchermodel.cpp

plugins/Unity/Launcher/launchermodel.h

plugins/Unity/Session/dbusunitysessionservice.cpp

plugins/Unity/Session/dbusunitysessionservice.h

plugins/Wizard/System.cpp

qml/Dash/Previews/PreviewComment.qml

qml/Dash/Previews/PreviewCommentInput.qml

qml/Dash/Previews/PreviewWidgetFactory.qml

qml/Launcher/LauncherDelegate.qml

qml/Launcher/LauncherPanel.qml

qml/Notifications/Notifications.qml

qml/Panel/IndicatorItem.qml

qml/Panel/Indicators/IndicatorBase.qml

qml/Tutorial/TutorialLeft.qml

tests/autopilot/unity8/settings_wizard/

tests/autopilot/unity8/settings_wizard/__init__.py

tests/autopilot/unity8/settings_wizard/fixture_setup.py

tests/autopilot/unity8/settings_wizard/ofono_helper.py

tests/autopilot/unity8/settings_wizard/tests/

tests/autopilot/unity8/settings_wizard/tests/__init__.py

tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py

tests/mocks/QMenuModel/QDBusActionGroup.qml

tests/mocks/QMenuModel/actiondata.h

tests/mocks/Unity/Launcher/CMakeLists.txt

tests/mocks/Unity/Launcher/MockLauncherItem.cpp

tests/mocks/Unity/Launcher/MockLauncherItem.h

tests/mocks/Unity/Launcher/MockLauncherModel.cpp

tests/mocks/Unity/Launcher/MockLauncherModel.h

tests/plugins/AccountsService/client.cpp

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt

tests/plugins/LightDM/CMakeLists.txt

tests/plugins/Unity/Launcher/CMakeLists.txt

tests/plugins/Unity/Launcher/launchermodeltest.cpp

tests/plugins/Unity/Session/sessionbackendtest.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Dash/Previews/tst_PreviewComment.qml

tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml

tests/qmltests/Launcher/tst_Launcher.qml

tests/qmltests/Tutorial/tst_Tutorial.qml

tests/qmltests/tst_ShellWithPin.qml

tests/scripts/README

tests/scripts/README

tests/scripts/alert-launcher-icon.sh

tests/scripts/get-progress.sh

tests/scripts/get-progress.sh

tests/scripts/list-launcher-icons.sh

tests/scripts/list-launcher-icons.sh

tests/scripts/set-count-visible.sh

tests/scripts/set-count-visible.sh

tests/scripts/set-count.sh

tests/scripts/set-count.sh

tests/scripts/set-progress.sh

tests/scripts/set-progress.sh

tools/CMakeLists.txt

tools/scopetool.cpp

tools/unix-signal-handler.cpp

tools/unix-signal-handler.h

Older »