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

Status: Merged
Approved by: Bartosz Kosiorek
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
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Jenkins Bot continuous-integration Approve
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
1=== modified file 'README'
2--- README 2015-01-22 21:56:55 +0000
3+++ README 2015-11-09 10:48:18 +0000
4@@ -4,6 +4,15 @@
5 https://wiki.ubuntu.com/Touch/CoreApps/Weather
6 https://wiki.ubuntu.com/Touch/CoreApps/DevelopmentGuide
7
8+Note: The OpenWeatherMap service now requires an API key where previously
9+ it did not. FOSS developers can register for a free API key
10+ which needs to be put into app/data/keys.js for the app to
11+ function correctly. Do not commit branches with the key in place
12+ as a centrally managed key is injected at build time.
13+
14+ See http://openweathermap.org/faq#error401 for details and
15+ http://openweathermap.org/appid to obtain a personal key.
16+
17 The following essential packages are required to develop this app:
18 - ubuntu-sdk (see http://developer.ubuntu.com/start)
19 - intltool - run the `sudo apt-get install intltool` command for installation
20
21=== modified file 'app/data/keys.js'
22--- app/data/keys.js 2015-10-14 23:31:23 +0000
23+++ app/data/keys.js 2015-11-09 10:48:18 +0000
24@@ -1,2 +1,2 @@
25 var twcKey = "";
26-var owmKey = ""; // goto http://openweathermap.org/appid to get a personal API key
27+var owmKey = ""; // See README for details on how to obtain a personal API key

Subscribers

People subscribed via source and target branches