lp:~vthompson/ubuntu-weather-app/reboot-graphics

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-weather-app at revision 12

Martin Borho: Approve on 2015-02-28

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2015-02-23

Andrew Hayzen: Needs Information on 2015-01-23

Diff: 491 lines (+284/-36)

17 files modified

app/CMakeLists.txt (+1/-0)
app/components/DayDelegate.qml (+0/-14)
app/components/HomeGraphic.qml (+6/-17)
app/graphics/CMakeLists.txt (+5/-0)
app/graphics/clouds.svg (+22/-0)
app/graphics/cloudy-night.svg (+38/-0)
app/graphics/cloudy.svg (+12/-0)
app/graphics/fog.svg (+13/-0)
app/graphics/partly-cloudy.svg (+21/-0)
app/graphics/rain.svg (+22/-0)
app/graphics/snow.svg (+21/-0)
app/graphics/starry.svg (+22/-0)
app/graphics/sunny.svg (+13/-0)
app/graphics/thunder.svg (+14/-0)
app/graphics/windy-snow.svg (+42/-0)
app/ui/HomePage.qml (+27/-3)
app/ui/LocationPane.qml (+5/-2)

api

Superseded for merging into lp:ubuntu-weather-app/obsolete.trunk

Ubuntu Weather Developers: Pending requested 2015-01-23

Diff: 1023 lines (+929/-0) (has conflicts)

11 files modified

.bzrignore (+19/-0)
CMakeLists.txt (+95/-0)
COPYING (+674/-0)
README (+11/-0)
README.translations (+40/-0)
click/CMakeLists.txt (+15/-0)
click/manifest.json.in (+23/-0)
click/weather.apparmor (+5/-0)
com.ubuntu.weather_weather.desktop.in.in (+12/-0)
ubuntu-weather-app.in (+3/-0)
ubuntu-weather-app.qmlproject (+32/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9. By Victor Thompson on 2015-02-23

merge of trunk and resolve conflicts

8. By Victor Thompson on 2015-02-12

merge of trunk, resolve conflict

7. By Victor Thompson on 2015-02-12

Fix resource name

6. By Victor Thompson on 2015-02-12

merge of trunk

5. By Victor Thompson on 2015-02-08

Add icons for row delegates.

4. By Victor Thompson on 2015-02-08

* Use new resources

3. By Victor Thompson on 2015-02-08

merge of trunk

2. By Victor Thompson on 2015-01-23

* Add graphics from Design's Shapes.psd file

1. By Andrew Hayzen on 2015-01-22

* Initial commit