Commit graph

6595 commits

Author SHA1 Message Date
Andy Allan
1700c23dd1 Prefer find_by() instead of where().first
These are very similar, differing only if we would expect multiple
results and the sorting is important. However, in all our cases
we're only expecting one result to be returned, and so find_by is
easier to read.
2023-10-04 17:53:58 +01:00
Tom Hughes
c8fc2218e5 Merge remote-tracking branch 'upstream/pull/4226' 2023-10-03 19:39:41 +01:00
Milan Cvetkovic
64bcf7652b Add openid connect support using doorkeeper-openid_connect gem
... as discussed in [Issue 507](https://github.com/openstreetmap/operations/issues/507)
and described by @mmd-osm.

To activate, set the value of `doorkeeper_signing_key` to RSA private key.

Allows using openstreetmap as an identity provider.

Adds `openid` scope to OAuth2 authorizations, required to login to OSM.

Currently, the only claims returned are:
 - "openid" scope: "sub" and "preferred_username"
 - "read_email" scope: "email"
2023-10-03 18:53:47 +01:00
Anton Khorev
0fae5627a5 Remove <picture>s around <img srcset=...> 2023-10-03 03:06:12 +03:00
Tom Hughes
95041ec81a Merge remote-tracking branch 'upstream/pull/4269' 2023-10-02 18:53:14 +01:00
Tom Hughes
389b715241 Merge remote-tracking branch 'upstream/pull/4268' 2023-10-02 18:48:52 +01:00
Tom Hughes
0d420a8374 Merge remote-tracking branch 'upstream/pull/4266' 2023-10-02 18:47:21 +01:00
Anton Khorev
94fead62ec Remove <picture> from logo 2023-10-02 04:12:47 +03:00
Anton Khorev
3c5c376158 Remove custom color from changeset comments count 2023-10-02 02:32:47 +03:00
Anton Khorev
9768a01717 Remove custom opacity from changeset comments count 2023-10-02 02:32:03 +03:00
Anton Khorev
d60a873126 Remove rtl direction fix for <code> 2023-10-01 18:40:10 +03:00
Anton Khorev
839cc132b8 Limit nav color override to edit/history/export buttons 2023-10-01 18:16:36 +03:00
Anton Khorev
665f6d3d95 Write button instead of link for 'Where is this?' 2023-10-01 18:16:35 +03:00
Anton Khorev
e6e478f5b0 Make search input a direct child of input group 2023-10-01 17:49:31 +03:00
Andy Allan
520cffabea Upgrade to bootstrap 5.2 2023-09-29 09:41:35 +01:00
Andy Allan
ad4ed68037 Fix border settings used in workaround
Fixes #4263
2023-09-28 21:01:41 +01:00
Tom Hughes
32ffd66eb5 Merge remote-tracking branch 'upstream/pull/4260' 2023-09-28 16:35:05 +01:00
Andy Allan
14936150ac
Merge pull request #3690 from AntonKhorev/search-form-no-group
Stick search input and Go button together with flex instead of input group
2023-09-27 17:36:35 +01:00
Andy Allan
0a046673d6
Merge pull request #4201 from AntonKhorev/issues-limit-settings
Move max value of issues counter to settings
2023-09-27 15:47:44 +01:00
Andy Allan
a569343e01
Merge pull request #4249 from AntonKhorev/no-traces-nav-empty-li
Change traces feed and upload button alignment
2023-09-27 15:33:58 +01:00
Andy Allan
228ab23ce1
Merge pull request #4184 from AntonKhorev/print
Show sidebar in print media
2023-09-27 15:10:52 +01:00
Andy Allan
c975bae507 Workaround for dartsass vs bootstrap 5.1 bug 2023-09-27 09:35:30 +01:00
Tom Hughes
3e8bbe70fb Add whitespace 2023-09-22 17:54:18 +01:00
Paul Norman
00d085ed5d
Add Tracestrack Topo as featured layer 2023-09-19 22:16:42 -07:00
Tom Hughes
29c51d7915 Allow banners to have a start date as well as an end date 2023-09-19 09:33:03 +01:00
Marjan Van de Kauter
781b5166ce Add banner for State of the Map Europe 2023
Closes #4252
2023-09-19 09:17:30 +01:00
Anton Khorev
ed99c62874 Tweak sizes and alignment of traces rss/upload buttons 2023-09-14 21:00:57 +03:00
Tom Hughes
85b17a1f2a Merge remote-tracking branch 'upstream/pull/4240' 2023-09-14 17:42:04 +01:00
Anton Khorev
bdb4e025f8 Use start margin instead of empty <li> for gap before traces rss button 2023-09-14 18:02:55 +03:00
Andy Allan
841cff678b Refactor remaining sass division operators to use multiplication 2023-09-13 13:26:19 +01:00
Andy Allan
f3a4443120 Remove unusual margins and line-height from comments
This allows them to follow normal conventions used elsewhere, as
well as removing some custom css.
2023-09-13 13:18:30 +01:00
Andy Allan
5d4c96878a Remove sass division for export input boxes margins 2023-09-13 11:42:12 +01:00
Andy Allan
3c4f48e59b Remove custom styling from export alternative sources dl
These were mostly the same as the bootstrap defaults.
2023-09-13 11:35:55 +01:00
Andy Allan
5473be178a Refactor the directions table to use bootstrap table styling
This allows us to remove some custom CSS
2023-09-13 11:30:50 +01:00
Andy Allan
d45c1435e6 Use spacer for margins on leaflet popups 2023-09-13 10:58:36 +01:00
Andy Allan
0a41b19bbc Use an inline list for the login auth buttons 2023-09-13 10:58:36 +01:00
Andy Allan
ffe637f23d Use multiplication for secondary-actions margin and padding
This avoids using the sass division operator, which is deprecated.
2023-09-13 10:58:36 +01:00
Andy Allan
79868aeae7 Remove unnecessary paragraph margin override on diary comments 2023-09-13 10:58:36 +01:00
Tom Hughes
144c48737b Merge remote-tracking branch 'upstream/pull/4239' 2023-09-10 18:47:07 +01:00
Tom Hughes
7ac0e897ff Merge remote-tracking branch 'upstream/pull/4245' 2023-09-10 17:24:16 +01:00
Anton Khorev
4b92988555 Add comment ids to changeset discussion api responses 2023-09-10 17:30:06 +03:00
Anton Khorev
9c9edb6054 Remove authorize_web call from traces api controller 2023-09-09 19:40:28 +03:00
Anton Khorev
9442829d31 Add json output for show user block api 2023-09-09 16:50:36 +03:00
Anton Khorev
71654e563e Add show user block api endpoint 2023-09-09 15:53:22 +03:00
Anton Khorev
e143726f1a Combine comments and traces pagination partials 2023-09-09 14:33:59 +03:00
Anton Khorev
a780a7456f Don't interpolate in pagination partial 2023-09-09 14:33:58 +03:00
Anton Khorev
ea86f8f682 Make pagination partial view 2023-09-09 14:23:12 +03:00
Anton Khorev
c213abb8e3 Refactor diary paging queries 2023-09-09 14:23:11 +03:00
Anton Khorev
299c59e34f Change diary comments pagination to before/after id 2023-09-09 14:23:10 +03:00
Tom Hughes
0e21afc565 Merge remote-tracking branch 'upstream/pull/4241' 2023-09-08 18:09:00 +01:00