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

Branch merges

Propose for merging

No branches dependent on this one.

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

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

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

Ubuntu Clock Developers: Pending requested 2014-07-21

Diff: 537 lines (+369/-14)

10 files modified

app/clock/ClockPage.qml (+6/-0)
app/worldclock/UserWorldCityList.qml (+154/-0)
app/worldclock/WorldCityList.qml (+31/-5)
backend/CMakeLists.txt (+1/-0)
backend/modules/Timezone/backend.cpp (+2/-0)
backend/modules/Timezone/generictimezonemodel.cpp (+81/-0)
backend/modules/Timezone/generictimezonemodel.h (+58/-0)
backend/modules/Timezone/timezonemodel.cpp (+19/-4)
backend/modules/Timezone/timezonemodel.h (+17/-4)
backend/modules/Timezone/xmltimezonemodel.cpp (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

48. By Nekhelesh Ramananthan on 2014-07-22

merge trunk

47. By Nekhelesh Ramananthan on 2014-07-22

Small tweak to header

46. By Nekhelesh Ramananthan on 2014-07-22

renamed property name from model to results to avoid confusion

45. By Nekhelesh Ramananthan on 2014-07-22

Renamed loadTimeZonesFromU1db to loadTimeZonesFromVariantList

44. By Nekhelesh Ramananthan on 2014-07-22

Added const in function definition of setModel()

43. By Nekhelesh Ramananthan on 2014-07-22

Explained the reasoning behind the change from private to public slot

42. By Nekhelesh Ramananthan on 2014-07-22

Removed unnecessary {}

41. By Nekhelesh Ramananthan on 2014-07-22

Renamed U1dbTimeZoneModel to GenericTimeZoneModel

40. By Nekhelesh Ramananthan on 2014-07-21

pop world clock page after user selects a city

39. By Nekhelesh Ramananthan on 2014-07-21

added copyright license