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

6047 commits

Author SHA1 Message Date
Tom Hughes
a66c34991a Merge remote-tracking branch 'upstream/pull/2280' 2019-06-26 19:57:12 +01:00
Tom Hughes
89f8f7af35 Merge remote-tracking branch 'upstream/pull/2281' 2019-06-26 19:19:58 +01:00
Andy Allan
0dbb33016f Rename @edits variable to @changesets, for clarity 2019-06-26 17:07:49 +02:00
Andy Allan
2398614349 Add support for an unversioned 'versions' API call 
This will eventually replace the unversioned 'capabilities' call.
Client applications can use this versions call to find out what versions
are available, if they support multiple versions. The capabilities
of each version, and the format of the capabilities call, is then
able to change between versions. If a client only supports one version
they can jump straight to the versioned capabilities call.

Additionally, supported versions are now a list of version identifiers,
without any implications surrounding min/max values (e.g. guesswork
for supported intermediate versions).

Fixes #2162
 2019-06-26 16:52:10 +02:00
Tom Hughes
cbea796ef4 Merge remote-tracking branch 'upstream/pull/2207' 2019-06-26 14:30:30 +01:00
Tom Hughes
899fc66a62 Merge remote-tracking branch 'upstream/pull/2279' 2019-06-26 14:07:29 +01:00
Andy Allan
f77d4dc4f7 Avoid stating the action to render when it just matches the current action 2019-06-26 14:50:35 +02:00
Tom Hughes
f280dcb2d7 Merge remote-tracking branch 'upstream/pull/2278' 2019-06-26 13:36:44 +01:00
Andy Allan
0211141c08 Simplify render calls for changesets 2019-06-26 14:25:34 +02:00
Andy Allan
3914050fcc Simplify partial rendering when the partial is named after the model 2019-06-26 14:13:09 +02:00
Andy Allan
c24b0e9399 Rework to ensure views are named after the controller method name 2019-06-26 13:45:40 +02:00
Tom Hughes
16c3c53302 Merge remote-tracking branch 'upstream/pull/2271' 2019-06-26 11:22:19 +01:00
Tom Hughes
d2d5d48f29 Allow signups to be blocked by MX host 2019-06-23 11:21:03 +01:00
Tom Hughes
16cbc2eb79 Merge remote-tracking branch 'upstream/pull/2267' 2019-06-20 19:02:31 +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
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
Tom Hughes
31edc7dff6 Merge remote-tracking branch 'upstream/pull/2226' 2019-06-18 21:10:07 +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
Richard Fairhurst
946deebf4c
Add user_<uid> class to diary entry div 2019-06-17 14:02:52 +01: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
24b138db09 Merge remote-tracking branch 'upstream/pull/2228' 2019-06-12 19:16:32 +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
Tom Hughes
ee458b6ee2 Parse each GPX file in an archive separately 
Fixes #2253
 2019-06-11 12:57:00 +01: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
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