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

9382 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
16c3c53302 Merge remote-tracking branch 'upstream/pull/2271' 2019-06-26 11:22:19 +01:00
Tom Hughes
5b4636d521 Fix text direction for traditional chinese 2019-06-25 08:20:18 +01:00
Tom Hughes
1817032c87 Update bundle 2019-06-25 08:16:36 +01:00
translatewiki.net
4440730c9b Localisation updates from https://translatewiki.net. 2019-06-24 17:02:58 +02:00
Tom Hughes
d2d5d48f29 Allow signups to be blocked by MX host 2019-06-23 11:21:03 +01:00
Tom Hughes
fc67e63589 Block indexing of diary entries 2019-06-23 00:23:21 +01:00
Tom Hughes
dd281a19c4 Update Potlatch 2 to 2.5-83-g28c84372 build 2019-06-21 11:25:36 +01:00
translatewiki.net
81d6d6a6a3 Localisation updates from https://translatewiki.net. 2019-06-20 21:47:58 +02:00
Tom Hughes
16cbc2eb79 Merge remote-tracking branch 'upstream/pull/2267' 2019-06-20 19:02:31 +01:00
Tom Hughes
80427b3e5e Merge remote-tracking branch 'upstream/pull/2270' 2019-06-20 18:58:38 +01:00
Tom Hughes
6b6345ecdb Merge remote-tracking branch 'upstream/pull/2269' 2019-06-20 18:54:44 +01:00
Andy Allan
23dfc4d3bd Update note comments to use friendly_date_ago helper 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
220ad92766 Use friendly_date_ago for notes display 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
e5d8bd539f Use friendly_date_ago for user blocks 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
75bf96c4f3 Use friendly_date_ago helper for changeset comments 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
3167e6b4bb Use friendly_date_ago helper for chnagesets 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
5e06815214 Use friendly_date_ago helper for user_blocks 
Refs #2255

Removes two unused translations.
 2019-06-19 18:04:08 +02:00
Andy Allan
cd5e28406b Use friendy_date_ago helper for notes 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
f284d57c62 Add a friendly_date_ago helper 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
54e0c7afb2 Use distance_in_words_ago scope for user blocks 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
00f75c175e Use scope for common details and changeset display in browse pages 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
47e653ffe0 Use scope for time_ago when viewing users 
Refs #2255.

Also removes unused translation referencing ago, that was unneeded
after cbf71f04c2
 2019-06-19 18:04:08 +02:00
Andy Allan
50d469a74a Use distance_in_words_ago scope for issues display 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
df560bd71d Use the distance_in_words_ago scope for diary comments pages 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
1298d80549 Use the distance_in_words_ago scope for trace display 
Refs #2255
 2019-06-19 18:04:08 +02:00
Andy Allan
cbb3c2bdf0 Use user models, not ids, in assertions 2019-06-19 17:03:13 +02:00
Andy Allan
d33b1f6b29 Pass the models, not the ids, when dealing with friendships 2019-06-19 16:56:31 +02:00
Andy Allan
2169c503ef Rename user.friend_users to user.friends 
This is possible now since we've renamed Friend to Friendship
 2019-06-19 16:51:35 +02:00
Andy Allan
1cf8fec58d Rename Friend model to Friendship 
This better describes what the model represents, which is the relationship
between the two users.
 2019-06-19 16:39:25 +02:00
Andy Allan
74af87d9d1 Add translations for distance_in_time_ago 
This allows translators to accurately translate times when they
need to modify the distance_in_time beyond just adding 'ago'.

Refs #2255
 2019-06-19 10:42:09 +02:00
Tom Hughes
31edc7dff6 Merge remote-tracking branch 'upstream/pull/2226' 2019-06-18 21:10:07 +01:00
Tom Hughes
657ed03d8b Update bundle 2019-06-18 19:13:49 +01:00
Bryan Housel
7fb85f1ca6 Pass through photo_overlay parameter 
(re: https://github.com/openstreetmap/iD/issues/6492)
 2019-06-17 17:26:24 -04:00
Bryan Housel
7ee554ed64 Update to iD v2.15.2 2019-06-17 16:10:54 -04:00
translatewiki.net
42269d91fe Localisation updates from https://translatewiki.net. 2019-06-17 19:34:33 +02:00
Tom Hughes
7a91da329d Allow indexing of diary entries again 2019-06-16 00:54:30 +01:00
Tom Hughes
7f61fc22de Allow indexing of diary entries again 2019-06-16 00:53:38 +01:00
Tom Hughes
26cbdcf71a Fix importing of GPX traces with a leading byte order marker 
Fixes #2258
 2019-06-14 19:01:53 +01:00
translatewiki.net
399ade116a Localisation updates from https://translatewiki.net. 2019-06-13 20:22:51 +02:00
Tom Hughes
6b631f1e25 Merge remote-tracking branch 'upstream/pull/2209' 2019-06-12 19:56:59 +01:00
Tom Hughes
d9b8ebeb01 Merge remote-tracking branch 'upstream/pull/2257' 2019-06-12 19:50:52 +01:00
Tom Hughes
176b853174 Fix new eslint warnings 2019-06-12 19:27:58 +01:00
Tom Hughes
d67b057851 Replace eslint-rails-ee with direct calls to eslint 2019-06-12 19:27:58 +01:00
Tom Hughes
24b138db09 Merge remote-tracking branch 'upstream/pull/2228' 2019-06-12 19:16:32 +01:00
Tom Hughes
5708c25e04 Merge remote-tracking branch 'upstream/pull/2256' 2019-06-12 18:58:15 +01:00
Andy Allan
a08b65a6ac Use built-in form submit translation keys for traces 2019-06-12 19:24:06 +02:00
Andy Allan
1d09cfcb18 Use built-in form submit translation keys for oauth client applications 2019-06-12 19:24:06 +02:00
Andy Allan
085412f624 Use i18n for submit button for issue comments 
Normally when an en-GB.yml translation is missing, rails falls back to en.yml. But when
using the submit helpers, if the en-GB translation is missing, rails knows how to create
a fallback like 'Create {model_name}' without touching the en.yml file. This string might
then be different from what the test expects, e.g. 'Add Comment'.

So it's important to set the language headers, to avoid phantomjs from picking up your desktop
preferences in this specific case.
 2019-06-12 19:24:06 +02:00
Andy Allan
5450bade1a Use built-in form sumbit translation keys for diary comments 
Also use a diary comment object as the basis for the form
 2019-06-12 16:20:29 +02:00
Andy Allan
52782121a6 Use built-in form sumbit translation keys for messages 2019-06-12 16:11:54 +02:00