lp:~ralsina/ubuntuone-windows-installer/ui-come-back-to-installer

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-windows-installer at revision 25

Natalia Bidart (community): Approve on 2011-08-02

Diego Sarmentero (community): Approve on 2011-08-01

Diff: 1027 lines (+379/-370)

12 files modified

bin/ubuntuone-installer-qt (+0/-3)
data/qt/local_folders.ui (+63/-33)
ubuntuone_installer/gui/qt/currentuser.py (+55/-0)
ubuntuone_installer/gui/qt/embedded_sso.py (+0/-61)
ubuntuone_installer/gui/qt/forgotten.py (+34/-34)
ubuntuone_installer/gui/qt/gui.py (+24/-2)
ubuntuone_installer/gui/qt/local_folders.py (+7/-2)
ubuntuone_installer/gui/qt/main/tests/test_main.py (+0/-97)
ubuntuone_installer/gui/qt/main/windows.py (+21/-29)
ubuntuone_installer/gui/qt/sync_now_or_later.py (+44/-44)
ubuntuone_installer/gui/qt/tests/test_currentuser.py (+90/-0)
ubuntuone_installer/gui/qt/tests/test_gui.py (+41/-65)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #803595: Wizard does not check for credentials already in the system

Medium

Fix Released

Link a bug report

Related blueprints

50. By Roberto Alsina on 2011-08-02

fixes

49. By Roberto Alsina on 2011-08-02

lint fixes

48. By Roberto Alsina on 2011-08-02

log credential exceptions

47. By Roberto Alsina on 2011-08-02

fixes

46. By Roberto Alsina on 2011-08-02

fix race condition in test

45. By Roberto Alsina on 2011-08-02

fixes

44. By Roberto Alsina on 2011-08-02

fixes

43. By Roberto Alsina on 2011-08-02

Use a successful deferred

42. By Roberto Alsina on 2011-08-02

no need for embedded_sso anymore

41. By Roberto Alsina on 2011-08-02

merge