Merge lp:~ahayzen/ubuntu-weather-app/fix-1505848-add-owm-key into lp:ubuntu-weather-app
Proposed by
Andrew Hayzen
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Victor Thompson | ||||
Approved revision: | 141 | ||||
Merged at revision: | 136 | ||||
Proposed branch: | lp:~ahayzen/ubuntu-weather-app/fix-1505848-add-owm-key | ||||
Merge into: | lp:ubuntu-weather-app | ||||
Diff against target: |
159 lines (+33/-10) 6 files modified
app/data/WeatherApi.js (+24/-4) app/data/keys.js (+1/-0) app/ubuntu-weather-app.qml (+4/-3) app/ui/settings/DataProviderPage.qml (+2/-2) debian/changelog (+1/-0) po/com.ubuntu.weather.pot (+1/-1) |
||||
To merge this branch: | bzr merge lp:~ahayzen/ubuntu-weather-app/fix-1505848-add-owm-key | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Victor Thompson | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email: mp+274423@code.launchpad.net |
Commit message
* Add support for OWM API keys
Description of the change
* Add support for OWM API keys
Not sure what we should do with the settings page when you have no keys at all (note we currently hide TWC), and not sure what should happen when you load the app with no keys.
To post a comment you must log in.
PASSED: Continuous integration, rev:138 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/266/ 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- vivid-amd64- ci/266
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/266/ rebuild
http://