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

11932 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tom Hughes
2122d1843e Restore asset debugging in development mode 2022-02-28 18:47:51 +00:00
Harry Bond
fd33b6e17f Fix opensearch icon & update attribution 
Fixes #3478
Closes #3479
 2022-02-28 18:38:36 +00:00
translatewiki.net
b819ab6abb Localisation updates from https://translatewiki.net. 2022-02-28 13:11:32 +01:00
Tom Hughes
f76dfc77b8 Add missing PG_MODULE_MAGIC to database function source 2022-02-27 11:35:31 +00:00
Tom Hughes
1f14f2c9de Merge remote-tracking branch 'upstream/pull/3474' 2022-02-26 00:39:52 +00:00
dependabot[bot]
6fd0c36751
Bump eslint from 8.9.0 to 8.10.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.9.0 to 8.10.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.9.0...v8.10.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-02-25 23:01:05 +00:00
translatewiki.net
873739ac1e Localisation updates from https://translatewiki.net. 2022-02-24 13:12:32 +01:00
Tom Hughes
2cd7af7e0b Merge remote-tracking branch 'upstream/pull/3470' 2022-02-23 20:38:21 +00:00
Andy Allan
619ac4c5b2 Enable active_record.belongs_to_required_by_default 
This switches the logic so that belongs_to parent objects must exist
by default, and marks the optional ones explicitly. This is reflected
in the null/not_null status on the relevant db columns.
 2022-02-23 20:33:28 +00:00
Tom Hughes
7de6943ebe Merge remote-tracking branch 'upstream/pull/3469' 2022-02-23 19:27:27 +00:00
Tom Hughes
03fdc6d67f Add inverse_of to relationships that can't detect it automatically 2022-02-23 19:23:51 +00:00
Andy Allan
cc99d8169f Remove default values from id columns 
In both the case of primary keys, and also foreign key references,
there's no need to set a default value.

This doesn't have a big impact in routine situations, but can be
very confusing when debugging corner cases.
 2022-02-23 15:22:37 +00:00
Andy Allan
3cf3b3ce4e Specify inverse_of for trace tags and points 
Rails can't automatically detect bi-directional relationships when
`:foreign_key` is present. Adding the `inverse_of` helps when validating
traces and tags that haven't yet been saved.
 2022-02-23 15:15:07 +00:00
Tom Hughes
172a71e3f2 Disable partial inserts 2022-02-22 19:16:10 +00:00
Tom Hughes
5b3edb8075 Switch to rails 7 default headers 
These are basically all the same as what secure_headers
was already setting for us anyway.
 2022-02-22 19:13:02 +00:00
Tom Hughes
fe79965869 Merge remote-tracking branch 'upstream/pull/3462' 2022-02-22 19:06:43 +00:00
Tom Hughes
398a39dd0a Make sure the object layer is kept in front of the data layer 2022-02-22 18:55:34 +00:00
Tom Hughes
97bb135957 Don't highlight selected items in the data layer 
Routing to the feature page is going to cause them to be overlaid
in orange anyway so there's no need for the blue highlight.
 2022-02-22 18:54:40 +00:00
Tom Hughes
b66f7a30d0 Update bundle 2022-02-22 18:11:16 +00:00
Tom Hughes
29d2f48214 Deep copy the original style when highlighting an object 
Fixes #3465
 2022-02-21 22:48:22 +00:00
Tom Hughes
a5508cfba1 Enable automatic scope inversing 2022-02-21 19:11:58 +00:00
Tom Hughes
b86390d303 Use a button element for button_to 2022-02-21 19:11:58 +00:00