diff options
| author | rsudev <rasch@munin-soft.de> | 2013-12-04 12:33:00 +0100 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2013-12-04 12:33:00 +0100 |
| commit | 9ff01a9fa8c7505803f80bdb4366098763f2185a (patch) | |
| tree | 14bf7db1465a7ac61e1e059dfccf909c9c295178 | |
| parent | fdaf6c127dc55e3e632b57c3762ea31bed861c13 (diff) | |
| parent | 4e6da5f03e4882a44aa30dc168141c39f217fbf4 (diff) | |
| download | cgeo-9ff01a9fa8c7505803f80bdb4366098763f2185a.zip cgeo-9ff01a9fa8c7505803f80bdb4366098763f2185a.tar.gz cgeo-9ff01a9fa8c7505803f80bdb4366098763f2185a.tar.bz2 | |
Merge remote-tracking branch 'upstream/release' into master_dev
| -rw-r--r-- | main/res/values/changelog_release.xml | 5 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/cgeoApplicationTest.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index 9776247..54abe80 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -2,6 +2,11 @@ <resources> <!-- changelog for the release branch --> <string name="changelog_release" translatable="false">\n + <b>Next bugfix release</b>\n + · Personal note upload now only for PM\n + · Find count not updated is user has found 1 cache\n + \n + \n <b>2013.10.23</b>\n · Adapted to changes on gc.com (spoiler images)\n · Possibility to manually select file path for maps\n diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java index b320467..f218518 100644 --- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java +++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java @@ -81,7 +81,7 @@ public class cgeoApplicationTest extends CGeoTestCase { assertEquals("0564a940-8311-40ee-8e76-7e91b2cf6284", tb.getOwnerGuid()); assertEquals("Kinder erfreuen.<br /><br />Make children happy.", tb.getGoal()); assertTrue(tb.getDetails().startsWith("Auf der CD sind")); - assertEquals("http://img.geocaching.com/track/display/38382780-87a7-4393-8393-78841678ee8c.jpg", tb.getImage()); + assertEquals("http://imgcdn.geocaching.com/track/display/38382780-87a7-4393-8393-78841678ee8c.jpg", tb.getImage()); // Following data can change over time assertTrue(tb.getDistance() >= 10617.8f); assertTrue(tb.getLogs().size() >= 10); |