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

11652 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Allan
2013baa021
Merge pull request #3506 from danieldegroot2/website 
Make spelling for "website" consistent
 2022-03-22 17:53:11 +00:00
danieldegroot2
74bd0715bd
Update spelling for "website" to current standard 
Removed redundant space in "web site".
 2022-03-22 10:42:29 +01:00
Tom Hughes
7364f40fca Merge remote-tracking branch 'upstream/pull/3505' 2022-03-21 23:56:41 +00:00
dependabot[bot]
6903aa96b1
Bump actions/cache from 2.1.7 to 3 
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.7 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.7...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-21 23:06:12 +00:00
translatewiki.net
095187d08f Localisation updates from https://translatewiki.net. 2022-03-21 13:12:36 +01:00
Tom Hughes
778004694f Merge remote-tracking branch 'upstream/pull/3503' 2022-03-18 19:35:50 +00:00
mxdanger
0217582ff1 Fix SVG query icon font 2022-03-17 16:25:17 -07:00
translatewiki.net
b7f6b5df93 Localisation updates from https://translatewiki.net. 2022-03-17 13:12:39 +01:00
Tom Hughes
03cad948e3 Fix new rubocop warnings 2022-03-15 19:24:09 +00:00
Tom Hughes
04c697b468 Disable broken cop 
https://github.com/rubocop/rubocop-rails/issues/659
 2022-03-15 19:24:05 +00:00
Tom Hughes
4e6475a000 Update bundle 2022-03-15 18:25:20 +00:00
translatewiki.net
ba3bbeb618 Localisation updates from https://translatewiki.net. 2022-03-14 13:12:25 +01:00
Tom Hughes
c1e202d85a Merge remote-tracking branch 'upstream/pull/3496' 2022-03-12 00:31:03 +00:00
dependabot[bot]
5440bc4c02
Bump eslint from 8.10.0 to 8.11.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.10.0 to 8.11.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.10.0...v8.11.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-03-11 23:01:07 +00:00
translatewiki.net
014c2e80c0 Localisation updates from https://translatewiki.net. 2022-03-10 13:12:37 +01:00
Tom Hughes
385272bdae Mark redirects which need to be open with allow_other_host 2022-03-09 22:43:02 +00:00
Tom Hughes
99f5d51595
Merge pull request #3486 from tomhughes/vips 
Switch to using vips for image processing
 2022-03-09 18:58:54 +00:00
Andy Allan
770b367a13 Add vips to brew install list 2022-03-09 18:16:51 +00:00
Andy Allan
9809750401 Remove imagemagick from dependencies 2022-03-09 17:18:43 +00:00
Andy Allan
d6f8302eae
Merge pull request #3491 from tomhughes/legacy-trace 
Remove support for legacy trace files
 2022-03-09 17:10:40 +00:00
Andy Allan
13aead5601
Merge pull request #3492 from harry-wood/oauth-doc 
OAuth updates to CONFIGURE doc + cosmetic tweak
 2022-03-09 17:04:37 +00:00
Tom Hughes
44ac569d28 Merge remote-tracking branch 'upstream/pull/3493' 2022-03-08 20:30:19 +00:00
Tom Hughes
694d45cd31 Update to rails 7.0.2.3 2022-03-08 20:25:49 +00:00
mmd-osm
c9e836a6cb JSON output added to permissions endpoint 2022-03-08 20:21:35 +01:00
Tom Hughes
5d67fa3908 Fix some Naming/AccessorMethodName rubocop warnings 2022-03-08 19:10:05 +00:00
Tom Hughes
cfb4a70129 Fix Lint/DuplicateBranch rubocop warnings 2022-03-08 19:05:37 +00:00
Tom Hughes
dd8b1fa5a0 Update bundle 2022-03-08 18:21:32 +00:00
Harry Wood
02338a80e1 Make oauth register app link into button 
Cosmetic tweak. On the OAuth 1 setting tab, make "Register your app" into a button not a link

Also put the applications in a <ul>
 2022-03-08 15:18:53 +00:00
Harry Wood
ff671888f9 Update CONFIGURE instructions for oauth 
Update the instructions in CONFIGURE.md on how to set-up the built-in apps. Need to clarify that iD is on OAuth1, which is a little different from the 'web site' (Notes) set-up on OAuth2. Also iD requires more permissions these days.
 2022-03-08 13:57:18 +00:00
translatewiki.net
7fc9144bf7 Localisation updates from https://translatewiki.net. 2022-03-07 13:11:39 +01:00
Tom Hughes
5110b1c706 Merge remote-tracking branch 'upstream/pull/3489' 2022-03-05 10:08:53 +00:00
Harry Wood
51b7c3a5be More readable multi-line ruby in erbs 
A couple of erb files had unnecessary start and end erb tags around every line in a multi-line block of ruby. More readable this way.
 2022-03-05 02:56:43 +00:00
Harry Wood
80c639a6b5 Add newline to align with blocks_by 
`blocks_on.html.erb` is almost identical to `block_by.html.erb`. Add a newline to align with the other file (makes it easier to see the more subtle important difference)
 2022-03-05 02:45:50 +00:00
Harry Wood
2ce44a2a85 Fix minor HTML tag mismatches 
Fix some HTML tag mismatches and other glitches. These are minor, and don't appear to cause browsers any problems, but for the sake of correctness:
* A closing td which should be a closing div.
* A closing h3 for a corresponding h6
* Two tables with `<thead>` tag and missing `<tr>` around the `<th>` headings.

test change for thead fix
 2022-03-05 02:44:59 +00:00
Tom Hughes
cbcc7dc49f Fix some rubocop Naming/PredicateName warnings 2022-03-03 22:47:55 +00:00
Tom Hughes
92b122759f Remove support for legacy trace files 2022-03-03 19:47:40 +00:00
Tom Hughes
ddb140f387 Switch to using vips for image processing 2022-03-02 19:44:56 +00:00
Tom Hughes
e9a3e690d2 Drop support for Ubuntu 18.04 2022-03-02 19:44:56 +00:00
Tom Hughes
aef7439c56 Merge remote-tracking branch 'upstream/pull/3485' 2022-03-02 15:45:45 +00:00
Andy Allan
45487e1ff8 Merge branch 'pull/3472' 2022-03-02 15:00:25 +00:00
Harry Wood
71a34923d0 Fix redirecting links to osmfoundation.org 
Fix some links to osmfoundation.org pages which are redirecting (not broken links but this is just avoiding a slightly messy redirection)
 2022-03-02 14:44:22 +00:00
Tom Hughes
309bdd1e31 Merge remote-tracking branch 'upstream/pull/3484' 2022-03-02 00:07:14 +00:00
Tom Hughes
dc3e7ae24c Merge remote-tracking branch 'upstream/pull/3483' 2022-03-02 00:07:10 +00:00
dependabot[bot]
87ea9fcb02
Bump image_processing from 1.12.1 to 1.12.2 
Bumps [image_processing](https://github.com/janko/image_processing) from 1.12.1 to 1.12.2.
- [Release notes](https://github.com/janko/image_processing/releases)
- [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janko/image_processing/compare/v1.12.1...v1.12.2)

---
updated-dependencies:
- dependency-name: image_processing
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-01 23:37:28 +00:00
dependabot[bot]
1c977ddd0c
Bump actions/checkout from 2.4.0 to 3 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-01 23:06:48 +00:00
Tom Hughes
b5f06e06c1 Fix rubocop Rails/TimeZone warnings 2022-03-01 22:55:10 +00:00
Tom Hughes
304eb3b75c Enable open redirect protection 2022-03-01 18:39:08 +00:00
Tom Hughes
73426ea383 Merge remote-tracking branch 'upstream/pull/3482' 2022-03-01 10:27:30 +00:00
Tom Hughes
89b3633e86 Update bundle 2022-03-01 10:27:16 +00:00
Andy Allan
8938ab7997 Remove redundant presence validation on belongs_to 
There's no need for us to have it when rails does this for us.
 2022-03-01 10:01:16 +00:00