rails.git
18 months agoMerge remote-tracking branch 'upstream/pull/1858'
Tom Hughes [Mon, 14 May 2018 19:14:56 +0000 (20:14 +0100)]
Merge remote-tracking branch 'upstream/pull/1858'

18 months agoMerge remote-tracking branch 'upstream/pull/1857'
Tom Hughes [Mon, 14 May 2018 19:13:41 +0000 (20:13 +0100)]
Merge remote-tracking branch 'upstream/pull/1857'

18 months agoQuote translations to stop them looking like numbers
Tom Hughes [Mon, 7 May 2018 14:21:50 +0000 (15:21 +0100)]
Quote translations to stop them looking like numbers

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 May 2018 06:24:58 +0000 (08:24 +0200)]
Localisation updates from https://translatewiki.net.

18 months agoMake CSP rule for the remote control explicitly allow http
Tom Hughes [Sun, 13 May 2018 15:01:39 +0000 (16:01 +0100)]
Make CSP rule for the remote control explicitly allow http

18 months agoMerge remote-tracking branch 'upstream/pull/1851'
Tom Hughes [Sun, 13 May 2018 14:24:44 +0000 (15:24 +0100)]
Merge remote-tracking branch 'upstream/pull/1851'

18 months agoMerge remote-tracking branch 'upstream/pull/1850'
Tom Hughes [Sun, 13 May 2018 14:23:54 +0000 (15:23 +0100)]
Merge remote-tracking branch 'upstream/pull/1850'

18 months agoQuote translations to stop them looking like numbers
Tom Hughes [Mon, 7 May 2018 14:21:50 +0000 (15:21 +0100)]
Quote translations to stop them looking like numbers

18 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 10 May 2018 08:28:45 +0000 (10:28 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoRename message_controller to messages_controller
Andy Allan [Wed, 9 May 2018 08:38:37 +0000 (16:38 +0800)]
Rename message_controller to messages_controller

19 months agoLazy lookups for translations in message_controller.rb
Andy Allan [Wed, 9 May 2018 08:25:42 +0000 (16:25 +0800)]
Lazy lookups for translations in message_controller.rb

19 months agoRename trace_controller to traces_controller
Andy Allan [Wed, 9 May 2018 04:38:09 +0000 (12:38 +0800)]
Rename trace_controller to traces_controller

19 months agoMore lazy translation lookups for traces
Andy Allan [Wed, 9 May 2018 04:08:39 +0000 (12:08 +0800)]
More lazy translation lookups for traces

19 months agoUse named paths for messages
Andy Allan [Wed, 9 May 2018 03:24:11 +0000 (11:24 +0800)]
Use named paths for messages

19 months agoQuote translations to stop them looking like numbers
Tom Hughes [Mon, 7 May 2018 14:21:50 +0000 (15:21 +0100)]
Quote translations to stop them looking like numbers

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 May 2018 06:07:53 +0000 (08:07 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 May 2018 07:34:57 +0000 (09:34 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoFix translation lookups for roundabout exits
Tom Hughes [Mon, 30 Apr 2018 22:01:08 +0000 (23:01 +0100)]
Fix translation lookups for roundabout exits

19 months agoAvoid using "one" and "two" as translation keys
Tom Hughes [Mon, 30 Apr 2018 21:38:43 +0000 (22:38 +0100)]
Avoid using "one" and "two" as translation keys

19 months agoMerge remote-tracking branch 'upstream/pull/1802'
Tom Hughes [Mon, 30 Apr 2018 17:56:09 +0000 (18:56 +0100)]
Merge remote-tracking branch 'upstream/pull/1802'

19 months agoAdd terminating semicolon to overpass query
Tom Hughes [Mon, 30 Apr 2018 17:53:52 +0000 (18:53 +0100)]
Add terminating semicolon to overpass query

Fixes #1843

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 30 Apr 2018 06:31:00 +0000 (08:31 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoSeparated ordinal roundabout exit text from normal exit text
J Guthrie [Sun, 29 Apr 2018 20:59:54 +0000 (21:59 +0100)]
Separated ordinal roundabout exit text from normal exit text

19 months agoMerge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetm...
J Guthrie [Sun, 29 Apr 2018 20:44:26 +0000 (21:44 +0100)]
Merge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetmap-website into convert_roundabout_exits

19 months agoChange roundabout exit logic and remove blank string from locale file
J Guthrie [Sun, 29 Apr 2018 19:30:44 +0000 (20:30 +0100)]
Change roundabout exit logic and remove blank string from locale file

19 months agoMerge branch 'master' into convert_roundabout_exits
Jamie Guthrie [Sun, 29 Apr 2018 18:53:57 +0000 (19:53 +0100)]
Merge branch 'master' into convert_roundabout_exits

19 months agoMerge remote-tracking branch 'upstream/pull/1809'
Tom Hughes [Sun, 29 Apr 2018 18:37:50 +0000 (19:37 +0100)]
Merge remote-tracking branch 'upstream/pull/1809'

19 months agoUpdate translation keys for renaming of note to notes
Tom Hughes [Sun, 29 Apr 2018 00:09:38 +0000 (01:09 +0100)]
Update translation keys for renaming of note to notes

19 months agoFix syntax error with ruby 2.5
Tom Hughes [Sat, 28 Apr 2018 16:12:27 +0000 (17:12 +0100)]
Fix syntax error with ruby 2.5

19 months agoUpdate xid_to_int4 to use postgres version 1 calling convention
Tom Hughes [Sat, 28 Apr 2018 14:15:53 +0000 (15:15 +0100)]
Update xid_to_int4 to use postgres version 1 calling convention

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Apr 2018 06:05:31 +0000 (08:05 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoRemoved directions from roundabout exit instructions
J Guthrie [Wed, 25 Apr 2018 23:51:35 +0000 (00:51 +0100)]
Removed directions from roundabout exit instructions

19 months agoAdded exit counts as seperate keys in locale file
J Guthrie [Wed, 25 Apr 2018 23:35:41 +0000 (00:35 +0100)]
Added exit counts as seperate keys in locale file

19 months agoUse rails helpers to construct URLs
Rajdeep Mandrekar [Wed, 25 Apr 2018 19:38:41 +0000 (01:08 +0530)]
Use rails helpers to construct URLs

Fixes #1817
Closes #1840

19 months agoMerge remote-tracking branch 'upstream/pull/1833'
Tom Hughes [Wed, 25 Apr 2018 16:44:53 +0000 (17:44 +0100)]
Merge remote-tracking branch 'upstream/pull/1833'

19 months agoMerge remote-tracking branch 'upstream/pull/1839'
Tom Hughes [Wed, 25 Apr 2018 16:39:27 +0000 (17:39 +0100)]
Merge remote-tracking branch 'upstream/pull/1839'

19 months agoMerge remote-tracking branch 'upstream/pull/1838'
Tom Hughes [Wed, 25 Apr 2018 16:38:35 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1838'

19 months agoMerge remote-tracking branch 'upstream/pull/1837'
Tom Hughes [Wed, 25 Apr 2018 16:38:19 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1837'

19 months agoMerge remote-tracking branch 'upstream/pull/1836'
Tom Hughes [Wed, 25 Apr 2018 16:37:55 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/1836'

19 months agoMerge remote-tracking branch 'upstream/pull/1835'
Tom Hughes [Wed, 25 Apr 2018 16:37:34 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/1835'

19 months agoMerge remote-tracking branch 'upstream/pull/1834'
Tom Hughes [Wed, 25 Apr 2018 16:37:31 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/1834'

19 months agoLazy translation lookups and key renames for help page.
Andy Allan [Wed, 25 Apr 2018 08:48:52 +0000 (16:48 +0800)]
Lazy translation lookups and key renames for help page.

19 months agoLazy translation lookup and key renames for fixthemap page.
Andy Allan [Wed, 25 Apr 2018 08:46:05 +0000 (16:46 +0800)]
Lazy translation lookup and key renames for fixthemap page.

19 months agoUse lazy lookups and rename translation keys for export
Andy Allan [Wed, 25 Apr 2018 08:40:22 +0000 (16:40 +0800)]
Use lazy lookups and rename translation keys for export

19 months agoUse lazy lookups and rename keys for the copyright page
Andy Allan [Wed, 25 Apr 2018 08:33:10 +0000 (16:33 +0800)]
Use lazy lookups and rename keys for the copyright page

19 months agoUse lazy lookups and rename keys for the welcome page.
Andy Allan [Wed, 25 Apr 2018 08:20:17 +0000 (16:20 +0800)]
Use lazy lookups and rename keys for the welcome page.

19 months agoUse lazy lookups and rename keys for the about page.
Andy Allan [Wed, 25 Apr 2018 08:19:46 +0000 (16:19 +0800)]
Use lazy lookups and rename keys for the about page.

19 months agoUse lazy lookups for site translations
Andy Allan [Wed, 25 Apr 2018 08:04:34 +0000 (16:04 +0800)]
Use lazy lookups for site translations

19 months agoRemove empty and unused view template
Andy Allan [Wed, 25 Apr 2018 07:51:48 +0000 (15:51 +0800)]
Remove empty and unused view template

19 months agoUse lazy translation lookups for the oauth controller.
Andy Allan [Wed, 25 Apr 2018 07:42:34 +0000 (15:42 +0800)]
Use lazy translation lookups for the oauth controller.

19 months agoRename note to notes in i18n lookups
Andy Allan [Wed, 25 Apr 2018 06:56:20 +0000 (14:56 +0800)]
Rename note to notes in i18n lookups

Enables lazy translation lookups for most cases. Additionally, rename
keys for notes.description.* to notes.comment.* to match partial
name.

19 months agoUse lazy translation lookups for redactions
Andy Allan [Wed, 25 Apr 2018 06:39:37 +0000 (14:39 +0800)]
Use lazy translation lookups for redactions

Requires renaming the translation keys

19 months agoUse lazy translations where possible
Andy Allan [Wed, 25 Apr 2018 06:10:59 +0000 (14:10 +0800)]
Use lazy translations where possible

19 months agoUse lazy lookups for user_blocks translations
Andy Allan [Wed, 25 Apr 2018 03:20:50 +0000 (11:20 +0800)]
Use lazy lookups for user_blocks translations

19 months agoUpdate to iD v2.8.1
Bryan Housel [Tue, 24 Apr 2018 14:26:53 +0000 (10:26 -0400)]
Update to iD v2.8.1

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Apr 2018 07:02:42 +0000 (09:02 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoMention error message in OAuth setup for iD
Matt Amos [Thu, 19 Apr 2018 11:24:02 +0000 (12:24 +0100)]
Mention error message in OAuth setup for iD

Closes #1830

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Apr 2018 07:31:16 +0000 (09:31 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoMerge remote-tracking branch 'upstream/pull/1827'
Tom Hughes [Wed, 18 Apr 2018 19:21:52 +0000 (20:21 +0100)]
Merge remote-tracking branch 'upstream/pull/1827'

19 months agoMerge remote-tracking branch 'upstream/pull/1826'
Tom Hughes [Wed, 18 Apr 2018 17:38:50 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1826'

19 months agoImprove formatting
Tom Hughes [Wed, 18 Apr 2018 17:37:18 +0000 (18:37 +0100)]
Improve formatting

19 months agoMerge remote-tracking branch 'upstream/pull/1824'
Tom Hughes [Wed, 18 Apr 2018 17:36:22 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/1824'

19 months agoUse lazy translation lookups for the user_blocks partials.
Andy Allan [Wed, 18 Apr 2018 06:20:41 +0000 (14:20 +0800)]
Use lazy translation lookups for the user_blocks partials.

19 months agoPluralise user_preferences_controller
Andy Allan [Wed, 18 Apr 2018 03:22:37 +0000 (11:22 +0800)]
Pluralise user_preferences_controller

This is the rails convention for controllers and can make route
generation easier.

http://guides.rubyonrails.org/action_controller_overview.html#controller-naming-convention

19 months agoMove the default_url_options config to the action_mailer initializer
Andy Allan [Wed, 18 Apr 2018 02:29:59 +0000 (10:29 +0800)]
Move the default_url_options config to the action_mailer initializer

We can't use Rails.application.config here because the initializers
run after ActionMailer::Base has been set up.

19 months agoFix for empty array when querying for local community geometries
Bryan Housel [Mon, 16 Apr 2018 19:49:14 +0000 (15:49 -0400)]
Fix for empty array when querying for local community geometries

19 months agoAllow changeset source tag to be settable via url api
Bryan Housel [Mon, 16 Apr 2018 18:49:12 +0000 (14:49 -0400)]
Allow changeset source tag to be settable via url api
(see https://github.com/openstreetmap/iD/issues/4899)

19 months agoUpdate to iD v2.8.0
Bryan Housel [Mon, 16 Apr 2018 18:43:49 +0000 (14:43 -0400)]
Update to iD v2.8.0

19 months agoAllow trusted addresses for better_errors to be set in the environment
Tom Hughes [Sun, 15 Apr 2018 21:22:43 +0000 (22:22 +0100)]
Allow trusted addresses for better_errors to be set in the environment

19 months agoMerge remote-tracking branch 'upstream/pull/1815'
Tom Hughes [Sun, 15 Apr 2018 20:26:38 +0000 (21:26 +0100)]
Merge remote-tracking branch 'upstream/pull/1815'

19 months agoMerge remote-tracking branch 'upstream/pull/1820'
Tom Hughes [Sun, 15 Apr 2018 18:57:37 +0000 (19:57 +0100)]
Merge remote-tracking branch 'upstream/pull/1820'

19 months agoMerge remote-tracking branch 'upstream/pull/1816'
Tom Hughes [Sun, 15 Apr 2018 18:55:03 +0000 (19:55 +0100)]
Merge remote-tracking branch 'upstream/pull/1816'

19 months agoMerge remote-tracking branch 'upstream/pull/1814'
Tom Hughes [Sun, 15 Apr 2018 18:52:31 +0000 (19:52 +0100)]
Merge remote-tracking branch 'upstream/pull/1814'

19 months agoRemove error class when right-click-selecting destination
J Guthrie [Sun, 15 Apr 2018 17:05:25 +0000 (18:05 +0100)]
Remove error class when right-click-selecting destination

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Apr 2018 17:26:02 +0000 (19:26 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Apr 2018 13:33:08 +0000 (15:33 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Apr 2018 07:24:37 +0000 (09:24 +0200)]
Localisation updates from https://translatewiki.net.

19 months agoAlter class to avoid conflict with model test class
Andy Allan [Wed, 11 Apr 2018 08:05:13 +0000 (16:05 +0800)]
Alter class to avoid conflict with model test class

19 months agoSet default_url_options for action_mailer
Andy Allan [Wed, 11 Apr 2018 07:53:30 +0000 (15:53 +0800)]
Set default_url_options for action_mailer

This saves having to repeat the same host and protocol options
throughout the notifiers

19 months agoAdd better_errors gem for easier debugging
Andy Allan [Wed, 11 Apr 2018 06:07:38 +0000 (14:07 +0800)]
Add better_errors gem for easier debugging

19 months agoFix handling of title when replying to diary entries
Andy Allan [Wed, 11 Apr 2018 06:03:17 +0000 (14:03 +0800)]
Fix handling of title when replying to diary entries

19 months agoRefactor @this_user to @user
Andy Allan [Wed, 11 Apr 2018 03:42:33 +0000 (11:42 +0800)]
Refactor @this_user to @user

Historically we used @user for the currently logged in user, but
this was changed to `current_user` in 2017.

19 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Apr 2018 06:27:07 +0000 (08:27 +0200)]
Localisation updates from https://translatewiki.net.

20 months agoAsk for confirmation before deleting a trace
Tom Hughes [Thu, 5 Apr 2018 20:16:28 +0000 (21:16 +0100)]
Ask for confirmation before deleting a trace

Fixes #1812

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Apr 2018 07:31:53 +0000 (09:31 +0200)]
Localisation updates from https://translatewiki.net.

20 months agoReworded roundabout exit text
J Guthrie [Mon, 2 Apr 2018 22:20:31 +0000 (23:20 +0100)]
Reworded roundabout exit text

20 months agoMerge remote-tracking branch 'upstream/pull/1804'
Tom Hughes [Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)]
Merge remote-tracking branch 'upstream/pull/1804'

20 months agoMerge remote-tracking branch 'upstream/pull/1801'
Tom Hughes [Mon, 2 Apr 2018 14:25:17 +0000 (15:25 +0100)]
Merge remote-tracking branch 'upstream/pull/1801'

20 months agoTweak highlighting of geolocation errors
Tom Hughes [Mon, 2 Apr 2018 14:24:03 +0000 (15:24 +0100)]
Tweak highlighting of geolocation errors

20 months agoMerge remote-tracking branch 'upstream/pull/1800'
Tom Hughes [Mon, 2 Apr 2018 14:18:11 +0000 (15:18 +0100)]
Merge remote-tracking branch 'upstream/pull/1800'

20 months agoAdded autoPan for Directions markers
J Guthrie [Sat, 31 Mar 2018 21:18:25 +0000 (22:18 +0100)]
Added autoPan for Directions markers

20 months agoConverted roundabouts to take "1st, 2nd, 3rd" exit etc
J Guthrie [Sat, 31 Mar 2018 15:58:17 +0000 (16:58 +0100)]
Converted roundabouts to take "1st, 2nd, 3rd" exit etc

20 months agoAdded missing onramp instructions to locale file
J Guthrie [Sat, 31 Mar 2018 15:31:35 +0000 (16:31 +0100)]
Added missing onramp instructions to locale file

20 months agoMoved inline styling to stylesheet
J Guthrie [Thu, 29 Mar 2018 21:48:39 +0000 (22:48 +0100)]
Moved inline styling to stylesheet

20 months agoRemove/replace redundant no_place locale translation
J Guthrie [Thu, 29 Mar 2018 21:27:33 +0000 (22:27 +0100)]
Remove/replace redundant no_place locale translation

20 months agoUnlocateable place now highlighted in red and specified in error message
J Guthrie [Thu, 29 Mar 2018 19:50:29 +0000 (20:50 +0100)]
Unlocateable place now highlighted in red and specified in error message

The textbox containing the unlocateable place gets highlighted in red
Also added a new locale value to specify an error for a specific place

20 months agoMerge remote-tracking branch 'upstream/pull/1796'
Tom Hughes [Thu, 29 Mar 2018 07:35:03 +0000 (08:35 +0100)]
Merge remote-tracking branch 'upstream/pull/1796'

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Mar 2018 07:16:45 +0000 (09:16 +0200)]
Localisation updates from https://translatewiki.net.

20 months agoMerge remote-tracking branch 'upstream/pull/1799'
Tom Hughes [Wed, 28 Mar 2018 16:38:34 +0000 (17:38 +0100)]
Merge remote-tracking branch 'upstream/pull/1799'

20 months agoMerge remote-tracking branch 'upstream/pull/1798'
Tom Hughes [Wed, 28 Mar 2018 16:33:35 +0000 (17:33 +0100)]
Merge remote-tracking branch 'upstream/pull/1798'