rails.git
21 months agoConvert note view to use server side conditions
Tom Hughes [Thu, 17 May 2018 10:29:28 +0000 (11:29 +0100)]
Convert note view to use server side conditions

Fixes #1869

21 months agoAdd piwik to allowed URIs in connect-src
Tom Hughes [Thu, 17 May 2018 10:29:06 +0000 (11:29 +0100)]
Add piwik to allowed URIs in connect-src

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 May 2018 06:36:19 +0000 (08:36 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoRemove unsafe-inline form default style policy
Tom Hughes [Wed, 16 May 2018 19:40:55 +0000 (20:40 +0100)]
Remove unsafe-inline form default style policy

21 months agoRemove some inline styles
Tom Hughes [Wed, 16 May 2018 19:27:35 +0000 (20:27 +0100)]
Remove some inline styles

21 months agoMerge remote-tracking branch 'upstream/pull/1866'
Tom Hughes [Wed, 16 May 2018 17:57:34 +0000 (18:57 +0100)]
Merge remote-tracking branch 'upstream/pull/1866'

21 months agoAllow iD to access wikidata
Tom Hughes [Wed, 16 May 2018 10:36:46 +0000 (11:36 +0100)]
Allow iD to access wikidata

21 months agoRevert "Remove unused POST method for message replies"
Tom Hughes [Wed, 16 May 2018 09:43:26 +0000 (10:43 +0100)]
Revert "Remove unused POST method for message replies"

This reverts commit 40cab845fbabb3f0aa8131c16e48cd3d58b6dcb3.

21 months agoAllow iD to access wikipedia
Tom Hughes [Wed, 16 May 2018 07:48:38 +0000 (08:48 +0100)]
Allow iD to access wikipedia

21 months agoRemove if_user and similar methods
Andy Allan [Wed, 16 May 2018 05:05:20 +0000 (13:05 +0800)]
Remove if_user and similar methods

Rather than hiding features based on CSS, just avoid including them
in the output. Fixes #1862

21 months agoFix test which was accidentally testing as the entry user twice
Andy Allan [Wed, 16 May 2018 04:59:16 +0000 (12:59 +0800)]
Fix test which was accidentally testing as the entry user twice

21 months agoMerge remote-tracking branch 'upstream/pull/1863'
Tom Hughes [Tue, 15 May 2018 17:36:55 +0000 (18:36 +0100)]
Merge remote-tracking branch 'upstream/pull/1863'

21 months agoTell jshint about bowser
Tom Hughes [Tue, 15 May 2018 13:42:05 +0000 (14:42 +0100)]
Tell jshint about bowser

21 months agoUse https to launch the remote editor except for modern browsers
Tom Hughes [Tue, 15 May 2018 13:08:57 +0000 (14:08 +0100)]
Use https to launch the remote editor except for modern browsers

Currently only Chrome 53+ and Firefox 55+ are known to support loading
of http resources from localhost for an https page.

21 months agoDefault frame-src to self
Tom Hughes [Tue, 15 May 2018 13:08:44 +0000 (14:08 +0100)]
Default frame-src to self

21 months agoAdd frame-src to allow http://127.0.0.1:8111
Tom Hughes [Tue, 15 May 2018 11:43:37 +0000 (12:43 +0100)]
Add frame-src to allow http://127.0.0.1:8111

21 months agoEnsure database is writable before destroying a message
Andy Allan [Tue, 15 May 2018 10:28:33 +0000 (18:28 +0800)]
Ensure database is writable before destroying a message

21 months agoRename messages#read to #show
Andy Allan [Tue, 15 May 2018 10:25:54 +0000 (18:25 +0800)]
Rename messages#read to #show

Also rename the named path, to align with resourceful routing

21 months agoRename messages#delete to destroy
Andy Allan [Tue, 15 May 2018 10:03:15 +0000 (18:03 +0800)]
Rename messages#delete to destroy

This is a better fit for rails controller method conventions, paving
the way to resourceful routing. Keep user-facing strings as 'delete'
since that's more commonly used.

21 months agoRemove unused POST method for message replies
Andy Allan [Tue, 15 May 2018 09:33:40 +0000 (17:33 +0800)]
Remove unused POST method for message replies

This action just shows the pre-filled form, with the target for
the form being the same as for new messages.

21 months agoUpgrade community index to 0.4.3 to fix issue with tirana polygon
Bryan Housel [Tue, 15 May 2018 00:35:29 +0000 (20:35 -0400)]
Upgrade community index to 0.4.3 to fix issue with tirana polygon

21 months agoUpdate to iD v2.8.2
Bryan Housel [Mon, 14 May 2018 21:55:32 +0000 (17:55 -0400)]
Update to iD v2.8.2

21 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'

21 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'

21 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

21 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.

21 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

21 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'

21 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'

21 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

21 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.

21 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

21 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

21 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

21 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

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

21 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

21 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.

21 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.

21 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

21 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

21 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'

21 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

21 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.

21 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

21 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

21 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

21 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

21 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'

21 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

21 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

21 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

21 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.

21 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

21 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

21 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

21 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'

21 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'

21 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'

21 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'

21 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'

21 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'

21 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'

21 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.

21 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.

21 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

21 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

21 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.

21 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.

21 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

21 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

21 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.

21 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.

21 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

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

21 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

21 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

21 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.

22 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

22 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.

22 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'

22 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'

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

22 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'

22 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.

22 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

22 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.

22 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

22 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)

22 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

22 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

22 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'

22 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'

22 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'

22 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'

22 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

22 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.

22 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.

22 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.

22 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