Commit graph

3057 commits

Author SHA1 Message Date
Anton Khorev
9ac70151a8 Load map key data in controller 2023-12-08 12:55:18 +03:00
Tom Hughes
e78aee9585 Merge remote-tracking branch 'upstream/pull/4371' 2023-12-07 16:19:23 +00:00
Tom Hughes
38bcc001e3 Merge remote-tracking branch 'upstream/pull/4392' 2023-12-07 16:06:22 +00:00
Anton Khorev
800106c72b Allow to omit zoom levels for map key entries 2023-12-07 12:38:24 +03:00
Andy Allan
4bca24a7be Resourceful routing for passwords
This also matches the routes used by devise
2023-12-06 18:41:00 +00:00
Andy Allan
1d0f588d62 Use path and url helpers for password links 2023-12-06 18:39:25 +00:00
Tom Hughes
ddf6689e9e Merge remote-tracking branch 'upstream/pull/4389' 2023-12-06 17:50:42 +00:00
Anton Khorev
e4cce5d539 Remove unused .current from primary nav 2023-12-04 05:10:41 +03:00
Anton Khorev
6950f44a71 Update color of mapnik map key for lakes 2023-12-04 02:15:41 +03:00
Tom Hughes
45f0589e62 Merge remote-tracking branch 'upstream/pull/4329' 2023-11-28 22:21:50 +00:00
Andy Allan
9026b84d84
Merge pull request #4296 from AntonKhorev/header-flex
Use flex container instead of floats in header
2023-11-22 17:22:46 +00:00
Anton Khorev
14bd660114 Disable delete account button if there are recent changesets 2023-11-22 17:37:04 +03:00
Milan Cvetkovic
60c885d071 Welcome screen displays 'Continue with authorization'
do not hide notes
2023-11-21 11:56:09 +00:00
Anton Khorev
e90d48adc9 Remove 'basic attributes' comments from changeset api output builders 2023-11-20 15:39:27 +03:00
Anton Khorev
b5679e16db Disable text wrapping while measuring header width 2023-11-17 10:27:38 +03:00
Anton Khorev
693fe3b587 Switch to flex header container 2023-11-17 10:27:38 +03:00
Tom Hughes
2fcee9625d Merge remote-tracking branch 'upstream/pull/4349' 2023-11-15 22:30:41 +00:00
Andy Allan
0195dd60a4 Simplify date display by using friendly_date helpers 2023-11-15 19:46:10 +00:00
Andy Allan
0058765a4e Avoid wrapping friendly_date with abbr tags 2023-11-15 19:45:48 +00:00
Andy Allan
bc9c492c48 Use friendly_date helpers for revoking user blocks 2023-11-15 19:44:10 +00:00
Andy Allan
100a7f8979 Use friendly_date for note disappear description
There's no need to reimplement this in its own helper.
2023-11-15 19:36:35 +00:00
Andy Allan
026fce06f4 Use the friendly_data_ago helper for contacts on the dashboard
Also take the opportunity to fix the translation key.
2023-11-15 19:21:51 +00:00
Nick Doiron
a88f7db586 Format right-to-left and bi-di text in OSM tag values 2023-11-15 09:36:18 -06:00
Tom Hughes
1ce5d7dec1 Merge remote-tracking branch 'upstream/pull/4297' 2023-11-14 17:19:54 +00:00
Anton Khorev
562e7e7d32 Remove some tag table custom css 2023-11-14 17:17:18 +00:00
Anton Khorev
41f7670ee2 Remove $spacer css from sidebar content 2023-11-14 08:22:43 +03:00
Tom Hughes
4ed7387551 Merge remote-tracking branch 'upstream/pull/4343' 2023-11-13 18:44:16 +00:00
Tom Hughes
96ee97ff93 Merge remote-tracking branch 'upstream/pull/4341' 2023-11-13 18:40:55 +00:00
Tom Hughes
b8609d2eae Merge remote-tracking branch 'upstream/pull/4340' 2023-11-13 18:39:32 +00:00
Anton Khorev
138aaf0f7a Remove custom css and large left margin for map noscript message 2023-11-13 12:24:51 +03:00
Anton Khorev
4ba24bdd5d Remove some custom css for pages with embedded iD 2023-11-13 10:46:17 +03:00
Anton Khorev
65e1ee6836 Remove custom css and unnecessary div nesting of welcome panel 2023-11-13 10:11:42 +03:00
Anton Khorev
77be0e3225 Remove relative position from sidebar child divs other than banners 2023-11-13 09:46:11 +03:00
Anton Khorev
8a3607860e Set banner close button background/opacity with Bootstrap 2023-11-12 10:17:06 +03:00
Anton Khorev
afce238f6c Use dark theme to invert banner close button 2023-11-12 10:13:48 +03:00
Tom Hughes
ef4c9a3306 Make change set comment rate limit errors display properly
Fixes #4320
2023-11-02 10:08:19 +00:00
Andy Allan
98bfaace9a
Merge pull request #4170 from osmcz/cuzk
Add contributor info for Czechia for copyright web page
2023-10-26 13:06:56 +01:00
Tom Hughes
3023c070ea Merge remote-tracking branch 'upstream/pull/4303' 2023-10-20 17:07:07 +01:00
Anton Khorev
abf5342845 Remove some print-related custom css 2023-10-20 17:26:51 +03:00
Anton Khorev
62ba143c3c Remove some search/directions custom css 2023-10-20 16:58:59 +03:00
tom.k
016ab83a22 add contributor info for Czechia 2023-10-19 08:22:32 +02:00
Anton Khorev
5e0792631a Remove subscribe/unsubscribe button custom css 2023-10-18 17:37:36 +03:00
Tom Hughes
83d9f1f164 Merge remote-tracking branch 'upstream/pull/4295' 2023-10-17 18:49:58 +01:00
Tom Hughes
2ce6bf383a Merge remote-tracking branch 'upstream/pull/4294' 2023-10-17 18:47:24 +01:00
Anton Khorev
74a87d55e7 Replace secondary nav buttons custom css with classes 2023-10-17 17:35:14 +03:00
Anton Khorev
3fc971d03c Enable focus outline on More button 2023-10-17 17:21:25 +03:00
Anton Khorev
7eee48b761 Decrease directions button height to match Go button 2023-10-17 12:26:29 +03:00
Anton Khorev
afdfda9557 Remove some h1/logo custom css 2023-10-16 12:32:06 +03: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