Merge lp:~popey/ubuntu-weather-app/update-readme-owm-key into lp:ubuntu-weather-app

Status: Merged
Approved by: Bartosz Kosiorek on 2015-11-09
Approved revision: 164
Merged at revision: 164
Proposed branch: lp:~popey/ubuntu-weather-app/update-readme-owm-key
Merge into: lp:ubuntu-weather-app
Diff against target: 27 lines (+10/-1)
2 files modified
README (+9/-0)
app/data/keys.js (+1/-1)
To merge this branch: bzr merge lp:~popey/ubuntu-weather-app/update-readme-owm-key
Reviewer Review Type Date Requested Status
Bartosz Kosiorek (community) Approve on 2015-11-09
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-11-09
Andrew Hayzen 2015-11-09 Approve on 2015-11-09
Jenkins Bot continuous-integration Approve on 2015-11-09
Review via email: mp+276974@code.launchpad.net

Commit message

Describe how to get a key in the README. Mention this in the key.js

Description of the change

Describe how to get a key in the README. Mention this in the key.js

To post a comment you must log in.
review: Approve (continuous-integration)
Andrew Hayzen (ahayzen) wrote :

Thanks, LGTM :-)

review: Approve
review: Approve (continuous-integration)
review: Approve (continuous-integration)
Bartosz Kosiorek (gang65) wrote :

Looks ok to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README'
--- README 2015-01-22 21:56:55 +0000
+++ README 2015-11-09 10:48:18 +0000
@@ -4,6 +4,15 @@
4 https://wiki.ubuntu.com/Touch/CoreApps/Weather4 https://wiki.ubuntu.com/Touch/CoreApps/Weather
5 https://wiki.ubuntu.com/Touch/CoreApps/DevelopmentGuide5 https://wiki.ubuntu.com/Touch/CoreApps/DevelopmentGuide
66
7Note: The OpenWeatherMap service now requires an API key where previously
8 it did not. FOSS developers can register for a free API key
9 which needs to be put into app/data/keys.js for the app to
10 function correctly. Do not commit branches with the key in place
11 as a centrally managed key is injected at build time.
12
13 See http://openweathermap.org/faq#error401 for details and
14 http://openweathermap.org/appid to obtain a personal key.
15
7The following essential packages are required to develop this app:16The following essential packages are required to develop this app:
8- ubuntu-sdk (see http://developer.ubuntu.com/start)17- ubuntu-sdk (see http://developer.ubuntu.com/start)
9- intltool - run the `sudo apt-get install intltool` command for installation18- intltool - run the `sudo apt-get install intltool` command for installation
1019
=== modified file 'app/data/keys.js'
--- app/data/keys.js 2015-10-14 23:31:23 +0000
+++ app/data/keys.js 2015-11-09 10:48:18 +0000
@@ -1,2 +1,2 @@
1var twcKey = "";1var twcKey = "";
2var owmKey = ""; // goto http://openweathermap.org/appid to get a personal API key2var owmKey = ""; // See README for details on how to obtain a personal API key

Subscribers

People subscribed via source and target branches