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

5649 commits

Author SHA1 Message Date
Tom Hughes
99e537859a Fix HTML escaping issues with user role icons 2020-11-13 15:13:37 +00:00
Tom Hughes
bfffe7ed96 Prefer string interpolation to concatenation 2020-11-13 11:32:28 +00:00
Tom Hughes
45d4242f9d Improve readability 2020-11-13 10:51:01 +00:00
Tom Hughes
4347d9d3b0 Merge remote-tracking branch 'upstream/pull/2921' into master 2020-11-13 10:49:35 +00:00
Tom Hughes
582402ba8f Prefer keyword arguments when method has optional boolean arguments 2020-11-13 10:22:55 +00:00
Andy Allan
78b9d92207 Prefer keyword arguments when method has optional boolean arguments 2020-11-12 11:24:44 +00:00
Andy Allan
c8e1b3c662 Prefer string interpolation to concatenation in erb files 2020-11-11 14:44:42 +00:00
Andy Allan
01b72f7adf Fix missing html layout for user_mailer emails 
This was caused by renaming the mailer without renaming the layout. Added a test to cover this in future.

Fixes #2903
 2020-11-11 11:19:20 +00:00
Tom Hughes
20ce10a9ef Allow redirects to authentication services from the settings page 
Chrome and Safari require redirects to match the form-action rule
as well as the original submission address.
 2020-10-29 21:29:35 +00:00
Andy Allan
52c688f55a Prefer string interpolation to concatenation 2020-10-28 17:15:14 +01:00
Andy Allan
847536c80d Avoid some uses of html_safe 
We can use `html_safe` on non-interpolated strings, since that's trusted content.
 2020-10-28 14:45:20 +01:00
Quincy Morgan
b1694ce39e Update to iD v2.19.0 2020-10-27 17:46:24 -04:00
Tom Hughes
8a42bc2eff Merge remote-tracking branch 'upstream/pull/2890' 2020-10-21 20:53:15 +01:00
Tom Hughes
2f03522c42 Fix close handler for welcome message 2020-10-21 20:51:10 +01:00
Tom Hughes
e9ad6d852c Merge remote-tracking branch 'upstream/pull/2901' 2020-10-21 20:51:03 +01:00
Andy Allan
c233bec67b Use flexbox to position the close icon on the sidebars 
This ensures that the text and the close icon don't overlap, regardless
of the length of the title. The title div grows to use all available
space, while ensuring the text breaks if necessary to prevent it from
pushing the close icon offscreen.
 2020-10-21 17:11:28 +02:00
Andy Allan
2559226be3 Avoid various uses of html_safe 
We can avoid using `html_safe` in various circumstances, through alternative approaches like i18n keys ending in `_html` or using `safe_join` to avoid converting via unsafe string types.

The `_html` keys approach only work for ActionView helper version of `t`, not the base `I18n.t` method.
 2020-10-21 15:43:14 +02:00
Hidde Wieringa
cde4ac61a2
Also fix private road 2020-10-17 17:00:40 +02:00
Hidde Wieringa
2fe408d5f9
Update icon for destination access in map key 2020-10-17 16:56:42 +02:00
Andy Allan
2c1033f62d Rename Notifier to UserMailer 
It's a convention in rails to name your mailers with a Mailer suffix, and is also common to name the class after the recipient (e.g. User, Admin). So UserMailer seems a reasonable choice.
 2020-10-14 15:04:58 +02:00
Tom Hughes
3b56c005eb Merge remote-tracking branch 'upstream/pull/2838' 2020-09-30 11:57:18 +01:00
Tom Hughes
ddac660f3b Merge remote-tracking branch 'upstream/pull/2839' 2020-09-30 11:54:30 +01:00
Tom Hughes
7db541d697 Invalidate existing sessions when changing email or password 
As we don't have any way to actually find the active sessions for
an account we instead store a fingerprint in the session, and refuse
to use any session with a different fingerprint.
 2020-09-29 14:34:08 +01:00
Tom Hughes
c694c78c9a Delete any outstanding tokens when a user changes their email 
This ensures that any tokens previously sent to the old email address
can no longer be used if somebody were able to access that address.
 2020-09-29 13:47:40 +01:00
mmd-osm
37a7996d94 API User details: format tweaks 
- _show_ to return single user only
- remove nesting for languages
 2020-09-18 21:50:38 +02:00
Andy Allan
a988ad6f51 Style changeset descriptions with italics on browse pages 
Alternative to #580

This reworks changeset descriptions to use italics instead of header
elements, in order to make them more like quotes.

Care has been taken to make sure that there is still a header element
as the first element of the common details partial, in order to make
the history pages look right (where the partial appears multiple times).
 2020-09-16 18:51:20 +02:00
Tom Hughes
6078e642ba Fix erblint warnings 2020-09-16 16:59:10 +01:00
Andy Allan
b4b59df75e Show linked features as collapsable detail panels on feature browse pages 
Fixes #2823

The panels are collapsed by default, when there is a long list of features, but
open on short lists to save on clicks. 10 items is arbitrary but seemed reasonable.
 2020-09-16 15:28:03 +02:00
Andy Allan
f70ec18989
Merge pull request #2809 from tomhughes/bootstrap 
Convert some more forms to use bootstrap
 2020-09-16 10:43:21 +02:00
Tom Hughes
70c4a750d7 Fix new rubocop warnings 2020-09-16 08:28:25 +01:00
Tom Hughes
18b9b9f14c Fix new rubocop warnings 2020-09-07 07:11:22 +01:00
mmd-osm
0fb725ea61 API User details JSON format 2020-09-06 22:11:23 +02:00
Tom Hughes
9e75b8472f Convert oauth authorization form to use bootstrap 2020-09-04 00:36:43 +01:00
Tom Hughes
21adea321b Convert password reset forms to use bootstrap 2020-09-04 00:36:43 +01:00
Tom Hughes
c11142d5c0 Convert logout form to use bootstrap 2020-09-03 23:52:59 +01:00
Tom Hughes
e33848091e Convert user confirmation forms to use bootstrap 2020-09-03 23:51:23 +01:00
Tom Hughes
434b18b8ef Convert make/remove friend forms to use bootstrap 2020-09-03 23:49:32 +01:00
Tom Hughes
c2af89c00e Fix rubocop Style/SoleNestedConditional warnings 2020-09-02 18:54:55 +01:00
Tom Hughes
b7432e9432 Handle new rubocop warnings 2020-09-02 07:18:21 +01:00
Tom Hughes
e05748a9ff Make embed.js depend on the settings 2020-08-28 09:08:28 +01:00
Tom Hughes
8d34b03232 Only show the "too many messages" error once 
Fixes #2790
 2020-08-23 10:41:39 +01:00
Tom Hughes
6855616870 Allow CDN URL for the embed page to be configured 2020-08-19 21:44:24 +01:00
Tom Hughes
c597ead529 Merge remote-tracking branch 'upstream/pull/2783' 2020-08-19 17:39:18 +01:00
Tom Hughes
5c551d475f Merge remote-tracking branch 'upstream/pull/2782' 2020-08-19 17:31:56 +01:00
Andy Allan
adfb4dc619 Refactor client application pages to use bootstrap forms 
Also rework the client application show page to be responsive
 2020-08-19 16:58:43 +02:00
Andy Allan
a2c1fe7930 Avoid showing table header when there are no results 2020-08-19 16:58:43 +02:00
Andy Allan
56ed381a7d Rework issue search form to use Bootstrap form layout 2020-08-19 16:58:43 +02:00
Andy Allan
8df3010766 Refactor reports form to use bootstrap 2020-08-19 16:58:43 +02:00
Andy Allan
613b748c55 Avoid lego translations for coordinates 
Use the i18n system for joining coordinate values together, while
avoiding making any changes or standardisation involving the exact
symbol used in each situation.

Refs #2732
 2020-08-19 16:43:16 +02:00
Andy Allan
94008d9059 Fix remaining unstyled buttons by moving to bootstrap buttons 2020-08-19 14:54:36 +02:00