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

9462 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andy Allan
cf0b6403aa Use built-in form sumbit translation keys for redactions 2019-06-12 16:08:20 +02:00
Andy Allan
97ff32f528 Use built-in form sumbit translation keys for user blocks 2019-06-12 16:07:18 +02:00
Andy Allan
ff61da4e5f Add a note about avoiding commits to other locale files 2019-06-12 15:03:24 +02:00
Tom Hughes
46e3d84674 Round up the frame size for trace animations 2019-06-11 22:33:07 +01:00
Tom Hughes
bc70a475eb Include first frame twice in trace animations 2019-06-11 20:36:53 +01:00
Tom Hughes
b5d903c603 Test import of various trace formats 
Fixes #2254
 2019-06-11 19:52:51 +01:00
Tom Hughes
98caf18dc3 Fix rubocop warning 2019-06-11 13:20:00 +01:00
Tom Hughes
189f579b1f Install libarchive-dev for travis 2019-06-11 13:10:24 +01:00
Tom Hughes
ee458b6ee2 Parse each GPX file in an archive separately 
Fixes #2253
 2019-06-11 12:57:00 +01:00
Tom Hughes
6db326aa1f Merge remote-tracking branch 'upstream/pull/2204' 2019-06-10 21:29:38 +01:00
Tom Hughes
c17cd3a279 Update to released version 0.4.0 of gd2-ffij 2019-06-10 21:27:19 +01:00
translatewiki.net
35e0f58683 Localisation updates from https://translatewiki.net. 2019-06-10 20:39:47 +02:00
Tom Hughes
63186dc161 Fix erblint warnings 2019-06-06 18:20:21 +01:00
Tom Hughes
8e85d0cfd1 Make hidden diary entries and comments more visible 2019-06-06 17:51:58 +01:00
Tom Hughes
6499b2603d Merge remote-tracking branch 'upstream/pull/2248' 2019-06-06 17:51:51 +01:00
translatewiki.net
3478aa8c1e Localisation updates from https://translatewiki.net. 2019-06-06 18:13:35 +02:00
Andy Allan
9e158a5d39 Show all diary comments to administrators 2019-06-06 16:03:42 +02:00
Andy Allan
fdffd22cca Allow admins to unhide diary comments, if they wish 2019-06-06 16:03:42 +02:00
Andy Allan
49fc17c6b6 Show deleted diary entries to administrators, if the user isn't also deleted 
This will allow administrators to review diary entry deletions from non-spam users.
 2019-06-06 15:59:47 +02:00
Andy Allan
f2f3fbb1f1 Allow administrators to unhide diary entries, if they wish 2019-06-06 15:59:47 +02:00
Tom Hughes
cf7c8a0cd0 Merge remote-tracking branch 'upstream/pull/2249' 2019-06-05 17:19:57 +01:00
Tom Hughes
a8d0a64b2a Merge remote-tracking branch 'upstream/pull/2250' 2019-06-05 17:18:55 +01:00