lp:~mardy/webbrowser-app/multi-account-no-ui

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:webbrowser-app

system-apps-ci-bot: Needs Fixing (continuous-integration) on 2016-05-10

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-04-16

Ubuntu Phablet Team: Pending requested 2015-04-13

Diff: 1344 lines (+809/-244)

16 files modified

src/app/webcontainer/AccountChooserDialog.qml (+129/-0)
src/app/webcontainer/AccountItem.qml (+4/-6)
src/app/webcontainer/AccountsLoginPage.qml (+54/-137)
src/app/webcontainer/AccountsModel.qml (+0/-51)
src/app/webcontainer/AccountsPage.qml (+173/-10)
src/app/webcontainer/CMakeLists.txt (+1/-1)
src/app/webcontainer/LoggingInSheet.qml (+39/-0)
src/app/webcontainer/LogoutDetector.qml (+78/-0)
src/app/webcontainer/LogoutErrorSheet.qml (+64/-0)
src/app/webcontainer/SplashScreen.qml (+105/-0)
src/app/webcontainer/WebApp.qml (+2/-0)
src/app/webcontainer/cookie-store.cpp (+1/-0)
src/app/webcontainer/logout-detector.js (+41/-0)
src/app/webcontainer/webapp-container.cpp (+24/-0)
src/app/webcontainer/webapp-container.h (+3/-0)
src/app/webcontainer/webapp-container.qml (+91/-39)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

982. By Alberto Mardegan on 2015-04-16

alignment

981. By Alberto Mardegan on 2015-04-16

UI updates

980. By Alberto Mardegan on 2015-04-16

Fixes

979. By Alberto Mardegan on 2015-04-16

UI changes

978. By Alberto Mardegan on 2015-04-15

Reset the webview on logout detected

977. By Alberto Mardegan on 2015-04-15

Remove count of login attempts

We cannot count it reliably anyway.

976. By Alberto Mardegan on 2015-04-15

Add missing import

975. By Alberto Mardegan on 2015-04-15

From trunk

[ Alexandre Abreu ]
* remove qtwebkit deps (LP: #1362640) (LP: #1362640)
[ CI Train Bot ]
* New rebuild forced.
[ Justin McPherson ]
* Command line options for media-hub use through Oxide.
[ Olivier Tilloy ]
* Update translation template.

974. By Alberto Mardegan on 2015-04-15

Remove multi-account leftovers

973. By Alberto Mardegan on 2015-04-13

Automatic re-login