Commit graph

2773 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
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
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
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
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
Tom Hughes
f2656f925e Uniqify counts for containing ways and relations on browse pages
Fixes #3519
2022-03-30 22:26:39 +01:00
mmd-osm
4ec85171fd JSON output added to changeset(s) endpoints 2022-03-14 15:52:49 +01: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
mmd-osm
c9e836a6cb JSON output added to permissions endpoint 2022-03-08 20:21:35 +01: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
cb8419456b Apply bootstrap styling to "make public" button 2022-02-21 19:11:58 +00:00
Tom Hughes
1f8df781be Merge remote-tracking branch 'upstream/pull/3398' 2022-02-16 18:13:16 +00:00
Andy Allan
2fabc46421
Merge pull request #3440 from mmd-osm/relationmemberlimit
Introduce relation member limit
2022-02-16 14:58:30 +00:00
Andy Allan
6c1d73a509 Allow users to delete their own accounts
This PR allows users to delete their own accounts. The logic implemented matches
that currently used by the admins when they manually close accounts, although
there is room to be more complex in future e.g. completely removing accounts
with no content.

The error handling has been slightly adapted for namespaced controllers, by
anchoring the controller name with a leading forward slash.
2022-02-09 16:15:24 +00:00
Tom Hughes
446837c351 Merge remote-tracking branch 'upstream/pull/3419' 2022-02-03 18:37:12 +00:00
Andy Allan
2731e7244a Add extra user transitions needed by the administrators 2022-02-02 16:37:50 +00:00
mmd-osm
2efd73c672 Introduce relation member limit
Adds a new parameter `max_number_of_relation_members` in settings.yml
2022-02-02 13:15:40 +01:00
Tom Hughes
81c58571c5 Fix route for "go public" button on the account edit page 2022-01-28 12:39:39 +00:00
Nick Doiron
a4f601b114
rm spaces 2022-01-12 19:16:09 -05:00
Nick Doiron
e9522b0205
add dir="auto" to search fields
Improves right-to-left text input support
2022-01-12 19:06:18 -05:00
Andy Allan
1a11c4dc19 Use a state machine for user status
The user status is a bit complex, since there are various states and
not all transitions between them make sense.

Using AASM means that we can name and restrict the transitions, which
hopefully makes them easier to reason about.
2022-01-12 18:16:14 +00:00
Tom Hughes
6403515897 Replace to_s on TimeWithZone objects with to_formatted_s 2022-01-10 18:59:22 +00:00
Tom Hughes
fea1b5b88d Fix new rubocop warnings 2021-12-28 19:47:51 +00:00
Andy Allan
40e8482825 Alias the user creation_time column
This allows rails to set the created_at automatically, and so avoids
us from having to do so in a callback. It also hides the unusual
db column name from the rest of the app.
2021-12-22 14:48:07 +00:00
Andy Allan
a8e8ba1a64 Refactor the account edit/update pages out into a separate accounts controller 2021-12-08 15:17:50 +00:00
Tom Hughes
4eecd59a5d Merge remote-tracking branch 'upstream/pull/3380' 2021-11-25 17:15:54 +00:00
Tom Hughes
5dfbf00776 Merge remote-tracking branch 'upstream/pull/3378' 2021-11-25 17:15:10 +00:00
Andy Allan
c343f3ed3e Prevent flash messages from expanding offscreen
Because we are using an edge-to-edge layout for the flash messages,
the negative margins on the row were expanding the element offscreen.

Bootstrap provides a "no-gutter" class for removing these margins,
but that also drops the spacing between columns which we want to preserve.
So instead we use a margin override on the row only.

Additionally, drop some padding css in favour of a utility class

Fixes #3351

Bug was introduced in 3dd639c8d0
2021-11-24 14:32:36 +00:00
Andy Allan
675f72fe35 Use flex grid to position changeset discussion subscribe button
This avoids needing any floats. Also remove buttons class from two
locations, since there is a min-width on that class and it affects
the button styling negatively for standalone buttons
2021-11-24 12:24:16 +00:00
Andy Allan
cb68450ac7 Simplify margins when showing diary entries 2021-11-24 12:24:16 +00:00
Andy Allan
3bc20b6f21 Pass classes to override the default thumbnail_tiny style, rather than having another selector overriding 2021-11-24 12:24:16 +00:00
Andy Allan
52cd62bf13 Replace CSS-driven borders with bootstrap borders
This makes future refactoring easier, since the elements will
retain their borders even if the hierarchy changes.

Also round some maps and the legale section since I think those now
look nicer.
2021-11-24 12:24:16 +00:00
Andy Allan
300cd884ec Use flex grid instead of floating to position changeset element paging nav
This works much better when either the heading or the paging is long.

The heading was moved into the partial to avoid repetitive grid definitions
2021-11-24 12:07:49 +00:00
Andy Allan
18c70fa2de Add a user link to the heading of the diary comments page
Fixes #3369

This makes the heading match the layout of the user's Notes page,
which also has a short heading and a subheading with a link.

Additionally, add a page title, again for consistency
2021-11-24 10:55:09 +00:00
Tom Hughes
87bf5648c8 Drop es5 polyfill 2021-11-19 18:09:49 +00:00
Tom Hughes
d8da12f587 Drop use of html5shiv
Fixes #3367
2021-11-18 17:20:07 +00:00