cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8666 commits 4 branches 1 tag 499 MiB
Commit graph

8666 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niklas Laxström
20eac5feb5 Localisation updates from https://translatewiki.net. 2016-09-27 14:28:28 +02:00
Tom Hughes
4b5cb04d41 Merge remote-tracking branch 'openstreetmap/pull/1298' 2016-09-26 12:40:01 +01:00
Tom Hughes
d73128271f Fix rubocop warnings 2016-09-26 12:38:54 +01:00
Tom Hughes
ab8958bead Centre loading icon 2016-09-26 12:37:49 +01:00
Simon Poole
8a71bb1ce2 Add links to new approved OSMF privacy policy and some rewording. 2016-09-26 13:16:31 +02:00
Sarah Hoffmann
5efbc8a8b7 look for extra place tags in Nominatim search results 
Administrative boundaries at municipality level are generally
better described by the place node (as town, village etc.).
Nominatim exports the place type in extratags if it was able
to merge place nodes with admin boundaries. Use this preferably
to create the descriptive term.
 2016-09-26 13:00:10 +02:00
Bryan Housel
e104b53711 Remove SOTM 2016 banner, add Donation Drive 2016 Banner 2016-09-25 22:58:25 -04:00
Niklas Laxström
0e43524b8f Localisation updates from https://translatewiki.net. 2016-09-22 07:57:05 +02:00
Tom Hughes
d75c203ecf Add thunderforest API key to embedded maps 
Fixes #1293
 2016-09-21 20:05:00 +01:00
Tom Hughes
5f4dcd34ff Fix some rubocop warnings 2016-09-15 22:41:07 +01:00
Tom Hughes
fd9bf6b0ab Update to rails 4.2.7.1 2016-09-15 22:26:48 +01:00
Tom Hughes
19a9298855 Merge remote-tracking branch 'openstreetmap/pull/1285' 2016-09-15 19:21:21 +01:00
Tom Hughes
d82f9d12ce Fix new rubocop warnings 2016-09-15 19:21:00 +01:00
Tom Hughes
0674fc58b8 Rework R2 support for changes in sprockets 2016-09-15 19:07:09 +01:00
Tom Hughes
b8a59201bc Update bundle 2016-09-15 19:07:09 +01:00
Andy Allan
516979b045 Add additional list items to ensure they are not selected 
The other list tests already have assetions showing the different
lengths of lists.
 2016-09-15 11:06:37 +01:00
Niklas Laxström
dfb0748df2 Localisation updates from https://translatewiki.net. 2016-09-15 08:47:43 +02:00
Bryan Housel
1b1693b8fe Prioritize next upcoming event in banner rotation 
(closes #1284)
 2016-09-14 15:03:41 -04:00
Andy Allan
d26f4074fa Remove unneccessary fixture requirement. 2016-09-14 16:23:47 +01:00
Andy Allan
f1713320c2 Remove diary_entry and diary_comment fixtures, and refactor tests. 
Note that you might need to empty the tables in your local test
database, since the removed fixtures may still linger there.
 2016-09-14 12:41:58 +01:00
Wille Marcel
e3357b27e6 Add banner for SotM Latam 2016 2016-09-13 14:49:40 +01:00
Niklas Laxström
03e615eab3 Localisation updates from https://translatewiki.net. 2016-09-13 08:12:49 +02:00
Tom Hughes
f02729fa9a Merge remote-tracking branch 'openstreetmap/pull/1279' 2016-09-08 19:26:07 +01:00
Tom Hughes
f3f1687fa3 Add thunderforest API key to example configuration 2016-09-08 18:20:21 +01:00
Tom Hughes
e0dd431e6c Propagate API keys to minimaps in layer switcher 2016-09-08 17:35:37 +01:00
Tom Hughes
322e7142ba Hide thunderforest layers when no API key is available 2016-09-08 17:28:54 +01:00
Tom Hughes
3eda7be919 Use an API key for thunderforest tile layers 2016-09-08 16:16:45 +01:00
Andy Allan
ea610c8c3c Refactor tests to use factories instead of fixtures 2016-09-08 11:44:24 +01:00
Andy Allan
4f5c8b7956 Change the display_name of suspended user fixuture 
The original name is reserved, which means the user was invalid,
and this causes problems when building objects using it via
associations.
 2016-09-08 11:40:03 +01:00
Andy Allan
04591aed9f Test DiaryComment body validation 
Replaces unnecessary test.
 2016-09-08 10:01:11 +01:00
Niklas Laxström
ef8eb034d0 Localisation updates from https://translatewiki.net. 2016-09-08 10:36:22 +02:00
Andy Allan
191f6b3fcd Build a diary entry more succinctly 2016-09-08 09:06:46 +01:00
Andy Allan
bb15077dcc Assert there are no diary comments before creating one. 2016-09-08 09:06:26 +01:00
Andy Allan
ab12b6161a Update name of test 2016-09-08 08:58:18 +01:00
Andy Allan
3b3f328ae4 Rework DiaryEntry and DiaryComment model tests to use factories. 
Since the database also contains fixtures from other tests, some
counts are dropped and instead tested for inclusion in the results.
 2016-09-07 16:27:21 +01:00
Andy Allan
d5013ad0d2 Add FactoryGirl 2016-09-07 15:28:28 +01:00
Andy Allan
5ec11d3571 Update offense counts in rubocop_todo.yml 2016-09-07 11:08:20 +01:00
Andy Allan
d63dba03ce Add xml builder files to rubocop. 2016-09-07 11:07:56 +01:00
Andy Allan
38e12759ea Rubocop autofixes. 2016-09-07 11:07:42 +01:00
Andy Allan
e6f06f0515 Add outer variable shadowing to rubocop_todo.yml 2016-09-07 11:06:27 +01:00
Andy Allan
6cc4f4506b Use .present? instead of double negative to check if terms_agreed timestamp is set. 2016-09-07 11:02:20 +01:00
Andy Allan
924f9fa083 User.consider_pd is boolean, so no need for double negation. 2016-09-07 10:59:00 +01:00
Tom Hughes
dbeccba968 Update schema 2016-09-05 08:17:11 +01:00
Niklas Laxström
958a7766ca Localisation updates from https://translatewiki.net. 2016-09-05 07:42:09 +02:00
Tom Hughes
9f817f8364 Set banner expiry correctly 2016-08-23 19:23:58 +01:00
Matt Amos
119016255e More cleanup after tests. 2016-08-22 19:05:11 +01:00
Matt Amos
82ac68a26e Revert changes to old migration. 2016-08-22 18:48:48 +01:00
Matt Amos
c3ad6aa292 More whitespace fixes. Attempting to get tests to pass. 2016-08-22 18:38:03 +01:00
Matt Amos
757a1aaa85 Made rubocop happy by formatting and minor syntax tweaks. 2016-08-22 17:24:10 +01:00
Matt Amos
5cc0eba3f1 Reordered migrations to make them the latest. 2016-08-22 16:32:54 +01:00