Merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/14.10-trunk-backport into lp://staging/ubuntu-html5-theme/14.10
Proposed by
Alexandre Abreu
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~abreu-alexandre/ubuntu-html5-theme/14.10-trunk-backport |
Merge into: | lp://staging/ubuntu-html5-theme/14.10 |
Diff against target: |
11097 lines (+2272/-6840) 78 files modified
0.1/ambiance/css/appTemplate.css (+481/-109) 0.1/ambiance/css/sass/constants.scss (+15/-5) 0.1/ambiance/css/sass/default.scss (+12/-5) 0.1/ambiance/css/sass/icons.scss (+16/-16) 0.1/ambiance/css/sass/listitems.scss (+12/-6) 0.1/ambiance/css/sass/mixins.scss (+4/-4) 0.1/ambiance/css/sass/popover.scss (+89/-21) 0.1/ambiance/css/sass/shapes.scss (+3/-3) 0.1/ambiance/css/sass/sliders.scss (+68/-17) 0.1/ambiance/css/sass/tabs.scss (+275/-45) 0.1/ambiance/css/sass/toolbars.scss (+3/-1) 0.1/ambiance/img/actions/add-to-playlist.svg (+0/-190) 0.1/ambiance/img/actions/calendar-today.svg (+0/-170) 0.1/ambiance/img/actions/camera-flip.svg (+0/-164) 0.1/ambiance/img/actions/contact.svg (+0/-161) 0.1/ambiance/img/actions/dialer.svg (+0/-208) 0.1/ambiance/img/actions/edit-clear.svg (+0/-161) 0.1/ambiance/img/actions/edit-copy.svg (+0/-177) 0.1/ambiance/img/actions/edit-delete.svg (+0/-190) 0.1/ambiance/img/actions/edit-paste.svg (+0/-200) 0.1/ambiance/img/actions/erase.svg (+0/-155) 0.1/ambiance/img/actions/event-new.svg (+0/-181) 0.1/ambiance/img/actions/go-down.svg (+0/-181) 0.1/ambiance/img/actions/home.svg (+0/-167) 0.1/ambiance/img/actions/info.svg (+0/-158) 0.1/ambiance/img/actions/language-chooser.svg (+0/-166) 0.1/ambiance/img/actions/media-playback-pause.svg (+0/-157) 0.1/ambiance/img/actions/media-playlist-shuffle.svg (+0/-185) 0.1/ambiance/img/actions/media-playlist.svg (+0/-173) 0.1/ambiance/img/actions/message-new.svg (+0/-173) 0.1/ambiance/img/actions/microphone-mute.svg (+0/-163) 0.1/ambiance/img/actions/notebook-new.svg (+0/-185) 0.1/ambiance/img/actions/notebook.svg (+0/-163) 0.1/ambiance/img/actions/outgoing-call.svg (+0/-166) 0.1/ambiance/img/actions/private-browsing.svg (+0/-149) 0.1/ambiance/img/actions/private-tab-new.svg (+0/-159) 0.1/ambiance/img/actions/redo.svg (+0/-170) 0.1/ambiance/img/actions/remove-from-call.svg (+0/-163) 0.1/ambiance/img/actions/share.svg (+0/-146) 0.1/ambiance/img/actions/system-log-out.svg (+0/-174) 0.1/ambiance/img/actions/tab-new.svg (+0/-165) 0.1/ambiance/img/actions/unlike.svg (+0/-142) 0.1/ambiance/img/actions/view-fullscreen.svg (+0/-183) 0.1/ambiance/img/icons/icon-call.svg (+0/-88) 0.1/ambiance/js/core.js (+355/-205) 0.1/ambiance/js/header.js (+6/-6) 0.1/ambiance/js/list.js (+8/-6) 0.1/ambiance/js/page.js (+9/-37) 0.1/ambiance/js/pagestacks.js (+18/-10) 0.1/ambiance/js/tab.js (+25/-28) 0.1/ambiance/js/tabs.js (+141/-301) 0.1/ambiance/js/toolbars.js (+65/-1) CMakeLists.txt (+4/-0) debian/control (+6/-10) examples/html5-theme/apps/rss-reader/app.js (+22/-18) examples/html5-theme/apps/rss-reader/index.html (+7/-5) examples/html5-theme/widgets/ListItems.html (+28/-28) examples/html5-theme/widgets/Pagestack.html (+107/-101) examples/html5-theme/widgets/Popovers.html (+19/-13) examples/html5-theme/widgets/Sliders.html (+8/-8) examples/html5-theme/widgets/UbuntuShape.html (+40/-42) src/plugin/Ubuntu/WebApps/CordovaLoader.qml (+5/-0) src/plugin/Ubuntu/WebApps/UbuntuJavascriptBindings.qml (+5/-1) src/plugin/Ubuntu/WebApps/WebAppContainer.qml (+78/-70) src/ubuntu-html5-app-launcher/CMakeLists.txt (+2/-1) src/ubuntu-html5-app-launcher/main.cpp (+41/-40) src/ubuntu-html5-app-launcher/main.qml (+3/-1) tests/autopilot/tools/qml/webview.qml (+91/-25) tests/autopilot/ubuntu_html5_container/__init__.py (+2/-4) tests/autopilot/ubuntu_html5_container/emulators/__init__.py (+0/-10) tests/autopilot/ubuntu_html5_container/tests/__init__.py (+12/-7) tests/autopilot/ubuntu_html5_container/tests/test_appLaunch.py (+5/-6) tests/autopilot/ubuntu_html5_ui_toolkit/__init__.py (+2/-3) tests/autopilot/ubuntu_html5_ui_toolkit/emulators/__init__.py (+0/-10) tests/autopilot/ubuntu_html5_ui_toolkit/tests/__init__.py (+88/-38) tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_pagestack.py (+58/-22) tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_rss_reader.py (+7/-6) tests/autopilot/ubuntu_html5_ui_toolkit/tests/test_tabs.py (+27/-12) |
To merge this branch: | bzr merge lp://staging/~abreu-alexandre/ubuntu-html5-theme/14.10-trunk-backport |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Pending | |
Ubuntu HTML5 Theme Developers | Pending | ||
Review via email:
|
This proposal supersedes a proposal from 2015-03-16.
Description of the change
Backport HTML5 fixes and updates to 14.10
To post a comment you must log in.
Unmerged revisions
- 177. By Alexandre Abreu
-
bundle backport of trunk features needed
FAILED: Continuous integration, rev:177 jenkins. qa.ubuntu. com/job/ ubuntu- html5-theme- ci/167/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- vivid/728/ console jenkins. qa.ubuntu. com/job/ ubuntu- html5-theme- vivid-amd64- ci/12/console jenkins. qa.ubuntu. com/job/ ubuntu- html5-theme- vivid-armhf- ci/12/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-amd64/ 857/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- html5-theme- ci/167/ rebuild
http://