]> git.openstreetmap.org Git - rails.git/log
rails.git
4 years agoUpdate bundle
Tom Hughes [Wed, 15 Apr 2020 18:23:16 +0000 (19:23 +0100)]
Update bundle

4 years agoMerge remote-tracking branch 'upstream/pull/2431'
Tom Hughes [Wed, 15 Apr 2020 18:18:10 +0000 (19:18 +0100)]
Merge remote-tracking branch 'upstream/pull/2431'

4 years agoFix rubocop-minitest warnings
Tom Hughes [Wed, 15 Apr 2020 18:06:03 +0000 (19:06 +0100)]
Fix rubocop-minitest warnings

4 years agoSort cops
Tom Hughes [Wed, 15 Apr 2020 14:51:55 +0000 (15:51 +0100)]
Sort cops

4 years agoFix erblint
Tom Hughes [Wed, 15 Apr 2020 14:51:43 +0000 (15:51 +0100)]
Fix erblint

4 years agoMerge pull request #2547 from bezdna/mobile-layout
Andy Allan [Wed, 15 Apr 2020 14:50:12 +0000 (16:50 +0200)]
Merge pull request #2547 from bezdna/mobile-layout

Trigger small screen layout based on the width of the screen, rather than the width of the menus.

4 years agoMerge remote-tracking branch 'upstream/pull/2579'
Tom Hughes [Wed, 15 Apr 2020 14:41:49 +0000 (15:41 +0100)]
Merge remote-tracking branch 'upstream/pull/2579'

4 years agoMerge remote-tracking branch 'upstream/pull/2590'
Tom Hughes [Wed, 15 Apr 2020 14:35:37 +0000 (15:35 +0100)]
Merge remote-tracking branch 'upstream/pull/2590'

4 years agoAdd rubocop-minitest
Andy Allan [Wed, 15 Apr 2020 14:15:52 +0000 (16:15 +0200)]
Add rubocop-minitest

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 14 Apr 2020 03:34:16 +0000 (05:34 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoAdd tile.openstreetmap.org to security policy
Tom Hughes [Mon, 13 Apr 2020 23:03:55 +0000 (00:03 +0100)]
Add tile.openstreetmap.org to security policy

4 years agoUpdate leaflet.osm plugin
Tom Hughes [Mon, 13 Apr 2020 23:01:30 +0000 (00:01 +0100)]
Update leaflet.osm plugin

4 years agoUpdate leaflet.osm plugin
Tom Hughes [Fri, 10 Apr 2020 13:31:31 +0000 (14:31 +0100)]
Update leaflet.osm plugin

4 years agoRemove unsued bootstrap components from Vendorfile
Tom Hughes [Fri, 10 Apr 2020 13:30:54 +0000 (14:30 +0100)]
Remove unsued bootstrap components from Vendorfile

4 years agoRemove arabic strings from en-GB locale
Tom Hughes [Thu, 9 Apr 2020 20:21:09 +0000 (21:21 +0100)]
Remove arabic strings from en-GB locale

4 years agoAdd blob to frame-src in CSP for iD
Tom Hughes [Thu, 9 Apr 2020 17:42:17 +0000 (18:42 +0100)]
Add blob to frame-src in CSP for iD

Fixes #2582
Closes #2583

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Apr 2020 14:10:03 +0000 (16:10 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate bundle
Tom Hughes [Wed, 8 Apr 2020 08:48:42 +0000 (09:48 +0100)]
Update bundle

4 years agoEnsure that urls are only valid if the entire string is a url
Andy Allan [Wed, 1 Apr 2020 15:53:37 +0000 (17:53 +0200)]
Ensure that urls are only valid if the entire string is a url

This replaces our homegrown regexps (that didn't quite work) with
ruby built-in regexps, and uses the termination anchor to ensure
that the entire string, not just the first part, is validated.

4 years agoMerge remote-tracking branch 'upstream/pull/2577'
Tom Hughes [Wed, 1 Apr 2020 10:56:27 +0000 (11:56 +0100)]
Merge remote-tracking branch 'upstream/pull/2577'

4 years agoRemove custom table styling
Andy Allan [Wed, 1 Apr 2020 10:06:36 +0000 (12:06 +0200)]
Remove custom table styling

This removes the custom table styling code, and move to using bootstrap table styling for almost all remaining tables.

4 years agoUpdate leaflet plugins
Tom Hughes [Wed, 1 Apr 2020 08:24:44 +0000 (09:24 +0100)]
Update leaflet plugins

4 years agoMerge remote-tracking branch 'upstream/pull/2574'
Tom Hughes [Wed, 1 Apr 2020 08:18:24 +0000 (09:18 +0100)]
Merge remote-tracking branch 'upstream/pull/2574'

4 years agoFix typo in comment
Simon Legner [Tue, 31 Mar 2020 23:04:58 +0000 (01:04 +0200)]
Fix typo in comment

Closes #2576

4 years agoUpdate leaflet to 1.6.0
Simon Legner [Tue, 31 Mar 2020 22:28:25 +0000 (00:28 +0200)]
Update leaflet to 1.6.0

4 years agoFix new rubocop warnings
Tom Hughes [Tue, 31 Mar 2020 18:08:10 +0000 (19:08 +0100)]
Fix new rubocop warnings

4 years agoUpdate bundle
Tom Hughes [Tue, 31 Mar 2020 18:05:37 +0000 (19:05 +0100)]
Update bundle

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 31 Mar 2020 13:59:29 +0000 (15:59 +0200)]
Localisation updates from https://translatewiki.net.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Mar 2020 15:12:44 +0000 (16:12 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoSet QT_QPA_PLATFORM=offscreen for Ubuntu etc
Tom Hughes [Wed, 25 Mar 2020 17:03:52 +0000 (17:03 +0000)]
Set QT_QPA_PLATFORM=offscreen for Ubuntu etc

Fixes #2569

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Mar 2020 14:07:13 +0000 (15:07 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoMake linkify return an HTML safe result for unsafe inputs
Tom Hughes [Sun, 22 Mar 2020 12:47:56 +0000 (12:47 +0000)]
Make linkify return an HTML safe result for unsafe inputs

Fixes #2567

4 years agoFix some untranslateable strings
Tom Hughes [Fri, 20 Mar 2020 17:22:23 +0000 (17:22 +0000)]
Fix some untranslateable strings

Fixes #2565

4 years agoPass I18n argument correctly
Tom Hughes [Fri, 20 Mar 2020 14:58:45 +0000 (14:58 +0000)]
Pass I18n argument correctly

4 years agoFix lego translation with locate control
Tom Hughes [Fri, 20 Mar 2020 14:28:51 +0000 (14:28 +0000)]
Fix lego translation with locate control

Fixes #2564

4 years agoUpdate javascript bundle
Tom Hughes [Thu, 19 Mar 2020 18:26:04 +0000 (18:26 +0000)]
Update javascript bundle

4 years agoUpdate to rails 6.0.2.2
Tom Hughes [Thu, 19 Mar 2020 18:20:26 +0000 (18:20 +0000)]
Update to rails 6.0.2.2

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Mar 2020 14:12:49 +0000 (15:12 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2548'
Tom Hughes [Wed, 18 Mar 2020 20:15:06 +0000 (20:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2548'

4 years agoMerge remote-tracking branch 'upstream/pull/2448'
Tom Hughes [Wed, 18 Mar 2020 14:58:06 +0000 (14:58 +0000)]
Merge remote-tracking branch 'upstream/pull/2448'

4 years agoMerge remote-tracking branch 'upstream/pull/2562'
Tom Hughes [Wed, 18 Mar 2020 14:51:15 +0000 (14:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2562'

4 years agoCopy trace fixture files, rather than symlinking
Andy Allan [Wed, 18 Mar 2020 14:35:55 +0000 (15:35 +0100)]
Copy trace fixture files, rather than symlinking

Since we are using tmpdirs in order to enable parallel testing, we
can go the full hog and drop the fakefs too and just copy all the
files directly into the tmpdir. If a test makes changes (e.g.
changing the icon file during an import) the copy in the tmpdir is
thrown away at the end of the test anyway.

4 years agoRemove unused directories
Andy Allan [Wed, 4 Dec 2019 11:45:16 +0000 (12:45 +0100)]
Remove unused directories

4 years agoEnable parallel tests
Andy Allan [Wed, 27 Nov 2019 13:58:36 +0000 (14:58 +0100)]
Enable parallel tests

4 years agoUse unique test directories for each trace test
Andy Allan [Wed, 27 Nov 2019 13:57:49 +0000 (14:57 +0100)]
Use unique test directories for each trace test

This allows tests to be run in parallel, since it avoids deleting
some of the symlinks that other tests expect to be there.

4 years agoUse the settings for the destination of the gpx fixture symlinks
Andy Allan [Wed, 27 Nov 2019 13:01:40 +0000 (14:01 +0100)]
Use the settings for the destination of the gpx fixture symlinks

This lets us change the settings values and have the fixtures appear
in the right place.

4 years agoRemove unnecessary h() calls on model attributes
Andy Allan [Wed, 18 Mar 2020 13:33:30 +0000 (14:33 +0100)]
Remove unnecessary h() calls on model attributes

These were necessary in the rails 2.x era, but not now.

4 years agoMerge remote-tracking branch 'upstream/pull/2561'
Tom Hughes [Wed, 18 Mar 2020 11:15:01 +0000 (11:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2561'

4 years agoUse bootstrap table striping to replace hand-cycled table stripes
Andy Allan [Wed, 18 Mar 2020 10:27:36 +0000 (11:27 +0100)]
Use bootstrap table striping to replace hand-cycled table stripes

This cuts down on the complexity of having to use the `cycle` function
and makes the templates easier to read. CSS-based striping has been
around for many years.

The CSS is in order to keep our custom colour for striped tables.

4 years agoMerge remote-tracking branch 'upstream/pull/2560'
Tom Hughes [Wed, 18 Mar 2020 11:02:07 +0000 (11:02 +0000)]
Merge remote-tracking branch 'upstream/pull/2560'

4 years agoEnable remaining bootstrap components
Andy Allan [Wed, 18 Mar 2020 10:16:03 +0000 (11:16 +0100)]
Enable remaining bootstrap components

Fixes #2511

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Mar 2020 14:52:51 +0000 (15:52 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoMerge remote-tracking branch 'upstream/pull/2558'
Tom Hughes [Sat, 14 Mar 2020 15:51:23 +0000 (15:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2558'

4 years agoMoved CSS rule
hikemaniac [Sat, 14 Mar 2020 15:39:21 +0000 (16:39 +0100)]
Moved CSS rule

4 years agoFix border-radius for search query input field
hikemaniac [Sat, 14 Mar 2020 15:06:33 +0000 (16:06 +0100)]
Fix border-radius for search query input field

4 years agoUpdate javascript bundle
Tom Hughes [Sat, 14 Mar 2020 00:39:29 +0000 (00:39 +0000)]
Update javascript bundle

Closes #2557

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Mar 2020 18:27:55 +0000 (19:27 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate bundle
Tom Hughes [Wed, 11 Mar 2020 18:52:39 +0000 (18:52 +0000)]
Update bundle

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Mar 2020 15:43:08 +0000 (16:43 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Mar 2020 16:37:12 +0000 (17:37 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoUpdate bundle
Tom Hughes [Wed, 4 Mar 2020 18:46:11 +0000 (18:46 +0000)]
Update bundle

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 2 Mar 2020 13:51:22 +0000 (14:51 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoEnforce restrictions on issue visibility properly
Tom Hughes [Sun, 1 Mar 2020 19:08:40 +0000 (19:08 +0000)]
Enforce restrictions on issue visibility properly

4 years agoFix eslint warnings
Tom Hughes [Sat, 29 Feb 2020 17:52:55 +0000 (17:52 +0000)]
Fix eslint warnings

4 years agoFix highlight of changesets with no bounding box
Tom Hughes [Sat, 29 Feb 2020 17:43:19 +0000 (17:43 +0000)]
Fix highlight of changesets with no bounding box

A changeset with no bounding box has no map layer so trying to
set it's style throws an exception which means we don't get to
the code to set the style on the list entry.

Fixes #2541

4 years agoRework set_default_request_format ast set_request_formats
Tom Hughes [Sat, 29 Feb 2020 15:15:02 +0000 (15:15 +0000)]
Rework set_default_request_format ast set_request_formats

Instead of trying to work out the exact format, just figure
out the list of allowed formats and let rails do the rest.

4 years agoUpdate rubocop configuration
Tom Hughes [Fri, 28 Feb 2020 22:50:08 +0000 (22:50 +0000)]
Update rubocop configuration

4 years agoUpdate bundle
Tom Hughes [Fri, 28 Feb 2020 22:26:51 +0000 (22:26 +0000)]
Update bundle

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Feb 2020 16:19:42 +0000 (17:19 +0100)]
Localisation updates from https://translatewiki.net.

4 years agocss layout change only in content block
Anton Melnichuk [Thu, 27 Feb 2020 08:29:37 +0000 (10:29 +0200)]
css layout change only in content block

4 years agoMerge branch 'master' of github.com:openstreetmap/openstreetmap-website into mobile...
Anton Melnichuk [Thu, 27 Feb 2020 08:15:37 +0000 (10:15 +0200)]
Merge branch 'master' of github.com:openstreetmap/openstreetmap-website into mobile-layout

4 years agorename internal variable
Holger Jeromin [Wed, 26 Feb 2020 19:27:52 +0000 (20:27 +0100)]
rename internal variable

4 years agoMerge pull request #2542 from boubascript/master
Andy Allan [Wed, 26 Feb 2020 16:09:27 +0000 (17:09 +0100)]
Merge pull request #2542 from boubascript/master

Show mailto: links for email values in browse

4 years agoMerge pull request #2485 from mmd-osm/patch/json2
Andy Allan [Wed, 26 Feb 2020 14:55:48 +0000 (15:55 +0100)]
Merge pull request #2485 from mmd-osm/patch/json2

JSON output nodes, ways, relations, map

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 24 Feb 2020 14:45:28 +0000 (15:45 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoAllow bundle path to be overridden when building database functions
Tom Hughes [Sun, 23 Feb 2020 20:30:29 +0000 (20:30 +0000)]
Allow bundle path to be overridden when building database functions

4 years agothe layout is triggered not by JS, but by media queries, now some map bugs have gone...
Anton Melnichuk [Fri, 21 Feb 2020 08:08:38 +0000 (10:08 +0200)]
the layout is triggered not by JS, but by media queries, now some map bugs have gone away themselves
fix #2349 #2035 #1864
@tomhughes: 'Duplicate of many, many other tickets.'

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 20 Feb 2020 15:10:10 +0000 (16:10 +0100)]
Localisation updates from https://translatewiki.net.

4 years agochange validation to accept only single email values
Boubacar [Thu, 20 Feb 2020 04:44:40 +0000 (23:44 -0500)]
change validation to accept only single email values

4 years agoMerge branch 'master' of github.com:openstreetmap/openstreetmap-website
Boubacar [Thu, 20 Feb 2020 01:52:35 +0000 (20:52 -0500)]
Merge branch 'master' of github.com:openstreetmap/openstreetmap-website

4 years agoMerge remote-tracking branch 'upstream/pull/2381'
Tom Hughes [Wed, 19 Feb 2020 19:11:32 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2381'

4 years agoKeep the behaviour backwards-compatible
ENT8R [Wed, 19 Feb 2020 11:58:47 +0000 (12:58 +0100)]
Keep the behaviour backwards-compatible

4 years agochange Max for rubocop Metrics/ModuleLength
Boubacar [Mon, 17 Feb 2020 17:33:47 +0000 (12:33 -0500)]
change Max for rubocop Metrics/ModuleLength

4 years agomake email regex slightly more readable
Boubacar [Mon, 17 Feb 2020 16:39:30 +0000 (11:39 -0500)]
make email regex slightly more readable

4 years agoMerge branch 'master' of github.com:openstreetmap/openstreetmap-website
Boubacar [Mon, 17 Feb 2020 16:28:25 +0000 (11:28 -0500)]
Merge branch 'master' of github.com:openstreetmap/openstreetmap-website

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Feb 2020 14:01:18 +0000 (15:01 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoFix macosx-bundle-config link typo
Boubacar [Sun, 16 Feb 2020 22:45:43 +0000 (17:45 -0500)]
Fix macosx-bundle-config link typo

Removed an extra ')' that caused the last link for macosx-bundle-config to render incorrectly.

4 years agoMerge remote-tracking branch 'upstream/pull/2540'
Tom Hughes [Mon, 17 Feb 2020 10:22:12 +0000 (10:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2540'

4 years agoImprove macOS install notes
Andreas Hubel [Mon, 17 Feb 2020 09:21:57 +0000 (10:21 +0100)]
Improve macOS install notes

4 years agoAdd email link helper to create mailto: links for email values in objects
Boubacar [Mon, 17 Feb 2020 02:46:48 +0000 (21:46 -0500)]
Add  email link helper to create mailto: links for email values in objects

4 years agoMerge remote-tracking branch 'upstream/pull/2539'
Tom Hughes [Sun, 16 Feb 2020 23:05:55 +0000 (23:05 +0000)]
Merge remote-tracking branch 'upstream/pull/2539'

4 years agoFix macosx-bundle-config link typo
Boubacar [Sun, 16 Feb 2020 22:45:43 +0000 (17:45 -0500)]
Fix macosx-bundle-config link typo

Removed an extra ')' that caused the last link for macosx-bundle-config to render incorrectly.

4 years agoUpdate to iD v2.17.2
Bryan Housel [Fri, 14 Feb 2020 17:01:56 +0000 (12:01 -0500)]
Update to iD v2.17.2

4 years agoUpdate bundle
Tom Hughes [Thu, 13 Feb 2020 20:51:12 +0000 (20:51 +0000)]
Update bundle

4 years agoMerge remote-tracking branch 'upstream/pull/2534'
Tom Hughes [Thu, 13 Feb 2020 12:38:24 +0000 (12:38 +0000)]
Merge remote-tracking branch 'upstream/pull/2534'

4 years agofix help page, grid card layout on mobile
Anton Melnichuk [Thu, 13 Feb 2020 12:18:49 +0000 (14:18 +0200)]
fix help page, grid card layout on mobile

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Feb 2020 11:40:38 +0000 (12:40 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoAllow the embed page to be embedded in third party frames
Tom Hughes [Wed, 12 Feb 2020 11:18:00 +0000 (11:18 +0000)]
Allow the embed page to be embedded in third party frames

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 10 Feb 2020 13:58:42 +0000 (14:58 +0100)]
Localisation updates from https://translatewiki.net.

4 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 6 Feb 2020 14:03:08 +0000 (15:03 +0100)]
Localisation updates from https://translatewiki.net.