lp:~michael-sheldon/webbrowser-app/file-upload

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:webbrowser-app at revision 493

Olivier Tilloy: Approve on 2014-04-11

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

Ken VanDine: Needs Fixing on 2014-03-25

Diff: 501 lines (+352/-26)

9 files modified

debian/control (+3/-1)
po/webbrowser-app.pot (+11/-3)
src/app/ContentPickerDialog.qml (+98/-0)
src/app/FilePickerDialog.qml (+44/-0)
src/app/WebViewImpl.qml (+6/-0)
src/app/browserapplication.cpp (+1/-20)
src/app/browserapplication.h (+5/-2)
tests/autopilot/webbrowser_app/tests/http_server.py (+18/-0)
tests/autopilot/webbrowser_app/tests/test_content_pick.py (+166/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

455. By Michael Sheldon on 2014-04-11

Restore fix for keyboard focus after content picking

454. By Michael Sheldon on 2014-04-11

Remove unused customPeerModelLoader alias

453. By Michael Sheldon on 2014-04-11

Remove no longer needed QtQuick.Dialogs import

452. By Michael Sheldon on 2014-04-11

Avoid depending on qtdeclarative5-ubuntu-content0.1

451. By Michael Sheldon on 2014-04-10

Remove unnecessary dependency on qtdeclarative5-ubuntu-content0.1

450. By Michael Sheldon on 2014-04-10

Remove unnecessary dependencies on qtdeclarative5-dialogs-plugin

449. By Michael Sheldon on 2014-04-10

Remove tab

448. By Michael Sheldon on 2014-04-10

Remove extra semi-colon

447. By Michael Sheldon on 2014-04-10

Update translation template

446. By Michael Sheldon on 2014-04-10

Make QApplication include more consistent