Unity 8

Merge lp://qastaging/~unity-team/unity8/flickables-speed-workaround into lp://qastaging/unity8

flickables-speed-workaround
Merge into trunk

Proposed by Andrea Cimitan on 2014-09-11

Status:

Superseded

Proposed branch:

lp://qastaging/~unity-team/unity8/flickables-speed-workaround

Merge into:

lp://qastaging/unity8

Prerequisite:

lp://qastaging/~unity-team/unity8/scopes_more_things_on_memory

Diff against target:

16466 lines (+4631/-4257)

100 files modified

po/am.po (+88/-64)
po/ar.po (+53/-59)
po/ast.po (+90/-65)
po/az.po (+55/-67)
po/bg.po (+51/-56)
po/br.po (+92/-68)
po/bs.po (+53/-58)
po/ca.po (+91/-68)
po/ckb.po (+51/-56)
po/cs.po (+51/-56)
po/da.po (+52/-57)
po/de.po (+54/-65)
po/el.po (+53/-58)
po/en_AU.po (+67/-78)
po/en_GB.po (+103/-78)
po/eo.po (+51/-56)
po/es.po (+93/-70)
po/eu.po (+89/-65)
po/fa.po (+82/-64)
po/fi.po (+86/-62)
po/fo.po (+51/-56)
po/fr.po (+93/-70)
po/gd.po (+94/-71)
po/gl.po (+84/-60)
po/he.po (+53/-58)
po/hi.po (+51/-56)
po/hr.po (+53/-58)
po/hu.po (+92/-67)
po/hy.po (+51/-56)
po/id.po (+51/-56)
po/is.po (+70/-62)
po/it.po (+55/-67)
po/ja.po (+65/-70)
po/km.po (+61/-77)
po/kn.po (+51/-56)
po/ko.po (+94/-65)
po/ky.po (+51/-56)
po/lo.po (+51/-56)
po/lt.po (+54/-59)
po/lv.po (+52/-60)
po/ml.po (+52/-58)
po/mr.po (+51/-56)
po/ms.po (+51/-56)
po/my.po (+51/-56)
po/nb.po (+89/-65)
po/nl.po (+92/-68)
po/pl.po (+55/-60)
po/pt.po (+88/-64)
po/pt_BR.po (+54/-65)
po/ro.po (+91/-68)
po/ru.po (+56/-67)
po/shn.po (+51/-56)
po/si.po (+51/-56)
po/sl.po (+93/-68)
po/sq.po (+51/-56)
po/sr.po (+56/-67)
po/sv.po (+88/-65)
po/sw.po (+51/-56)
po/ta.po (+52/-59)
po/te.po (+52/-57)
po/tr.po (+53/-61)
po/ug.po (+86/-62)
po/uk.po (+95/-71)
po/vi.po (+51/-56)
po/xh.po (+51/-56)
po/zh_CN.po (+55/-59)
po/zh_HK.po (+52/-57)
po/zh_TW.po (+74/-62)
qml/Components/Carousel.qml (+2/-3)
qml/Components/Flickables/Flickable.qml (+23/-0)
qml/Components/Flickables/GridView.qml (+25/-0)
qml/Components/Flickables/ListView.qml (+25/-0)
qml/Components/Flickables/ListViewWithPageHeader.qml (+23/-0)
qml/Components/ResponsiveGridView.qml (+2/-1)
qml/Components/ZoomableImage.qml (+2/-2)
qml/Dash/CardHorizontalList.qml (+2/-1)
qml/Dash/DashContent.qml (+2/-3)
qml/Dash/DashNavigationButton.qml (+2/-1)
qml/Dash/DashNavigationList.qml (+2/-1)
qml/Dash/PageHeader.qml (+2/-1)
qml/Dash/PreviewListView.qml (+2/-3)
qml/Dash/Previews/Preview.qml (+2/-1)
qml/Dash/Previews/PreviewImageGallery.qml (+3/-2)
qml/Dash/ScopeListView.qml (+3/-6)
qml/Dash/ScopeSettingsPage.qml (+2/-1)
qml/Dash/ScopesOverviewAll.qml (+2/-1)
qml/Dash/ScopesOverviewFavorites.qml (+4/-2)
qml/Greeter/LoginList.qml (+2/-2)
qml/Hud/Hud.qml (+2/-1)
qml/Hud/HudParametrizedActionsPage.qml (+2/-1)
qml/Launcher/LauncherPanel.qml (+2/-1)
qml/Notifications/Notification.qml (+2/-1)
qml/Notifications/Notifications.qml (+2/-1)
qml/Panel/IndicatorRow.qml (+2/-1)
qml/Panel/Indicators/DefaultIndicatorPage.qml (+2/-1)
qml/Panel/Indicators/client/IndicatorsList.qml (+2/-1)
qml/Panel/Indicators/client/IndicatorsTree.qml (+2/-1)
qml/Panel/MenuContent.qml (+3/-2)
qml/Stages/PhoneStage.qml (+2/-1)
qml/Stages/TabletStage.qml (+2/-1)

To merge this branch:

bzr merge lp://qastaging/~unity-team/unity8/flickables-speed-workaround

High

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-09-11	Needs Fixing on 2014-10-10
Albert Astals Cid (community)		2014-09-11	Needs Fixing on 2014-10-06
Review via email: mp+234298@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2014-10-10.

Description of the change

Let jenkins build pkgs

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-11:

FAILED: Continuous integration, rev:1237
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4276/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4722/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1370
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4493/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5974
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5974/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13063

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4276/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~unity-team/unity8/flickables-speed-workaround updated on 2014-09-15

1237. By Andrea Cimitan on 2014-09-15: [ Pete Woods ]
* Disable OEM and Click scopes when system scopes are disabled
[ CI bot ]
* Resync trunk
[ Pawel Stolowski ]
* Set UNITY_SCOPES_NO_FAVORITES environment variable to make scopes
plugin ignore favorite scopes and fix basic functionality of unity-
scope-tool.
1238. By Andrea Cimitan on 2014-09-15: Bump requirements and add comments for GridView and ListView

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

FAILED: Continuous integration, rev:1238
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4314/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4837/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1408
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4599/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6089
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6089/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13235

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4314/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-09-17:

I'll review this after we land lp:~unity-team/unity8/scopes_more_things_on_memory

lp://qastaging/~unity-team/unity8/flickables-speed-workaround updated on 2014-09-30

1239. By Andrea Cimitan on 2014-09-30: merged
1240. By Andrea Cimitan on 2014-09-30: merged slideshow branch
1241. By Andrea Cimitan on 2014-09-30: Flickables for menucontent

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30:

FAILED: Continuous integration, rev:1239
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4440/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30:

FAILED: Continuous integration, rev:1241
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4443/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-06:

Text conflict in debian/control
Text conflict in plugins/Dash/CardCreator.js
Text conflict in qml/Dash/GenericScopeView.qml
Text conflict in qml/Dash/ScopeSettingsPage.qml
Text conflict in qml/Panel/Indicators/DefaultIndicatorPage.qml
Text conflict in qml/Panel/MenuContent.qml
Text conflict in tests/plugins/Dash/cardcreator/2.res
Text conflict in tests/plugins/Dash/cardcreator/7.res
Text conflict in tests/qmltests/Dash/tst_GenericScopeView.qml
9 conflicts encountered.

review: Needs Fixing

lp://qastaging/~unity-team/unity8/flickables-speed-workaround updated on 2014-10-10

1242. By Andrea Cimitan on 2014-10-10: merge trunk
1243. By Andrea Cimitan on 2014-10-10: Attempt to merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-10:

FAILED: Continuous integration, rev:1242
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/flickables-speed-workaround/+merge/234298/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4604/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5809/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1590
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1698
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5463/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7061
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7061/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14499