Commit graph

7309 commits

Author SHA1 Message Date
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
Niklas Laxström
2bae7cd298 Localisation updates from https://translatewiki.net. 2016-08-22 07:59:05 +02:00
Tom Hughes
d801aa28ea Fix date for Gravatar migration 2016-08-19 12:50:44 +01:00
Tom Hughes
b72bc8bf30 Improve code readability 2016-08-19 12:31:45 +01:00
Tom Hughes
f00b624ce4 Improve message when Gravater is disabled 2016-08-19 12:27:54 +01:00
Tom Hughes
d48b25124e Merge remote-tracking branch 'openstreetmap/pull/1036' 2016-08-19 12:26:51 +01:00
Simon Poole
c6fe828286 Fix rubocop warnings 2016-08-19 09:31:47 +02:00
Simon Poole
0837205d02 Merge message when Gravatar status has changed with email confirmation
Merge message when Gravatar status has changed with email confirmation and make messages more verbose and friendly.
2016-08-19 08:59:40 +02:00
Niklas Laxström
e43ccab724 Localisation updates from https://translatewiki.net. 2016-08-18 08:20:08 +02:00
Tom Hughes
31c81f108d Set all cookies on the root path 2016-08-17 10:04:57 +01:00
Tom Hughes
fb9afd32db Make banner cookies expire after one year
This avoids having lots of cookies stick around forever and
we shouldn't ever have a banner up for that long.
2016-08-17 10:02:50 +01:00
Tom Hughes
5ad17c1068 Merge remote-tracking branch 'openstreetmap/pull/1270' 2016-08-17 08:24:28 +01:00
Niklas Laxström
7b9284a299 Localisation updates from https://translatewiki.net. 2016-08-17 08:11:39 +02:00