← Back to branch summary

~aacid/unity8/dashSepartmentsListTweaks

~aacid/unity8/dashSepartmentsListTweaks

Viewing all changes in revision 1085.

Committer: Albert Astals
Date: 2014-07-30 07:41:30 UTC
mfrom: (1080.1.10 unity8)
Revision ID: albert.astals@canonical.com-20140730074130-85zm1elq0w3u2phh

Merge

files added:
plugins/Utils/windowkeysfilter.cpp

plugins/Utils/windowkeysfilter.h

qml/Components/Dialogs.qml

qml/Components/InputMethod.qml

qml/Dash/graphics/phone/screenshots/vkb_portrait.png

qml/Stages/Animations

qml/Stages/Animations/BaseSurfaceAnimation.qml

qml/Stages/Animations/DarkenAndFadeInAnimation.qml

qml/Stages/Animations/SwipeFromBottomAnimation.qml

qml/Stages/Animations/SwipeUpAnimation.qml

qml/Stages/Splash.qml

qml/Stages/SurfaceContainer.qml

qml/Stages/TabletStage.qml

qml/Stages/TransformedTabletSpreadDelegate.qml

tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp

tests/mocks/Unity/Application/ApplicationDBusAdaptor.h

tests/mocks/Unity/Application/MirSurfaceItem.cpp

tests/mocks/Unity/Application/MirSurfaceItem.h

tests/mocks/Unity/Application/SurfaceManager.cpp

tests/mocks/Unity/Application/SurfaceManager.h

tests/mocks/Unity/Application/VirtualKeyboard.cpp

tests/mocks/Unity/Application/VirtualKeyboard.h

files removed:
qml/Stages/SidestageHandle.qml

qml/Stages/StageWithSideStage.qml

qml/Stages/SwitchingApplicationImage.qml

files modified:
debian/changelog

debian/control

plugins/Utils/CMakeLists.txt

plugins/Utils/easingcurve.cpp

plugins/Utils/plugin.cpp

po/br.po

po/da.po

po/el.po

po/sl.po

po/ug.po

po/uk.po

po/zh_CN.po

qml/Components/DraggingArea.qml

qml/Components/PageHeader.qml

qml/Dash/Apps/RunningApplicationTile.qml

qml/Dash/DashContent.qml

qml/Launcher/Launcher.qml

qml/Panel/Indicators.qml

qml/Shell.qml

qml/Stages/PhoneStage.qml

qml/Stages/SpreadDelegate.qml

qml/Stages/TransformedSpreadDelegate.qml

src/CMakeLists.txt

src/main.cpp

tests/mocks/Unity/Application/Application.qmltypes

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/CMakeLists.txt

tests/mocks/Unity/Application/plugin.cpp

tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml

tests/qmltests/Launcher/tst_Launcher.qml

tests/qmltests/Panel/tst_ActiveCallHint.qml

tests/qmltests/Stages/tst_PhoneStage.qml

tests/qmltests/tst_Shell.qml

Show diffs side-by-side

added added

removed removed

debian/changelog

plugins/Utils/CMakeLists.txt

plugins/Utils/easingcurve.cpp

plugins/Utils/plugin.cpp

plugins/Utils/windowkeysfilter.cpp

plugins/Utils/windowkeysfilter.h

qml/Components/Dialogs.qml

qml/Components/DraggingArea.qml

qml/Components/InputMethod.qml

qml/Components/PageHeader.qml

qml/Dash/Apps/RunningApplicationTile.qml

qml/Dash/DashContent.qml

qml/Dash/graphics/phone/screenshots/vkb_portrait.png

qml/Launcher/Launcher.qml

qml/Panel/Indicators.qml

qml/Stages/Animations/

qml/Stages/Animations/BaseSurfaceAnimation.qml

qml/Stages/Animations/DarkenAndFadeInAnimation.qml

qml/Stages/Animations/SwipeFromBottomAnimation.qml

qml/Stages/Animations/SwipeUpAnimation.qml

qml/Stages/PhoneStage.qml

qml/Stages/SidestageHandle.qml

qml/Stages/Splash.qml

qml/Stages/SpreadDelegate.qml

qml/Stages/StageWithSideStage.qml

qml/Stages/SurfaceContainer.qml

qml/Stages/SwitchingApplicationImage.qml

qml/Stages/TabletStage.qml

qml/Stages/TransformedSpreadDelegate.qml

qml/Stages/TransformedTabletSpreadDelegate.qml

src/CMakeLists.txt

tests/mocks/Unity/Application/Application.qmltypes

tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp

tests/mocks/Unity/Application/ApplicationDBusAdaptor.h

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/CMakeLists.txt

tests/mocks/Unity/Application/MirSurfaceItem.cpp

tests/mocks/Unity/Application/MirSurfaceItem.h

tests/mocks/Unity/Application/SurfaceManager.cpp

tests/mocks/Unity/Application/SurfaceManager.h

tests/mocks/Unity/Application/VirtualKeyboard.cpp

tests/mocks/Unity/Application/VirtualKeyboard.h

tests/mocks/Unity/Application/plugin.cpp

tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml

tests/qmltests/Launcher/tst_Launcher.qml

tests/qmltests/Panel/tst_ActiveCallHint.qml

tests/qmltests/Stages/tst_PhoneStage.qml

tests/qmltests/tst_Shell.qml

Older »