← Back to branch summary

~feng-kylin/unity8/OpenUrlInIndicator

~feng-kylin/unity8/OpenUrlInIndicator

Viewing all changes in revision 1.2.2.

Committer: Michał Sawicz
Date: 2013-06-13 11:32:52 UTC
mfrom: (16 8.0)
mto: This revision was merged to the branch mainline in revision 17.
Revision ID: michal.sawicz@canonical.com-20130613113252-tnz365h08kp0e2yl

merge trunk

files added:
.gitignore

Components/WrongPasswordAnimation.qml

Dash/LensDelegateMapper.qml

Greeter/Lockscreen.qml

Greeter/PassphraseLockscreen.qml

Greeter/PinLockscreen.qml

Greeter/PinPadButton.qml

po/hy.po

po/ug.po

tests/autopilot/unity8/tests/testlockscreen.py

tests/mocks/LightDM/single-passphrase

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

tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp

tests/mocks/LightDM/single-passphrase/InfographicModelPrivate.cpp

tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp

tests/mocks/LightDM/single-pin

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

tests/mocks/LightDM/single-pin/GreeterPrivate.cpp

tests/mocks/LightDM/single-pin/InfographicModelPrivate.cpp

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Greeter/tst_Lockscreen.qml

files renamed:
tests/autopilot/unity8/tests/testcases.py => tests/autopilot/unity8/tests/testhud.py

files modified:
Applications/applications.js

CODING

Components/Carousel.qml

Components/Stage.qml

Components/carousel.js

Dash/Dash.qml

Dash/DashContent.qml

Dash/DashMusic.qml

Dash/DashPeople.qml

Dash/DashVideos.qml

Dash/Video/VideoPreview.qml

Greeter/GreeterContent.qml

Greeter/LoginList.qml

Launcher/Launcher.qml

Panel/SearchIndicator.qml

Shell.qml

build

build_unity

plugins/LightDM/CMakeLists.txt

plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp

plugins/Ubuntu/Gestures/AxisVelocityCalculator.h

plugins/Ubuntu/Gestures/CMakeLists.txt

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp

plugins/Ubuntu/Gestures/DirectionalDragArea.h

po/ar.po

po/az.po

po/ca.po

po/de.po

po/el.po

po/en_AU.po

po/eo.po

po/es.po

po/fi.po

po/fo.po

po/fr.po

po/gl.po

po/he.po

po/hr.po

po/hu.po

po/id.po

po/it.po

po/kn.po

po/ko.po

po/ky.po

po/lv.po

po/my.po

po/nb.po

po/nl.po

po/pl.po

po/pt_BR.po

po/ro.po

po/ru.po

po/si.po

po/sl.po

po/sr.po

po/sv.po

po/te.po

po/tr.po

po/uk.po

po/unity8.pot

po/update-unity-pot

po/zh_CN.po

po/zh_TW.po

run

run_on_device

tests/autopilot/unity8/emulators/main_window.py

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/LightDM/full/GreeterPrivate.cpp

tests/mocks/LightDM/full/UsersModelPrivate.cpp

tests/plugins/Ubuntu/Gestures/CMakeLists.txt

tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_Carousel.qml

tests/qmltests/Components/tst_Stage.qml

tests/qmltests/Dash/qml/FakeLensView.qml

tests/qmltests/Dash/qml/fake_generic_lensView.qml

tests/qmltests/Dash/qml/fake_lensView1.qml

tests/qmltests/Dash/qml/fake_lensView2.qml

tests/qmltests/Dash/qml/fake_lensView3.qml

tests/qmltests/Dash/qml/fake_lensView4.qml

tests/qmltests/Dash/tst_DashContent.qml

Show diffs side-by-side

added added

removed removed

Applications/applications.js

Components/Carousel.qml

Components/Stage.qml

Components/WrongPasswordAnimation.qml

Components/carousel.js

Dash/DashContent.qml

Dash/DashMusic.qml

Dash/DashPeople.qml

Dash/DashVideos.qml

Dash/LensDelegateMapper.qml

Dash/Video/VideoPreview.qml

Greeter/GreeterContent.qml

Greeter/Lockscreen.qml

Greeter/LoginList.qml

Greeter/PassphraseLockscreen.qml

Greeter/PinLockscreen.qml

Greeter/PinPadButton.qml

Launcher/Launcher.qml

Panel/SearchIndicator.qml

plugins/LightDM/CMakeLists.txt

plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp

plugins/Ubuntu/Gestures/AxisVelocityCalculator.h

plugins/Ubuntu/Gestures/CMakeLists.txt

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp

plugins/Ubuntu/Gestures/DirectionalDragArea.h

po/update-unity-pot

tests/autopilot/unity8/emulators/main_window.py

tests/autopilot/unity8/tests/testhud.py

tests/autopilot/unity8/tests/testlockscreen.py

tests/mocks/LightDM/CMakeLists.txt

tests/mocks/LightDM/full/GreeterPrivate.cpp

tests/mocks/LightDM/full/UsersModelPrivate.cpp

tests/mocks/LightDM/single-passphrase/

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

tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp

tests/mocks/LightDM/single-passphrase/InfographicModelPrivate.cpp

tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp

tests/mocks/LightDM/single-pin/

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

tests/mocks/LightDM/single-pin/GreeterPrivate.cpp

tests/mocks/LightDM/single-pin/InfographicModelPrivate.cpp

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp

tests/plugins/Ubuntu/Gestures/CMakeLists.txt

tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_Carousel.qml

tests/qmltests/Components/tst_Stage.qml

tests/qmltests/Dash/qml/FakeLensView.qml

tests/qmltests/Dash/qml/fake_generic_lensView.qml

tests/qmltests/Dash/qml/fake_lensView1.qml

tests/qmltests/Dash/qml/fake_lensView2.qml

tests/qmltests/Dash/qml/fake_lensView3.qml

tests/qmltests/Dash/qml/fake_lensView4.qml

tests/qmltests/Dash/tst_Dash.qml

tests/qmltests/Dash/tst_DashContent.qml

tests/qmltests/Greeter/tst_Lockscreen.qml

Older »