lp:~bfiller/webbrowser-app/file-upload

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:webbrowser-app

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-02-04

Adnane Belmadiaf: Pending (community) requested 2014-01-26

Ubuntu Phablet Team: Pending requested 2014-01-26

Diff: 294 lines (+252/-0)

5 files modified

debian/control (+1/-0)
src/app/ContentPickerDialog.qml (+82/-0)
src/app/WebViewImpl.qml (+1/-0)
tests/autopilot/webbrowser_app/tests/http_server.py (+15/-0)
tests/autopilot/webbrowser_app/tests/test_content_pick.py (+153/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

420. By Bill Filler on 2014-01-26

merge with trunk

419. By Ugo Riboni on 2013-12-03

Comment, fix and disable parts of tests as necessary

418. By Ugo Riboni on 2013-12-02

More integration tests

417. By Ugo Riboni on 2013-12-02

Merge changes from trunk

416. By Ugo Riboni on 2013-11-27

Try interacting with the gallery app

415. By Ugo Riboni on 2013-11-27

Disable a test dependent on an autopilot bug, and improve the integration test

414. By Ugo Riboni on 2013-11-26

Add initial integration test

413. By Ugo Riboni on 2013-11-25

Add incomplete AP test

412. By Ugo Riboni on 2013-11-25

Merge changes from trunk

411. By Ugo Riboni on 2013-11-25

Improve the content picker dialog