lp:~martin-borho/ubuntu-weather-app/weather-channel-client

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-weather-app/obsolete.trunk at revision 196

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2014-02-15

David Planella: Approve on 2014-02-15

Diff: 1266 lines (+659/-100)

17 files modified

CMakeLists.txt (+1/-0)
components/CurrentWeather.qml (+38/-16)
components/LocationTab.qml (+34/-22)
components/SettingsSheet.qml (+42/-7)
components/TabFooter.qml (+139/-0)
components/WeatherApi.js (+231/-4)
components/WeatherConditionIconComponent.qml (+6/-2)
components/WeatherTemperatureComponent.qml (+2/-1)
key.js (+1/-0)
tests/autopilot/ubuntu_weather_app/files/1.json (+1/-0)
tests/autopilot/ubuntu_weather_app/files/2.json (+1/-0)
tests/autopilot/ubuntu_weather_app/tests/__init__.py (+16/-2)
tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py (+1/-2)
tests/autopilot/ubuntu_weather_app/tests/test_mainview.py (+1/-2)
tests/autopilot/ubuntu_weather_app/tests/test_settings.py (+133/-27)
tests/autopilot/ubuntu_weather_app/tests/weatherdata.py (+0/-10)
ubuntu-weather-app.qml (+12/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1251633: should show chance of precipitation

Medium

Fix Released

Link a bug report

Related blueprints

192. By Martin Borho on 2014-02-15

added fix from francis for keys.js to CMakeLists.txt

191. By Martin Borho on 2014-02-15

merged from trunk

190. By Martin Borho on 2014-02-11

rebased on trunk, fixed conflict

189. By Martin Borho on 2014-01-28

merged from trunk

188. By Martin Borho on 2014-01-28

added key.js to contain the TWC api key

187. By Martin Borho on 2014-01-25

checked all possible TWC codes from icons on webpage, not appropriate in all cases

186. By Martin Borho on 2014-01-25

removed visual assets, will be added by neokores branch

185. By Martin Borho on 2014-01-24

settings: make precipitation units option available only when OWM is choosen

184. By Martin Borho on 2014-01-24

more icons codes

183. By Martin Borho on 2014-01-23

updated tests