lp:~dpm/humpolec/converge-branches

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:humpolec

The Humpolec team: Pending requested 2014-02-11

Diff: 3279 lines (+3057/-0)

36 files modified

.bzrignore (+1/-0)
Android/boot-manager/Android.mk (+12/-0)
Android/boot-manager/Makefile (+15/-0)
Android/boot-manager/bootimg.h (+100/-0)
Android/boot-manager/bootmgr.c (+149/-0)
Android/loop-mount-agent/Android.mk (+27/-0)
Android/loop-mount-agent/aloopmount.cpp (+133/-0)
Ubuntu/Makefile (+203/-0)
Ubuntu/app/Makefile (+14/-0)
Ubuntu/app/tests/autopilot/contactsimporter/__init__.py (+132/-0)
Ubuntu/app/tests/autopilot/contactsimporter/main/__init__.py (+1/-0)
Ubuntu/app/tests/autopilot/contactsimporter/main/test_main.py (+23/-0)
Ubuntu/app/tests/autopilot/run (+11/-0)
Ubuntu/app/tests/unit/tst_hellocomponent.qml (+49/-0)
Ubuntu/app/ubuntudualboot.desktop (+8/-0)
Ubuntu/app/ubuntudualboot.qml (+57/-0)
Ubuntu/backend/Makefile (+205/-0)
Ubuntu/backend/backend.pro (+8/-0)
Ubuntu/backend/modules/ubuntuboot/Makefile (+887/-0)
Ubuntu/backend/modules/ubuntuboot/backend.cpp (+17/-0)
Ubuntu/backend/modules/ubuntuboot/backend.h (+18/-0)
Ubuntu/backend/modules/ubuntuboot/moc_backend.cpp (+155/-0)
Ubuntu/backend/modules/ubuntuboot/moc_mytype.cpp (+162/-0)
Ubuntu/backend/modules/ubuntuboot/moc_ubuntuboot.cpp (+213/-0)
Ubuntu/backend/modules/ubuntuboot/qmldir (+2/-0)
Ubuntu/backend/modules/ubuntuboot/ubuntuboot.cpp (+35/-0)
Ubuntu/backend/modules/ubuntuboot/ubuntuboot.h (+50/-0)
Ubuntu/backend/modules/ubuntuboot/ubuntuboot.pro (+36/-0)
Ubuntu/click/manifest.json (+15/-0)
Ubuntu/click/plugin/ubuntuboot/qmldir (+2/-0)
Ubuntu/click/ubuntudualboot.desktop (+8/-0)
Ubuntu/click/ubuntudualboot.json (+8/-0)
Ubuntu/click/ubuntudualboot.qml (+57/-0)
Ubuntu/click_howto (+9/-0)
Ubuntu/ubuntudualboot.pro (+11/-0)
install/dualboot.sh (+224/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

65. By David Planella on 2014-02-11

Removed files that don't need to be under version control as they are generated

64. By David Planella on 2014-02-11

Merged ubuntudualboot branch

63. By David Planella on 2014-02-11

Merged install-script branch

62. By David Planella on 2014-02-11

Merged bootmgr branch

61. By David Planella on 2014-02-11

Merged android-loop-mount-agent branch

60. By David Planella on 2014-02-11

Reorganized the source tree in preparation to adding the different parts of the project to the same branch

59. By Rex Tsai on 2014-01-09

Notify user there is no network connection.

When the downloaded failed, check the network again.

58. By Rex Tsai on 2014-01-09

Notify user there is no network connection.

It will check if mobile network or wifi is eanbled,
if not it will shows a dialog remind the user to enable wifi.

57. By Rex Tsai on 2014-01-09

Refined button of installer screen.

When networking is slow, the installer screen show "Hi" in download
button, it should show something make sense.

56. By Yuan-Chen Cheng on 2014-01-08

don't remove /data/.layout_version which android use it for tracking