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

12252 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
d2ca26f0e6 Merge remote-tracking branch 'upstream/pull/3771' 2022-10-26 18:16:58 +01:00
Andy Allan
46e184efb8 Add guidance on making pull requests easier to review 2022-10-26 16:00:13 +01:00
Anton Khorev
dbcf256976 Use close button instead of geolink in sidebar content 2022-10-26 15:49:13 +03:00
Anton Khorev
34a8d08209 Merge changeset <ol>s on Load more 2022-10-26 15:02:49 +03:00
Tom Hughes
3d0b94abda Merge remote-tracking branch 'upstream/pull/3768' 2022-10-25 19:28:10 +01:00
Tom Hughes
a544895e6c Merge remote-tracking branch 'upstream/pull/3765' 2022-10-25 19:27:01 +01:00
Tom Hughes
460ed0c844 Fix new rubocop warnings 2022-10-25 19:19:57 +01:00
Tom Hughes
9ecaa43e88 Update bundle 2022-10-25 18:09:39 +01:00
Anton Khorev
225b260640 Pass min/max lat/lon to notes index rss builder 2022-10-25 13:52:28 +03:00
Anton Khorev
0c8b9eabf3 Pass min/max lat/lon to notes rss feed builder 2022-10-25 13:35:18 +03:00
translatewiki.net
1e1e61adaa Localisation updates from https://translatewiki.net. 2022-10-24 13:13:08 +02:00
Brian DeRocher
8eb2abc10c get_text("reversegeocode/result") returns an XML node. We want to get the text value of that node. 
This will unescape &#039; into an apostrophe.

All callers of this function will later re-encode it depending out output whether it be HTML in an email, or XML in an RSS feed.

* app/mailers/user_mail.rb
* app/helpers/geocode_helper.rb
* app/views/api/notes/feed.rss.builder
* app/views/api/notes/_note.rss.builder

Fixes openstreetmap/openstreetmap-website#3761
 2022-10-23 16:04:01 -04:00
Tom Hughes
f407def8ba Merge remote-tracking branch 'upstream/pull/3763' 2022-10-23 18:26:29 +01:00
Andy Allan
b1c798c42b
Merge pull request #3764 from openbrian/patch-3 
another trailing space
 2022-10-23 14:49:07 +01:00
Brian DeRocher
14883a01f7
another trailing space 
My editor does this too.  There's one more trailing space in this area of the file.
 2022-10-22 17:31:32 -04:00
dependabot[bot]
09431c1f82
Bump eslint from 8.25.0 to 8.26.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.25.0 to 8.26.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.25.0...v8.26.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-21 23:00:39 +00:00
translatewiki.net
747f6c02ec Localisation updates from https://translatewiki.net. 2022-10-20 13:14:54 +02:00
Tom Hughes
59ac72b213 Merge remote-tracking branch 'upstream/pull/3758' 2022-10-19 18:18:24 +01:00
Andy Allan
aa78da82fe
Merge pull request #3694 from AntonKhorev/share-button-group 
Use Bootstrap button group for share tabs
 2022-10-19 16:24:08 +01:00
Andy Allan
2e34b62fac Merge branch 'pull/3692' 2022-10-19 16:14:33 +01:00
Andy Allan
2837e9970f Minor tweaks to the markdown, in particular to wrap code characters in backticks 2022-10-19 16:11:57 +01:00
Andy Allan
3bea64f4cc
Merge pull request #3693 from lectrician1/patch-2 
Clarify Windows installation bad + alternatives
 2022-10-19 16:00:08 +01:00
Andy Allan
b0a741412f
Merge pull request #3700 from AntonKhorev/about 
Replace <h5> used to set the font size with Bootstrap class h5
 2022-10-19 15:58:17 +01:00
Andy Allan
0917201893
Merge pull request #3704 from AntonKhorev/leaflet-control-groups 
Group map controls explicitly
 2022-10-19 15:42:08 +01:00
Tom Hughes
a5b7e5695a Update bundle 2022-10-18 18:43:21 +01:00
Tom Hughes
140b296f59 Test that tags are included correctly in the changeset feed 2022-10-18 18:42:02 +01:00
Tom Hughes
365aee7991 Merge remote-tracking branch 'upstream/pull/3755' 2022-10-17 18:58:47 +01:00
Malte Gerken
4492118dbc
Fix malformed tags table in changeset atom feed 2022-10-17 15:37:07 +02:00
translatewiki.net
915aeccabb Localisation updates from https://translatewiki.net. 2022-10-17 13:12:21 +02:00
Tom Hughes
5a28ff2901 Require multi_json for windowslive logins 
The windowslive omniauth plugin needs multi_json but doesn't require
it and the omniauth core is no longer doing so.
 2022-10-16 19:28:37 +01:00
Tom Hughes
a9063f8369 Allow credentials to be sent with overpass calls 2022-10-13 19:12:25 +01:00
translatewiki.net
b33565f6f4 Localisation updates from https://translatewiki.net. 2022-10-13 13:13:06 +02:00
Tom Hughes
d6586275e9 Unflip the heading text on the new user screen for RTL languages 
Fixes #3752
 2022-10-12 08:48:29 +01:00
Tom Hughes
2da7976763 Update bundle 2022-10-11 18:30:10 +01:00
translatewiki.net
c4786916af Localisation updates from https://translatewiki.net. 2022-10-10 13:12:41 +02:00
Tom Hughes
685eef338d Merge remote-tracking branch 'upstream/pull/3747' 2022-10-09 18:10:20 +01:00
Tom Hughes
206b6c9aef Merge remote-tracking branch 'upstream/pull/3746' 2022-10-09 18:10:17 +01:00
Tom Hughes
9a7559696b Merge remote-tracking branch 'upstream/pull/3741' 2022-10-09 17:59:26 +01:00
Anton Khorev
6616d5e1ba Don't scroll to or show markers of notes with no data 2022-10-09 09:08:45 +03:00
Anton Khorev
15d2efe2df Display icon for current note only if this icon is defined 2022-10-09 08:03:14 +03:00
dependabot[bot]
cf462c15df
Bump eslint from 8.24.0 to 8.25.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.24.0 to 8.25.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.24.0...v8.25.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-07 23:00:56 +00:00
translatewiki.net
5d3dd2ff64 Localisation updates from https://translatewiki.net. 2022-10-06 13:14:26 +02:00
Tom Hughes
d1dba97ac4 Merge remote-tracking branch 'upstream/pull/3739' 2022-10-06 08:13:32 +01:00
Tom Hughes
31d27da6bc Merge remote-tracking branch 'upstream/pull/3736' 2022-10-06 07:59:57 +01:00
Tom Hughes
c054e8fa65 Fix concurrency groups for github actions 2022-10-05 22:49:17 +01:00
Anton Khorev
a419f8890a Load note from edit link with remote control 2022-10-06 00:42:04 +03:00
Tom Hughes
106ac7269d Merge remote-tracking branch 'upstream/pull/3737' 2022-10-05 22:27:07 +01:00
Anton Khorev
6d5ba4651a Remove whitespace eslint complaining about 2022-10-05 23:15:34 +03:00
Anton Khorev
809a8b3db0 Remove note from edit link when it's not a current object 2022-10-05 22:58:33 +03:00
Tom Hughes
d8c1b28fde Add some whitespace for readability 2022-10-05 19:00:16 +01:00