]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Mon, 22 Mar 2021 07:05:57 +0000 (07:05 +0000)]
Merge remote-tracking branch 'upstream/pull/3144'
dependabot[bot] [Mon, 22 Mar 2021 05:02:44 +0000 (05:02 +0000)]
Bump qs from 6.10.0 to 6.10.1
Bumps [qs](https://github.com/ljharb/qs) from 6.10.0 to 6.10.1.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.0...v6.10.1)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Sun, 21 Mar 2021 15:07:59 +0000 (15:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3141'
Tom Hughes [Sun, 21 Mar 2021 10:21:25 +0000 (10:21 +0000)]
Handle errors checking for gravatars
dependabot[bot] [Fri, 19 Mar 2021 05:02:29 +0000 (05:02 +0000)]
Bump qs from 6.9.6 to 6.10.0
Bumps [qs](https://github.com/ljharb/qs) from 6.9.6 to 6.10.0.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.6...v6.10.0)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 18 Mar 2021 12:49:53 +0000 (13:49 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 17 Mar 2021 19:11:35 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/3140'
Andy Allan [Wed, 17 Mar 2021 18:57:36 +0000 (18:57 +0000)]
Use list-inline to achieve spacing between elements on a line
This is a better solution than spans and margins. Additionally, rework
to use mb-* instead of my-* (bootstrap advises against using margin-top)
and get rid of <br>s by using paragraphs instead.
Tom Hughes [Wed, 17 Mar 2021 18:17:49 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3124'
Tom Hughes [Wed, 17 Mar 2021 18:16:15 +0000 (18:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3138'
Tom Hughes [Wed, 17 Mar 2021 18:14:40 +0000 (18:14 +0000)]
Merge remote-tracking branch 'upstream/pull/3139'
Andy Allan [Wed, 17 Mar 2021 17:57:18 +0000 (17:57 +0000)]
Refactor traces list display
Ideas taken from #3036
Andy Allan [Wed, 17 Mar 2021 17:02:32 +0000 (17:02 +0000)]
Use .add method for adding errors
This avoids a deprecation warning on rails 6.1
Andy Allan [Wed, 17 Mar 2021 16:07:43 +0000 (16:07 +0000)]
Merge branch 'pull/3112'
Andy Allan [Wed, 17 Mar 2021 16:06:26 +0000 (16:06 +0000)]
Remove unused translations
Tom Hughes [Wed, 17 Mar 2021 15:56:27 +0000 (15:56 +0000)]
Merge remote-tracking branch 'upstream/pull/3137'
Andy Allan [Wed, 17 Mar 2021 15:37:55 +0000 (15:37 +0000)]
Update code example to follow rubocop recommendations
Just for consistency with what you would see elsewhere in the codebase
Tom Hughes [Tue, 16 Mar 2021 11:56:43 +0000 (11:56 +0000)]
Update bundle
Tom Hughes [Tue, 16 Mar 2021 11:07:47 +0000 (11:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3133'
Tom Hughes [Tue, 16 Mar 2021 11:07:45 +0000 (11:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3132'
Tom Hughes [Tue, 16 Mar 2021 11:06:18 +0000 (11:06 +0000)]
Reject referers that do not include an absolute path
translatewiki.net [Mon, 15 Mar 2021 18:08:21 +0000 (19:08 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Mon, 15 Mar 2021 05:02:22 +0000 (05:02 +0000)]
Bump eslint from 7.21.0 to 7.22.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.21.0 to 7.22.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.21.0...v7.22.0)
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Mon, 15 Mar 2021 05:02:04 +0000 (05:02 +0000)]
Bump leaflet.locatecontrol from 0.72.2 to 0.73.0
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.72.2 to 0.73.0.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.72.2...v0.73.0)
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Sun, 14 Mar 2021 10:18:32 +0000 (10:18 +0000)]
Allow form submission to any location from the login page
This allows openid login to work on browsers like chrome that enforce
the form-action rule for redirect POST requests.
Fixes #3131
Tom Hughes [Sun, 14 Mar 2021 09:41:59 +0000 (09:41 +0000)]
Merge remote-tracking branch 'upstream/pull/3130'
Simon Poole [Sat, 13 Mar 2021 19:25:43 +0000 (20:25 +0100)]
Remove GL and SH cantonal WMS servers from black list
The previously restrictively licensed material is now available on relatively open terms directly from swisstopo per 1. March 2021, so these entries can be removed.
Michal Migurski [Sat, 27 Feb 2021 05:01:57 +0000 (21:01 -0800)]
Chasing parse errors
Michal Migurski [Sat, 27 Feb 2021 05:00:46 +0000 (21:00 -0800)]
Added missing translation
Michal Migurski [Sat, 27 Feb 2021 04:56:56 +0000 (20:56 -0800)]
Switched to hash rockets syntax per erblint feedback
Michal Migurski [Sat, 27 Feb 2021 04:32:48 +0000 (20:32 -0800)]
Replaced H2 messages header links with Bootstrap nav links
Following suggestion from https://github.com/openstreetmap/openstreetmap-website/issues/2962#issuecomment-
768985393
translatewiki.net [Fri, 12 Mar 2021 06:06:49 +0000 (07:06 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 10 Mar 2021 14:55:58 +0000 (14:55 +0000)]
Merge remote-tracking branch 'upstream/pull/3125'
Andy Allan [Wed, 10 Mar 2021 14:14:36 +0000 (14:14 +0000)]
Use login_path instead of explicit controller and actions
This makes future refactoring easier.
Tom Hughes [Wed, 10 Mar 2021 10:38:13 +0000 (10:38 +0000)]
Update bundle
Morten Bruhn [Tue, 9 Mar 2021 19:44:21 +0000 (20:44 +0100)]
Added natural=peninsula
Morten Bruhn [Tue, 9 Mar 2021 19:42:57 +0000 (20:42 +0100)]
Added natural=coastline
translatewiki.net [Mon, 8 Mar 2021 14:57:34 +0000 (15:57 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 5 Mar 2021 15:50:34 +0000 (15:50 +0000)]
Merge remote-tracking branch 'upstream/pull/3118'
Quincy Morgan [Fri, 5 Mar 2021 15:37:22 +0000 (10:37 -0500)]
Remove incidental additions
Quincy Morgan [Fri, 5 Mar 2021 15:30:24 +0000 (10:30 -0500)]
Merge branch 'master' into iD-2.19.6
Tom Hughes [Thu, 4 Mar 2021 14:46:02 +0000 (14:46 +0000)]
Remove swfobject from Vendorfile as it is no longer used
Tom Hughes [Thu, 4 Mar 2021 13:45:34 +0000 (13:45 +0000)]
Merge remote-tracking branch 'upstream/pull/3121'
Tom Hughes [Thu, 4 Mar 2021 13:45:31 +0000 (13:45 +0000)]
Merge remote-tracking branch 'upstream/pull/3120'
translatewiki.net [Thu, 4 Mar 2021 13:05:49 +0000 (14:05 +0100)]
Localisation updates from https://translatewiki.net.
Andy Allan [Thu, 4 Mar 2021 11:08:11 +0000 (11:08 +0000)]
Remove CSS overrides for the login page at small screen sizes
Some of these selectors no longer apply, and the one that did just
made the behaviour worse, so they are all no longer required.
Andy Allan [Thu, 4 Mar 2021 11:04:47 +0000 (11:04 +0000)]
Prevent input group wrapping when sidebar is resized
Fixes #3119
Quincy Morgan [Wed, 3 Mar 2021 19:21:42 +0000 (14:21 -0500)]
Update to iD v2.19.6
Tom Hughes [Wed, 3 Mar 2021 18:43:34 +0000 (18:43 +0000)]
Merge remote-tracking branch 'upstream/pull/3117'
Andy Allan [Wed, 3 Mar 2021 17:39:42 +0000 (17:39 +0000)]
Add a small margin before the changesets more button
See also #2717
Andy Allan [Wed, 3 Mar 2021 17:16:31 +0000 (17:16 +0000)]
Remove unnecessary margin-tops
Andy Allan [Wed, 3 Mar 2021 15:51:11 +0000 (15:51 +0000)]
Remove final uses of the deemphasize class
Andy Allan [Wed, 3 Mar 2021 15:34:16 +0000 (15:34 +0000)]
Remove the old richtext_area helper
This has been superseded by the `f.richtext_field` custom form builder.
Tom Hughes [Wed, 3 Mar 2021 09:27:33 +0000 (09:27 +0000)]
Use a 307 Temporary Redirect to redirect to authentication
When the user wants to enable an external authenticator we need
to redirect to omniauth but that now needs to be a POST so use a
redirect that preserves the POST method.
Fixes #3114
Tom Hughes [Tue, 2 Mar 2021 08:24:15 +0000 (08:24 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 2 Mar 2021 08:22:08 +0000 (08:22 +0000)]
Update bundle
Tom Hughes [Tue, 2 Mar 2021 08:14:16 +0000 (08:14 +0000)]
Merge remote-tracking branch 'upstream/pull/3113'
translatewiki.net [Mon, 1 Mar 2021 13:50:53 +0000 (14:50 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Mon, 1 Mar 2021 05:05:49 +0000 (05:05 +0000)]
Bump eslint from 7.20.0 to 7.21.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.20.0 to 7.21.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.20.0...v7.21.0)
Signed-off-by: dependabot[bot] <support@github.com>
translatewiki.net [Thu, 25 Feb 2021 15:25:29 +0000 (16:25 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 24 Feb 2021 17:12:36 +0000 (17:12 +0000)]
Merge remote-tracking branch 'upstream/pull/3109'
Andy Allan [Wed, 24 Feb 2021 14:48:10 +0000 (14:48 +0000)]
Remove standard-form CSS rules
Andy Allan [Wed, 10 Feb 2021 14:17:58 +0000 (14:17 +0000)]
Convert the search forms to bootstrap
This moves the forms to a flex grid, albeit with a little twiddling
to get things working in a compact space.
Andy Allan [Wed, 24 Feb 2021 10:49:39 +0000 (10:49 +0000)]
Merge branch 'pull/3091'
Andy Allan [Wed, 24 Feb 2021 10:35:28 +0000 (10:35 +0000)]
Use the bootstrap spacer variable as the basis for spacing calcuation, and match mb-1 definition
Tom Hughes [Tue, 23 Feb 2021 18:56:55 +0000 (18:56 +0000)]
Update bundle
translatewiki.net [Mon, 22 Feb 2021 15:49:08 +0000 (16:49 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 19 Feb 2021 18:18:13 +0000 (18:18 +0000)]
Tighten up cookie security
Mark all cookies as Secure, and the cookies which are not
modified client side as HttpOnly.
mxdanger [Thu, 18 Feb 2021 02:27:41 +0000 (18:27 -0800)]
Add btn-wrapper class
Tom Hughes [Wed, 17 Feb 2021 18:55:55 +0000 (18:55 +0000)]
Merge remote-tracking branch 'upstream/pull/3102'
Andy Allan [Wed, 17 Feb 2021 17:17:19 +0000 (17:17 +0000)]
Refactor the share panel to use bootstrap forms
Andy Allan [Wed, 17 Feb 2021 17:05:49 +0000 (17:05 +0000)]
Use bootstrap form-check for overlay selection
Tom Hughes [Wed, 17 Feb 2021 11:56:53 +0000 (11:56 +0000)]
Merge remote-tracking branch 'upstream/pull/3100'
Andy Allan [Wed, 17 Feb 2021 11:12:47 +0000 (11:12 +0000)]
Bump composite_primary_keys to 12.0.8
12.0.7 has been yanked
Andy Allan [Wed, 17 Feb 2021 10:22:11 +0000 (10:22 +0000)]
Merge pull request #3083 from migurski/migurski/docker-compose-cleanups
Post-merge Docker Compose cleanup issues
Tom Hughes [Tue, 16 Feb 2021 21:14:54 +0000 (21:14 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 16 Feb 2021 21:10:28 +0000 (21:10 +0000)]
Update bundle
Tom Hughes [Tue, 16 Feb 2021 17:37:18 +0000 (17:37 +0000)]
Validate avatar images
Closes #3097
Tom Hughes [Tue, 16 Feb 2021 17:12:34 +0000 (17:12 +0000)]
Fix avatar mode update on file change
Tom Hughes [Tue, 16 Feb 2021 08:10:49 +0000 (08:10 +0000)]
Merge remote-tracking branch 'upstream/pull/3095'
translatewiki.net [Mon, 15 Feb 2021 13:52:55 +0000 (14:52 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Mon, 15 Feb 2021 05:01:20 +0000 (05:01 +0000)]
Bump eslint from 7.19.0 to 7.20.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.19.0 to 7.20.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.19.0...v7.20.0)
Signed-off-by: dependabot[bot] <support@github.com>
Michal Migurski [Thu, 4 Feb 2021 19:27:10 +0000 (11:27 -0800)]
Removed ENABLE_BOOTSNAP environment variable
Michal Migurski [Thu, 4 Feb 2021 16:24:41 +0000 (08:24 -0800)]
Added explanatory notes and comments
Michal Migurski [Thu, 4 Feb 2021 04:37:06 +0000 (20:37 -0800)]
Added note about password and privileges for OSM DB user
Michal Migurski [Thu, 4 Feb 2021 04:35:16 +0000 (20:35 -0800)]
Moved osm-db-functions.sql to /usr/local/share/
translatewiki.net [Thu, 11 Feb 2021 17:59:09 +0000 (18:59 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 10 Feb 2021 22:42:39 +0000 (22:42 +0000)]
Update to rails 6.0.3.5
Tom Hughes [Wed, 10 Feb 2021 19:37:51 +0000 (19:37 +0000)]
Prevent CSRF bypass with login form
Andy Allan [Wed, 10 Feb 2021 15:39:55 +0000 (15:39 +0000)]
Refactor the third-party login form to use bootstrap
Andy Allan [Wed, 10 Feb 2021 15:09:29 +0000 (15:09 +0000)]
Update terms form to use bootstrap
Andy Allan [Wed, 10 Feb 2021 14:23:11 +0000 (14:23 +0000)]
Convert the new note form to use bootstrap
Andy Allan [Wed, 10 Feb 2021 10:55:41 +0000 (10:55 +0000)]
Rework changeset comments form to use bootstrap styling
Tom Hughes [Tue, 9 Feb 2021 22:59:54 +0000 (22:59 +0000)]
Prevent CSRF bypass with password reset form
mmd-osm [Tue, 9 Feb 2021 18:46:17 +0000 (19:46 +0100)]
Prevent CSRF bypass unblocking users
mxdanger [Tue, 9 Feb 2021 01:32:29 +0000 (17:32 -0800)]
Fix unexpected spacing on note buttons when overflowed
Tom Hughes [Mon, 8 Feb 2021 12:24:43 +0000 (12:24 +0000)]
Prevent CSRF bypass updating account details
Fixes #3089
Tom Hughes [Mon, 8 Feb 2021 08:09:31 +0000 (08:09 +0000)]
Merge remote-tracking branch 'upstream/pull/3088'
Tom Hughes [Mon, 8 Feb 2021 08:09:27 +0000 (08:09 +0000)]
Merge remote-tracking branch 'upstream/pull/3087'
dependabot[bot] [Mon, 8 Feb 2021 07:38:32 +0000 (07:38 +0000)]
Update actions/cache requirement to v2.1.4
Updates the requirements on [actions/cache](https://github.com/actions/cache) to permit the latest version.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/commits/
26968a09c0ea4f3e233fdddbafd1166051a095f6 )
Signed-off-by: dependabot[bot] <support@github.com>