lp:~nik90/ubuntu-clock-app/10-world-clocks

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-clock-app at revision 23

Victor Thompson: Approve on 2014-07-15

Ubuntu Phone Apps Jenkins Bot: Needs Fixing (continuous-integration) on 2014-07-15

Riccardo Padovani: Approve on 2014-07-15

Michael Zanetti (community): Approve on 2014-07-14

Diff: 1175 lines (+942/-72)

20 files modified

.bzrignore (+1/-0)
CMakeLists.txt (+1/-0)
README.developers (+12/-0)
app/CMakeLists.txt (+1/-0)
app/alarm/AlarmList.qml (+0/-2)
app/clock/ClockPage.qml (+1/-1)
app/components/SubtitledListItem.qml (+0/-2)
app/worldclock/CMakeLists.txt (+6/-0)
app/worldclock/WorldCityList.qml (+144/-0)
app/worldclock/world-city-list.xml (+313/-0)
backend/CMakeLists.txt (+14/-5)
backend/modules/Timezone/backend.cpp (+19/-3)
backend/modules/Timezone/backend.h (+16/-21)
backend/modules/Timezone/timezonemodel.cpp (+130/-0)
backend/modules/Timezone/timezonemodel.h (+93/-0)
backend/modules/Timezone/xmltimezonemodel.cpp (+138/-0)
backend/modules/Timezone/xmltimezonemodel.h (+52/-0)
backend/modules/Timezone/zone.cpp (+0/-12)
backend/modules/Timezone/zone.h (+0/-25)
ubuntu-clock-app.json (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

44. By Nekhelesh Ramananthan on 2014-07-15

Updated .bzrignore to ignore the builddir

43. By Nekhelesh Ramananthan on 2014-07-15

Updated README.developers with instructions to build and run on utopic desktop

42. By Nekhelesh Ramananthan on 2014-07-15

Made city search case insensitive and also cleared the textfield properly

41. By Nekhelesh Ramananthan on 2014-07-14

Removed the registering of the base TimeZoneModel class since it is not required.

40. By Nekhelesh Ramananthan on 2014-07-14

Removed unnecessary QFile include

39. By Nekhelesh Ramananthan on 2014-07-14

cleaned up and commented xmltimezonemodel

38. By Nekhelesh Ramananthan on 2014-07-14

Cleaned up timezonemodel.cpp

37. By Nekhelesh Ramananthan on 2014-07-14

Removed hardcoding of listitem height

36. By Nekhelesh Ramananthan on 2014-07-14

cleaned up timezonemodel.h

35. By Nekhelesh Ramananthan on 2014-07-14

Fixed all build warnings

Merged branch lp:~mzanetti/ubuntu-clock-app/enable-c++11