rails.git
23 months agoMerge remote-tracking branch 'upstream/pull/2223'
Tom Hughes [Sun, 7 Jul 2019 15:14:32 +0000 (16:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2223'

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 5 Jul 2019 05:26:34 +0000 (07:26 +0200)]
Localisation updates from https://translatewiki.net.

23 months agoUbuntu 18.04 is now required. Add apt-get update
Grant Slater [Wed, 3 Jul 2019 19:47:07 +0000 (20:47 +0100)]
Ubuntu 18.04 is now required. Add apt-get update

23 months agoInclude bundler in packages to install on Ubuntu
Tom Hughes [Wed, 3 Jul 2019 16:59:14 +0000 (17:59 +0100)]
Include bundler in packages to install on Ubuntu

23 months agoMore tweaks for RTL email
Tom Hughes [Wed, 3 Jul 2019 13:19:45 +0000 (14:19 +0100)]
More tweaks for RTL email

Fixes #2297

23 months agoFix styling of email notifications in RTL languages
Tom Hughes [Wed, 3 Jul 2019 08:49:46 +0000 (09:49 +0100)]
Fix styling of email notifications in RTL languages

Fixes #2297

23 months agoAdd missing space
Tom Hughes [Wed, 3 Jul 2019 07:28:22 +0000 (08:28 +0100)]
Add missing space

23 months agoRevert "Block indexing of diary entries"
Tom Hughes [Tue, 2 Jul 2019 18:42:51 +0000 (19:42 +0100)]
Revert "Block indexing of diary entries"

This reverts commit fc67e63589536b0d8fa3a92aa7eff57ebeceb3a6.

23 months agoFix text direction for traditional chinese
Tom Hughes [Tue, 25 Jun 2019 07:20:18 +0000 (08:20 +0100)]
Fix text direction for traditional chinese

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Jul 2019 07:43:51 +0000 (09:43 +0200)]
Localisation updates from https://translatewiki.net.

23 months agoMerge remote-tracking branch 'upstream/pull/2294'
Tom Hughes [Sun, 30 Jun 2019 14:27:25 +0000 (15:27 +0100)]
Merge remote-tracking branch 'upstream/pull/2294'

23 months agoUpdate to iD v2.15.3
Bryan Housel [Sun, 30 Jun 2019 14:15:38 +0000 (10:15 -0400)]
Update to iD v2.15.3

23 months agoMerge remote-tracking branch 'upstream/pull/2293'
Tom Hughes [Sun, 30 Jun 2019 10:57:56 +0000 (11:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2293'

23 months agoFix spellings from aggree to agree
Abijeet Patro [Sun, 30 Jun 2019 10:44:38 +0000 (16:14 +0530)]
Fix spellings from aggree to agree

As reported on https://translatewiki.net/wiki/Thread:Support/Found_typo_in_https://translatewiki.net/w/i.php%3Ftitle%3DOsm:Users.terms.tou_explain_html/en

23 months agoUpdate list of dependencies to install
Tom Hughes [Sat, 29 Jun 2019 23:25:21 +0000 (00:25 +0100)]
Update list of dependencies to install

23 months agoRubocop
mmd-osm [Fri, 28 Jun 2019 20:05:38 +0000 (22:05 +0200)]
Rubocop

23 months agoReplace respond_to with render xml format
mmd-osm [Fri, 28 Jun 2019 19:56:42 +0000 (21:56 +0200)]
Replace respond_to with render xml format

23 months agoRevert XML default for routes
mmd-osm [Fri, 28 Jun 2019 19:35:02 +0000 (21:35 +0200)]
Revert XML default for routes

23 months agoFix text direction for traditional chinese
Tom Hughes [Tue, 25 Jun 2019 07:20:18 +0000 (08:20 +0100)]
Fix text direction for traditional chinese

23 months agoMerge branch 'master' into patch/view_migration
mmd [Thu, 27 Jun 2019 20:40:51 +0000 (22:40 +0200)]
Merge branch 'master' into patch/view_migration

23 months agoRefactoring
mmd-osm [Thu, 27 Jun 2019 20:23:38 +0000 (22:23 +0200)]
Refactoring

23 months agoRemove non functioning changeset_cache, user_display_name_cache
mmd-osm [Thu, 27 Jun 2019 19:26:11 +0000 (21:26 +0200)]
Remove non functioning changeset_cache, user_display_name_cache

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Jun 2019 16:37:17 +0000 (18:37 +0200)]
Localisation updates from https://translatewiki.net.

23 months agoAvoid unnecessary arrays
mmd-osm [Thu, 27 Jun 2019 16:33:12 +0000 (18:33 +0200)]
Avoid unnecessary arrays

23 months agoSimplify partial rendering
mmd-osm [Wed, 26 Jun 2019 20:29:18 +0000 (22:29 +0200)]
Simplify partial rendering

23 months agoAvoid using @variables in partials
mmd-osm [Wed, 26 Jun 2019 19:34:40 +0000 (21:34 +0200)]
Avoid using @variables in partials

23 months agoMerge remote-tracking branch 'upstream/pull/2280'
Tom Hughes [Wed, 26 Jun 2019 18:57:12 +0000 (19:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2280'

23 months agoMerge remote-tracking branch 'upstream/pull/2282'
Tom Hughes [Wed, 26 Jun 2019 18:23:18 +0000 (19:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2282'

23 months agoMerge remote-tracking branch 'upstream/pull/2281'
Tom Hughes [Wed, 26 Jun 2019 18:19:58 +0000 (19:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2281'

23 months agoSplit some extremely long strings over multiple lines using squiggly heredocs
Andy Allan [Wed, 26 Jun 2019 16:24:57 +0000 (18:24 +0200)]
Split some extremely long strings over multiple lines using squiggly heredocs

I'm not entirely convinced that testing walls of text like this is useful
anyway, but at least this approach makes the lines significantly less long.

23 months agoRename @edits variable to @changesets, for clarity
Andy Allan [Wed, 26 Jun 2019 15:07:49 +0000 (17:07 +0200)]
Rename @edits variable to @changesets, for clarity

23 months agoAdd support for an unversioned 'versions' API call
Andy Allan [Wed, 26 Jun 2019 14:38:20 +0000 (16:38 +0200)]
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

23 months agoMerge remote-tracking branch 'upstream/pull/2207'
Tom Hughes [Wed, 26 Jun 2019 13:30:30 +0000 (14:30 +0100)]
Merge remote-tracking branch 'upstream/pull/2207'

23 months agoMerge remote-tracking branch 'upstream/pull/2279'
Tom Hughes [Wed, 26 Jun 2019 13:07:29 +0000 (14:07 +0100)]
Merge remote-tracking branch 'upstream/pull/2279'

23 months agoAvoid stating the action to render when it just matches the current action
Andy Allan [Wed, 26 Jun 2019 12:50:35 +0000 (14:50 +0200)]
Avoid stating the action to render when it just matches the current action

23 months agoMerge remote-tracking branch 'upstream/pull/2278'
Tom Hughes [Wed, 26 Jun 2019 12:36:44 +0000 (13:36 +0100)]
Merge remote-tracking branch 'upstream/pull/2278'

23 months agoSimplify render calls for changesets
Andy Allan [Wed, 26 Jun 2019 12:25:34 +0000 (14:25 +0200)]
Simplify render calls for changesets

23 months agoSimplify partial rendering when the partial is named after the model
Andy Allan [Wed, 26 Jun 2019 12:13:09 +0000 (14:13 +0200)]
Simplify partial rendering when the partial is named after the model

23 months agoRework to ensure views are named after the controller method name
Andy Allan [Wed, 26 Jun 2019 10:52:21 +0000 (12:52 +0200)]
Rework to ensure views are named after the controller method name

23 months agoMerge remote-tracking branch 'upstream/pull/2271'
Tom Hughes [Wed, 26 Jun 2019 10:22:19 +0000 (11:22 +0100)]
Merge remote-tracking branch 'upstream/pull/2271'

23 months agoFix text direction for traditional chinese
Tom Hughes [Tue, 25 Jun 2019 07:20:18 +0000 (08:20 +0100)]
Fix text direction for traditional chinese

23 months agoUpdate bundle
Tom Hughes [Tue, 25 Jun 2019 07:16:28 +0000 (08:16 +0100)]
Update bundle

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Jun 2019 15:02:58 +0000 (17:02 +0200)]
Localisation updates from https://translatewiki.net.

23 months agoAllow signups to be blocked by MX host
Tom Hughes [Sun, 23 Jun 2019 10:21:03 +0000 (11:21 +0100)]
Allow signups to be blocked by MX host

23 months agoBlock indexing of diary entries
Tom Hughes [Sat, 22 Jun 2019 23:22:46 +0000 (00:22 +0100)]
Block indexing of diary entries

23 months agoUpdate Potlatch 2 to 2.5-83-g28c84372 build
Tom Hughes [Fri, 21 Jun 2019 10:23:38 +0000 (11:23 +0100)]
Update Potlatch 2 to 2.5-83-g28c84372 build

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Jun 2019 19:47:58 +0000 (21:47 +0200)]
Localisation updates from https://translatewiki.net.

23 months agoMerge remote-tracking branch 'upstream/pull/2267'
Tom Hughes [Thu, 20 Jun 2019 18:02:31 +0000 (19:02 +0100)]
Merge remote-tracking branch 'upstream/pull/2267'

23 months agoMerge remote-tracking branch 'upstream/pull/2270'
Tom Hughes [Thu, 20 Jun 2019 17:58:38 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/2270'

23 months agoMerge remote-tracking branch 'upstream/pull/2269'
Tom Hughes [Thu, 20 Jun 2019 17:54:44 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2269'

23 months agoUpdate note comments to use friendly_date_ago helper
Andy Allan [Wed, 19 Jun 2019 10:16:04 +0000 (12:16 +0200)]
Update note comments to use friendly_date_ago helper

Refs #2255

23 months agoUse friendly_date_ago for notes display
Andy Allan [Wed, 19 Jun 2019 10:11:47 +0000 (12:11 +0200)]
Use friendly_date_ago for notes display

Refs #2255

23 months agoUse friendly_date_ago for user blocks
Andy Allan [Wed, 19 Jun 2019 10:09:46 +0000 (12:09 +0200)]
Use friendly_date_ago for user blocks

Refs #2255

23 months agoUse friendly_date_ago helper for changeset comments
Andy Allan [Wed, 19 Jun 2019 10:06:13 +0000 (12:06 +0200)]
Use friendly_date_ago helper for changeset comments

Refs #2255

23 months agoUse friendly_date_ago helper for chnagesets
Andy Allan [Wed, 19 Jun 2019 10:05:47 +0000 (12:05 +0200)]
Use friendly_date_ago helper for chnagesets

Refs #2255

23 months agoUse friendly_date_ago helper for user_blocks
Andy Allan [Wed, 19 Jun 2019 10:01:39 +0000 (12:01 +0200)]
Use friendly_date_ago helper for user_blocks

Refs #2255

Removes two unused translations.

23 months agoUse friendy_date_ago helper for notes
Andy Allan [Wed, 19 Jun 2019 10:00:58 +0000 (12:00 +0200)]
Use friendy_date_ago helper for notes

Refs #2255

23 months agoAdd a friendly_date_ago helper
Andy Allan [Wed, 19 Jun 2019 09:59:37 +0000 (11:59 +0200)]
Add a friendly_date_ago helper

Refs #2255

23 months agoUse distance_in_words_ago scope for user blocks
Andy Allan [Wed, 19 Jun 2019 09:44:29 +0000 (11:44 +0200)]
Use distance_in_words_ago scope for user blocks

Refs #2255

23 months agoUse scope for common details and changeset display in browse pages
Andy Allan [Wed, 19 Jun 2019 09:36:09 +0000 (11:36 +0200)]
Use scope for common details and changeset display in browse pages

Refs #2255

23 months agoUse scope for time_ago when viewing users
Andy Allan [Wed, 19 Jun 2019 09:34:29 +0000 (11:34 +0200)]
Use scope for time_ago when viewing users

Refs #2255.

Also removes unused translation referencing ago, that was unneeded
after cbf71f04c244440f82d86e12758a2e443f68c0f8

23 months agoUse distance_in_words_ago scope for issues display
Andy Allan [Wed, 19 Jun 2019 09:27:37 +0000 (11:27 +0200)]
Use distance_in_words_ago scope for issues display

Refs #2255

23 months agoUse the distance_in_words_ago scope for diary comments pages
Andy Allan [Wed, 19 Jun 2019 09:25:31 +0000 (11:25 +0200)]
Use the distance_in_words_ago scope for diary comments pages

Refs #2255

23 months agoUse the distance_in_words_ago scope for trace display
Andy Allan [Wed, 19 Jun 2019 09:23:43 +0000 (11:23 +0200)]
Use the distance_in_words_ago scope for trace display

Refs #2255

23 months agoUse user models, not ids, in assertions
Andy Allan [Wed, 19 Jun 2019 15:03:13 +0000 (17:03 +0200)]
Use user models, not ids, in assertions

23 months agoPass the models, not the ids, when dealing with friendships
Andy Allan [Wed, 19 Jun 2019 14:56:31 +0000 (16:56 +0200)]
Pass the models, not the ids, when dealing with friendships

23 months agoRename user.friend_users to user.friends
Andy Allan [Wed, 19 Jun 2019 14:51:35 +0000 (16:51 +0200)]
Rename user.friend_users to user.friends

This is possible now since we've renamed Friend to Friendship

23 months agoRename Friend model to Friendship
Andy Allan [Wed, 19 Jun 2019 14:39:25 +0000 (16:39 +0200)]
Rename Friend model to Friendship

This better describes what the model represents, which is the relationship
between the two users.

23 months agoAdd translations for distance_in_time_ago
Andy Allan [Wed, 19 Jun 2019 08:42:09 +0000 (10:42 +0200)]
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

23 months agoMerge remote-tracking branch 'upstream/pull/2226'
Tom Hughes [Tue, 18 Jun 2019 20:10:07 +0000 (21:10 +0100)]
Merge remote-tracking branch 'upstream/pull/2226'

23 months agoUpdate bundle
Tom Hughes [Tue, 18 Jun 2019 18:13:49 +0000 (19:13 +0100)]
Update bundle

2 years agoPass through `photo_overlay` parameter
Bryan Housel [Mon, 17 Jun 2019 21:26:24 +0000 (17:26 -0400)]
Pass through `photo_overlay` parameter
(re: https://github.com/openstreetmap/iD/issues/6492)

2 years agoUpdate to iD v2.15.2
Bryan Housel [Mon, 17 Jun 2019 20:10:54 +0000 (16:10 -0400)]
Update to iD v2.15.2

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Jun 2019 17:34:33 +0000 (19:34 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoAllow indexing of diary entries again
Tom Hughes [Sat, 15 Jun 2019 23:54:30 +0000 (00:54 +0100)]
Allow indexing of diary entries again

2 years agoAllow indexing of diary entries again
Tom Hughes [Sat, 15 Jun 2019 23:53:38 +0000 (00:53 +0100)]
Allow indexing of diary entries again

2 years agoFix importing of GPX traces with a leading byte order marker
Tom Hughes [Fri, 14 Jun 2019 17:49:04 +0000 (18:49 +0100)]
Fix importing of GPX traces with a leading byte order marker

Fixes #2258

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Jun 2019 18:22:51 +0000 (20:22 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/2209'
Tom Hughes [Wed, 12 Jun 2019 18:56:59 +0000 (19:56 +0100)]
Merge remote-tracking branch 'upstream/pull/2209'

2 years agoMerge remote-tracking branch 'upstream/pull/2257'
Tom Hughes [Wed, 12 Jun 2019 18:50:52 +0000 (19:50 +0100)]
Merge remote-tracking branch 'upstream/pull/2257'

2 years agoFix new eslint warnings
Tom Hughes [Sun, 14 Apr 2019 18:39:40 +0000 (19:39 +0100)]
Fix new eslint warnings

2 years agoReplace eslint-rails-ee with direct calls to eslint
Tom Hughes [Sun, 7 Apr 2019 23:00:57 +0000 (00:00 +0100)]
Replace eslint-rails-ee with direct calls to eslint

2 years agoMerge remote-tracking branch 'upstream/pull/2228'
Tom Hughes [Wed, 12 Jun 2019 18:16:32 +0000 (19:16 +0100)]
Merge remote-tracking branch 'upstream/pull/2228'

2 years agoMerge remote-tracking branch 'upstream/pull/2256'
Tom Hughes [Wed, 12 Jun 2019 17:58:15 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/2256'

2 years agoUse built-in form submit translation keys for traces
Andy Allan [Wed, 12 Jun 2019 14:36:13 +0000 (16:36 +0200)]
Use built-in form submit translation keys for traces

2 years agoUse built-in form submit translation keys for oauth client applications
Andy Allan [Wed, 12 Jun 2019 14:32:52 +0000 (16:32 +0200)]
Use built-in form submit translation keys for oauth client applications

2 years agoUse i18n for submit button for issue comments
Andy Allan [Wed, 12 Jun 2019 14:25:19 +0000 (16:25 +0200)]
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.

2 years agoUse built-in form sumbit translation keys for diary comments
Andy Allan [Wed, 12 Jun 2019 14:20:29 +0000 (16:20 +0200)]
Use built-in form sumbit translation keys for diary comments

Also use a diary comment object as the basis for the form

2 years agoUse built-in form sumbit translation keys for messages
Andy Allan [Wed, 12 Jun 2019 14:11:54 +0000 (16:11 +0200)]
Use built-in form sumbit translation keys for messages

2 years agoUse built-in form sumbit translation keys for redactions
Andy Allan [Wed, 12 Jun 2019 14:08:20 +0000 (16:08 +0200)]
Use built-in form sumbit translation keys for redactions

2 years agoUse built-in form sumbit translation keys for user blocks
Andy Allan [Wed, 12 Jun 2019 14:07:18 +0000 (16:07 +0200)]
Use built-in form sumbit translation keys for user blocks

2 years agoAdd a note about avoiding commits to other locale files
Andy Allan [Wed, 12 Jun 2019 13:03:24 +0000 (15:03 +0200)]
Add a note about avoiding commits to other locale files

2 years agoRound up the frame size for trace animations
Tom Hughes [Tue, 11 Jun 2019 21:33:07 +0000 (22:33 +0100)]
Round up the frame size for trace animations

2 years agoInclude first frame twice in trace animations
Tom Hughes [Tue, 11 Jun 2019 19:36:53 +0000 (20:36 +0100)]
Include first frame twice in trace animations

2 years agoTest import of various trace formats
Tom Hughes [Tue, 11 Jun 2019 18:52:51 +0000 (19:52 +0100)]
Test import of various trace formats

Fixes #2254

2 years agoFix rubocop warning
Tom Hughes [Tue, 11 Jun 2019 12:20:00 +0000 (13:20 +0100)]
Fix rubocop warning

2 years agoInstall libarchive-dev for travis
Tom Hughes [Tue, 11 Jun 2019 12:10:24 +0000 (13:10 +0100)]
Install libarchive-dev for travis

2 years agoParse each GPX file in an archive separately
Tom Hughes [Tue, 11 Jun 2019 11:57:00 +0000 (12:57 +0100)]
Parse each GPX file in an archive separately

Fixes #2253

2 years agoMerge remote-tracking branch 'upstream/pull/2204'
Tom Hughes [Mon, 10 Jun 2019 20:29:38 +0000 (21:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2204'

2 years agoUpdate to released version 0.4.0 of gd2-ffij
Tom Hughes [Mon, 10 Jun 2019 20:27:19 +0000 (21:27 +0100)]
Update to released version 0.4.0 of gd2-ffij