← Back to branch summary

~macslow/unity8/swipe-dismiss-snap-decisions

~macslow/unity8/swipe-dismiss-snap-decisions

Viewing all changes in revision 1229.148.19.

Committer: Michael Terry
Date: 2014-12-02 18:47:49 UTC
mfrom: (1229.147.4 wizard-import)
mto: (1229.149.10 wizard-tests)
mto: This revision was merged to the branch mainline in revision 1246.
Revision ID: michael.terry@canonical.com-20141202184749-zk0ujdtfpj0zi2mm

Merge from wizard-import

files added:
plugins/Dash/croppedimagesizer.cpp

plugins/Dash/croppedimagesizer.h

plugins/Dash/croppedimagesizerasyncworker.cpp

plugins/Dash/croppedimagesizerasyncworker.h

tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml

files renamed:
qml/graphics/applicationIcons/dash@18.png => qml/graphics/applicationIcons/dash.png

files modified:
debian/changelog

debian/control

plugins/Dash/CMakeLists.txt

plugins/Dash/CardAttributes.qml

plugins/Dash/CardCreator.js

plugins/Dash/CroppedImageMinimumSourceSize.qml

plugins/Dash/ScopeStyle.qml

plugins/Dash/abstractdashview.h

plugins/Dash/horizontaljournal.cpp

plugins/Dash/horizontaljournal.h

plugins/Dash/listviewwithpageheader.cpp

plugins/Dash/organicgrid.cpp

plugins/Dash/organicgrid.h

plugins/Dash/plugin.cpp

plugins/Dash/verticaljournal.cpp

plugins/Dash/verticaljournal.h

po/ca@valencia.po

po/ja.po

po/zh_TW.po

qml/Dash/CardCarousel.qml

qml/Dash/CardGrid.qml

qml/Dash/CardHorizontalList.qml

qml/Dash/CardTool.qml

qml/Dash/CardVerticalJournal.qml

qml/Dash/Dash.qml

qml/Dash/DashRenderer.qml

qml/Dash/GenericScopeView.qml

qml/Dash/Previews/PreviewActions.qml

qml/Dash/Previews/PreviewPayments.qml

qml/Dash/Previews/PreviewZoomableImage.qml

qml/Dash/ScopesOverviewAll.qml

qml/Launcher/LauncherPanel.qml

qml/Panel/IndicatorItem.qml

qml/Shell.qml

qml/Stages/PhoneStage.qml

qml/Stages/SpreadDelegate.qml

qml/Stages/TabletStage.qml

src/CMakeLists.txt

src/CachingNetworkManagerFactory.cpp

src/CachingNetworkManagerFactory.h

src/Dash/CMakeLists.txt

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

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

tests/plugins/Dash/CMakeLists.txt

tests/plugins/Dash/cardcreator/1.res

tests/plugins/Dash/cardcreator/2.res

tests/plugins/Dash/cardcreator/3.res

tests/plugins/Dash/cardcreator/4.res

tests/plugins/Dash/cardcreator/5.res

tests/plugins/Dash/cardcreator/6.res

tests/plugins/Dash/cardcreator/7.res

tests/plugins/Dash/tst_ScopeStyle.qml

tests/qmltests/Dash/tst_Card.qml

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_GenericScopeView.qml

tests/qmltests/Dash/tst_PreviewListView.qml

tests/qmltests/Panel/tst_IndicatorsBar.qml

tests/qmltests/Panel/tst_IndicatorsMenu.qml

tests/qmltests/Panel/tst_Panel.qml

tests/qmltests/Stages/tst_PhoneStage.qml

tests/qmltests/Stages/tst_SpreadDelegate.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

tests/qmltests/tst_TabletShell.qml

tests/utils/modules/Unity/Test/UnityTestCase.qml

Show diffs side-by-side

added added

removed removed

debian/changelog

plugins/Dash/CMakeLists.txt

plugins/Dash/CardAttributes.qml

plugins/Dash/CardCreator.js

plugins/Dash/CroppedImageMinimumSourceSize.qml

plugins/Dash/ScopeStyle.qml

plugins/Dash/abstractdashview.h

plugins/Dash/croppedimagesizer.cpp

plugins/Dash/croppedimagesizer.h

plugins/Dash/croppedimagesizerasyncworker.cpp

plugins/Dash/croppedimagesizerasyncworker.h

plugins/Dash/horizontaljournal.cpp

plugins/Dash/horizontaljournal.h

plugins/Dash/listviewwithpageheader.cpp

plugins/Dash/organicgrid.cpp

plugins/Dash/organicgrid.h

plugins/Dash/plugin.cpp

plugins/Dash/verticaljournal.cpp

plugins/Dash/verticaljournal.h

po/ca@valencia.po

qml/Dash/CardCarousel.qml

qml/Dash/CardGrid.qml

qml/Dash/CardHorizontalList.qml

qml/Dash/CardTool.qml

qml/Dash/CardVerticalJournal.qml

qml/Dash/Dash.qml

qml/Dash/DashRenderer.qml

qml/Dash/GenericScopeView.qml

qml/Dash/Previews/PreviewActions.qml

qml/Dash/Previews/PreviewPayments.qml

qml/Dash/Previews/PreviewZoomableImage.qml

qml/Dash/ScopesOverviewAll.qml

qml/Launcher/LauncherPanel.qml

qml/Panel/IndicatorItem.qml

qml/Stages/PhoneStage.qml

qml/Stages/SpreadDelegate.qml

qml/Stages/TabletStage.qml

src/CMakeLists.txt

src/CachingNetworkManagerFactory.cpp

src/CachingNetworkManagerFactory.h

src/Dash/CMakeLists.txt

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

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

tests/plugins/Dash/CMakeLists.txt

tests/plugins/Dash/cardcreator/1.res

tests/plugins/Dash/cardcreator/2.res

tests/plugins/Dash/cardcreator/3.res

tests/plugins/Dash/cardcreator/4.res

tests/plugins/Dash/cardcreator/5.res

tests/plugins/Dash/cardcreator/6.res

tests/plugins/Dash/cardcreator/7.res

tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml

tests/plugins/Dash/tst_ScopeStyle.qml

tests/qmltests/Dash/tst_Card.qml

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_GenericScopeView.qml

tests/qmltests/Dash/tst_PreviewListView.qml

tests/qmltests/Panel/tst_IndicatorsBar.qml

tests/qmltests/Panel/tst_IndicatorsMenu.qml

tests/qmltests/Panel/tst_Panel.qml

tests/qmltests/Stages/tst_PhoneStage.qml

tests/qmltests/Stages/tst_SpreadDelegate.qml

tests/qmltests/tst_Shell.qml

tests/qmltests/tst_ShellWithPin.qml

tests/qmltests/tst_TabletShell.qml

tests/utils/modules/Unity/Test/UnityTestCase.qml

Older »