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

6545 commits

Author SHA1 Message Date
Tom Hughes
fea1b5b88d Fix new rubocop warnings 2021-12-28 19:47:51 +00:00
Tom Hughes
0ca2e10b1d Merge remote-tracking branch 'upstream/pull/3404' 2021-12-22 15:36:25 +00:00
Tom Hughes
5a70476d38 Merge remote-tracking branch 'upstream/pull/3403' 2021-12-22 15:26:23 +00:00
Andy Allan
99a64ba8c1 Remove unused require statement 
The corresponding code was removed in a65cb84288
 2021-12-22 15:08:06 +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
a863be8831 Rename User#delete to User#destroy 
"delete" is generally used for immediate SQL deletion without running
any callbacks or other ruby code, whereas "destroy" will trigger callbacks.

Although we don't currently use any callbacks, let's rename this method to
align better with the convention.
 2021-12-22 11:32:33 +00:00
Tom Hughes
b244905cd2 Add a rake task to migrate trace data to ActiveStorage 2021-12-16 18:45:31 +00:00
Tom Hughes
0410596908 Switch traces to use ActiveStorage 2021-12-16 18:45:31 +00:00
Tom Hughes
ef85e8c7b3 Make the storage service to use for avatars configurable 2021-12-16 18:45:31 +00:00
Adam Hoyle
46875fdde3
Merge branch 'master' into feature/add-communities-page 2021-12-14 10:42:42 +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
1a65c279aa Merge remote-tracking branch 'upstream/pull/3382' 2021-11-25 17:19:26 +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
Adam Hoyle
764f808d5a Remove hand rolled i18n support 2021-11-24 22:47:19 +00:00
Adam Hoyle
ad900553cb Add relevant osm-community-index data into I18n 2021-11-24 22:22:32 +00:00
Andy Allan
3aa8292d6d Drop the trace_use_job_queue option 
This has been set as true by default, and in production, for many
years. I don't think there's much use in keeping the setting around
any longer.
 2021-11-24 15:23:27 +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
8249b41a83 Remove some unused thumbnail rules 
These are all done with flex grids now, so no need to float the image anywhere
 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
514ec41c58 Remove unused browse-field style rules 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
f433fb3d4e Remove border-radius parameter 
This overrides the same variable from bootstrap. Since bootstrap
also comes with -sm and -lg variants defined by rem, our px-based
override doesn't sit nicely with those.
 2021-11-24 12:24:08 +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
846bacd665 Remove the custom flash styling for sidebar flashes 
The flash partial is now based on flexbox, so these positioning classes
are no longer required
 2021-11-24 12:07:31 +00:00
Andy Allan
b43aaa1d58 Remove the floating from the sidebar close buttons 
These are mostly positioned with flexbox, and those that aren't
are covered by the similar close-wrap selector elsewhere in this file
 2021-11-24 12:07:07 +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
abbd5a30d4 Validate any origin passed the auth failure callback 
Fixes #3375
 2021-11-23 17:33:19 +00:00
Tom Hughes
407b61857e Improve fallback behaviour for unsafe referer redirects 2021-11-23 17:18:41 +00:00
Tom Hughes
31e638474a Handle authentication failure callbacks with no message 2021-11-23 17:01:06 +00:00
Tom Hughes
64457dbbd0 Handle exceptions rendering flash messages 2021-11-23 16:55:06 +00:00
Tom Hughes
d951621c44 Make safe_referer handle invalid URIs 2021-11-23 11:27:02 +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
Tom Hughes
02fb858956 Send plain errors for non HTML resources 
Without this we throw a second error when we can't find a view
of the correct format and issue a 500 response.
 2021-11-16 12:44:52 +00:00
Tom Hughes
e3966479a6 Fix new rubocop warnings 2021-11-16 08:48:35 +00:00
Tom Hughes
e21b9b2bf1 Merge remote-tracking branch 'upstream/pull/3365' 2021-11-11 15:33:08 +00:00
Andy Allan
75749cc540 Convert remaining heading titles to use h1 
This makes them consistent with all the other pages that use h1
in the `content_for :heading` sections
 2021-11-11 15:12:23 +00:00
Andy Allan
3719e8defb Remove the userinformation ids from headings 
The style rule was removed in 3f8cf32272
and they were otherwise only used in the tests.
 2021-11-11 14:53:36 +00:00
Tom Hughes
425818913b Merge remote-tracking branch 'upstream/pull/3363' 2021-11-10 18:26:34 +00:00
Tom Hughes
8da015ac88 Merge remote-tracking branch 'upstream/pull/3362' 2021-11-10 18:21:01 +00:00
Andy Allan
9c9bf153cd Simplify user_image and user_thumbnail css 
Now that all uses of the images and thumbnails have been migrated
to flex grids, we can remove the margin and padding from the original
css classes and revert to using them.
 2021-11-10 15:30:42 +00:00
Andy Allan
a9ca2fe7e7 fixup popup 2021-11-10 15:29:28 +00:00
Andy Allan
dc67e54958 Use grid for dashboard map popups 2021-11-10 15:19:31 +00:00
Andy Allan
aa77ff5aec Use flex grid for issue reports and comments 2021-11-10 15:06:54 +00:00
Andy Allan
2c9d2486ec Use flex grid for diary index headings 2021-11-10 14:54:54 +00:00
Andy Allan
afce5886f4 Rework diary entries to use grid when a heading thumbnail is shown 
This happens on the index page, but not individual show pages. I've
reversed the if condition to avoid having an else on a negative
condition.
 2021-11-10 14:46:52 +00:00
Andy Allan
ee9c8ff7c8 Use grid for diary entry heading layout 
This brings it into line with the user profile, which has a similar heading
 2021-11-10 14:41:27 +00:00