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

6047 commits

Author SHA1 Message Date
Sky
c9442b669d
Fix small error in _header.html.erb 2022-06-16 00:14:34 +03:00
Tom Hughes
9adad9f90d Fix new rubocop warnings 2022-06-14 19:04:39 +01:00
Anton Khorev
95fa01c8f8 Margins for 'comment from' / 'reported by' lines on issues page 2022-06-10 17:22:15 +03:00
Tom Hughes
a3a228862c Add validation for relation member roles 
Fixes #3563
 2022-06-09 19:21:08 +01:00
Anton Khorev
7d47845264 Wrap issue comment rich text in div 2022-06-09 19:20:36 +01:00
Anton Khorev
9936b00d82 Wrap issue report rich text in div 2022-06-09 19:20:02 +01:00
Tom Hughes
16210d9f4f Rename id_oauth_application to id_application in settings 2022-06-08 13:28:07 +01:00
Martin Raifer
c55d346d5f
Update to iD v2.21.0 
major changes in this release:
* dropped support for Internet Explorer 11
* switched authentication to OAuth 2

for further changes please refer to https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#2210
 2022-06-03 15:32:27 +02:00
Tom Hughes
a3617b492e Drop AOL and Wordpress login links 
Fixes #3555
 2022-05-20 18:25:15 +01:00
Tom Hughes
40ec4734fb Fix new rubocop warnings 2022-05-16 19:16:53 +01:00
Andy Allan
68d6b7279e Use a secondary-actions nav for issue actions 
This fits with actions on other pages, avoids using pipe characters,
and resolves an issue with empty paragraphs.
 2022-05-11 16:09:46 +01:00
Harry Wood
3ca8b63643 Put issue comments through kramdown formatter 
On issue comments (which only admins can create or see), put the `body` text through kramdown formatting.
 2022-05-06 13:36:59 +01:00
Harry Wood
fcbccb6a44 Report verification render not redirect 
Fix an issue with the report verification, causing it to lose the text of a report if the user fails to fill in a category.

By using a `render` instead of a `redirect_to`, the rails standard verification behaviour works better. It means we also get a nice red "can't be blank" message highlighting the specific missing field.
 2022-05-04 19:42:36 +01:00
Harry Wood
b9659cdfc5 Add kramdown info box with preview button 2022-04-29 01:33:18 +01:00
Harry Wood
9401e451d1 Format report text with kramdown 
Pass the text of reports ('details' field) through the RichText formatter to give us kramdown formatting support.
 2022-04-29 01:31:39 +01:00
Andy Allan
0348ceb3d7 Rework common details to avoid awkward line breaks 
Fixes #3435

Also brings the location information into the list, which avoids a
lack of padding before the next header.
 2022-04-27 11:47:42 +01:00
Tom Hughes
877867537b Fix eslint warning 2022-04-18 14:23:02 +01:00
Tom Hughes
2f6eebcd97 Update to leaflet 1.8.0 2022-04-18 14:10:06 +01:00
Tom Hughes
9c0582f88f Merge remote-tracking branch 'upstream/pull/3523' 2022-04-12 17:12:16 +01:00
Tom Hughes
7f619c6484 Check API status before authorizing access 
Fixes #3530
 2022-04-11 20:47:52 +01:00
Tom Hughes
6ef6ddc14d Make database_offline mode work 
Fixes #3529
 2022-04-11 20:28:11 +01:00
Andy Allan
387668a4c6
Merge pull request #3495 from mmd-osm/patch/json_cs 
JSON output added to changeset(s) endpoints
 2022-04-06 18:04:17 +01:00
Andy Allan
561ee71129 Rubocop autofix: ambiguous operator precedence 
This simply adds braces to clarify which mathematical operator comes
first.
 2022-04-06 14:55:29 +01:00
Tom Hughes
f2656f925e Uniqify counts for containing ways and relations on browse pages 
Fixes #3519
 2022-03-30 22:26:39 +01:00
mxdanger
0217582ff1 Fix SVG query icon font 2022-03-17 16:25:17 -07:00
mmd-osm
4ec85171fd JSON output added to changeset(s) endpoints 2022-03-14 15:52:49 +01:00
Tom Hughes
385272bdae Mark redirects which need to be open with allow_other_host 2022-03-09 22:43:02 +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
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
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
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
Andy Allan
45487e1ff8 Merge branch 'pull/3472' 2022-03-02 15:00:25 +00:00
Tom Hughes
b5f06e06c1 Fix rubocop Rails/TimeZone warnings 2022-03-01 22:55:10 +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
Harry Bond
fd33b6e17f Fix opensearch icon & update attribution 
Fixes #3478
Closes #3479
 2022-02-28 18:38:36 +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
03fdc6d67f Add inverse_of to relationships that can't detect it automatically 2022-02-23 19:23:51 +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
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
29d2f48214 Deep copy the original style when highlighting an object 
Fixes #3465
 2022-02-21 22:48:22 +00:00