cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11570 commits 4 branches 1 tag 499 MiB
Commit graph

11570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Allan
5d39bf8491 Add tests for richtext table classes 2021-03-24 17:55:15 +00:00
Tom Hughes
0bdc865d9f Merge remote-tracking branch 'upstream/pull/3147' 2021-03-24 15:32:16 +00:00
Tom Hughes
a512392e6c Merge remote-tracking branch 'upstream/pull/3148' 2021-03-24 15:32:13 +00:00
Andy Allan
76063e9657 Bundle update for mimemagic yankage 2021-03-24 13:45:18 +00:00
Andy Allan
9fd96cfb87 Move sessions-related tests out of UsersControllerTest 2021-03-24 11:40:17 +00:00
Andy Allan
f18baae22e Refactor login/logout into sessions controller 
Certain controller methods are shared with oauth-based logins, and these have been
moved to a concern.
 2021-03-24 11:32:46 +00:00
Tom Hughes
3512d6303c Fix new rubocop warnings 2021-03-23 19:48:13 +00:00
Tom Hughes
fff12dd970 Update bundle 2021-03-23 19:34:34 +00:00
polarbearing
b4e2f8e34f
Show the crafted duration of a block independent of the reading time 
Fixes #3143.
Not tested by myself. Treat like pseudocode, I don't speak Ruby.
 2021-03-23 12:37:14 +01:00
translatewiki.net
1fd5d7f4fe Localisation updates from https://translatewiki.net. 2021-03-22 15:44:07 +01:00
Tom Hughes
69eb78ab79 Merge remote-tracking branch 'upstream/pull/3142' 2021-03-22 07:23:00 +00:00
Tom Hughes
240dc47b93 Merge remote-tracking branch 'upstream/pull/3144' 2021-03-22 07:05:57 +00:00
dependabot[bot]
9b13520b2e
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>
 2021-03-22 05:02:44 +00:00
Morten Bruhn
979528786c Added place=archipelago to en.yml 2021-03-21 19:33:30 +01:00
Morten Bruhn
8ff838ae45 Added natural=atoll to en.yml 2021-03-21 19:31:17 +01:00
Tom Hughes
547d9b63c4 Merge remote-tracking branch 'upstream/pull/3141' 2021-03-21 15:07:59 +00:00
Tom Hughes
4c2e4de5c0 Handle errors checking for gravatars 2021-03-21 10:24:53 +00:00
dependabot[bot]
438a8f876d
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>
 2021-03-19 05:02:29 +00:00
translatewiki.net
9786b716aa Localisation updates from https://translatewiki.net. 2021-03-18 13:49:53 +01:00
Tom Hughes
978ba726d9 Merge remote-tracking branch 'upstream/pull/3140' 2021-03-17 19:11:35 +00:00
Andy Allan
a08fe1c291 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.
 2021-03-17 18:57:36 +00:00
Tom Hughes
8e5deafd85 Merge remote-tracking branch 'upstream/pull/3124' 2021-03-17 18:17:49 +00:00
Tom Hughes
e2db409872 Merge remote-tracking branch 'upstream/pull/3138' 2021-03-17 18:16:15 +00:00
Tom Hughes
5d90e595a2 Merge remote-tracking branch 'upstream/pull/3139' 2021-03-17 18:14:40 +00:00
Andy Allan
4dc584421a Refactor traces list display 
Ideas taken from #3036
 2021-03-17 18:04:00 +00:00
Andy Allan
6f70c13062 Use .add method for adding errors 
This avoids a deprecation warning on rails 6.1
 2021-03-17 17:09:34 +00:00
Andy Allan
a2ddcda911 Merge branch 'pull/3112' 2021-03-17 16:07:43 +00:00
Andy Allan
10c9f18bc2 Remove unused translations 2021-03-17 16:06:26 +00:00
Tom Hughes
12db71157a Merge remote-tracking branch 'upstream/pull/3137' 2021-03-17 15:56:27 +00:00
Andy Allan
0d313a9e03 Update code example to follow rubocop recommendations 
Just for consistency with what you would see elsewhere in the codebase
 2021-03-17 15:37:55 +00:00
Tom Hughes
cb422209a4 Update bundle 2021-03-16 11:56:43 +00:00
Tom Hughes
e04ddc3e15 Merge remote-tracking branch 'upstream/pull/3133' 2021-03-16 11:07:47 +00:00
Tom Hughes
789ac73905 Merge remote-tracking branch 'upstream/pull/3132' 2021-03-16 11:07:45 +00:00
Tom Hughes
93b8c47c8f Reject referers that do not include an absolute path 2021-03-16 11:07:34 +00:00
translatewiki.net
7967c20673 Localisation updates from https://translatewiki.net. 2021-03-15 19:08:21 +01:00
dependabot[bot]
b2134f2947
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>
 2021-03-15 05:02:22 +00:00
dependabot[bot]
f5677783ae
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>
 2021-03-15 05:02:04 +00:00
Tom Hughes
afb22209bf 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
 2021-03-14 10:18:32 +00:00
Tom Hughes
7791283217 Merge remote-tracking branch 'upstream/pull/3130' 2021-03-14 09:41:59 +00:00
Simon Poole
37df9af7f7
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.
 2021-03-13 20:25:43 +01:00
Michal Migurski
f5f84027fa Chasing parse errors 2021-03-13 10:49:52 -08:00
Michal Migurski
b7618b13dc Added missing translation 2021-03-13 10:49:52 -08:00
Michal Migurski
68896d5b2f Switched to hash rockets syntax per erblint feedback 2021-03-13 10:49:52 -08:00
Michal Migurski
d28ab8d3f2 Replaced H2 messages header links with Bootstrap nav links 
Following suggestion from https://github.com/openstreetmap/openstreetmap-website/issues/2962#issuecomment-768985393
 2021-03-13 10:49:52 -08:00
translatewiki.net
f2cb3b09c8 Localisation updates from https://translatewiki.net. 2021-03-12 07:06:49 +01:00
Tom Hughes
01b84a8107 Merge remote-tracking branch 'upstream/pull/3125' 2021-03-10 14:55:58 +00:00
Andy Allan
38ad8fbc36 Use login_path instead of explicit controller and actions 
This makes future refactoring easier.
 2021-03-10 14:31:55 +00:00
Tom Hughes
b750c31d47 Update bundle 2021-03-10 10:38:13 +00:00
Morten Bruhn
6f09f5d49c Added natural=peninsula 2021-03-09 20:44:21 +01:00
Morten Bruhn
0067ccaefb Added natural=coastline 2021-03-09 20:42:57 +01:00