Commit graph

5995 commits

Author SHA1 Message Date
Tom Hughes
84c601460f Add rate limiting to user friendships 2021-05-11 12:10:36 +01:00
Tom Hughes
0e78061cdb Merge remote-tracking branch 'upstream/pull/3029' 2021-04-29 19:42:51 +01:00
Andy Allan
2955fe4d4b Refactor user blocks information to use a dl
This also standardises the labels to have the colon, in common with
oauth_clients#show.
2021-04-28 17:28:30 +01:00
Andy Allan
dbf35e0cf6 Merge branch 'pull/3146' 2021-04-28 16:03:57 +01:00
Andy Allan
02bfc46ab3 Move duration to its own line, so that it can be clearly labelled 2021-04-28 16:01:03 +01:00
Andy Allan
7158426ebb
Merge pull request #3169 from harry-wood/empty-lists
Display message when the there are no notes/comments to display
2021-04-28 10:36:09 +01:00
Andy Allan
28af501924 Merge branch 'pull/3164' 2021-04-14 16:13:29 +01:00
Andy Allan
6bb18436a3 Add tests for routing and to ensure output format
This avoids the tests passing if the json output is an array of kv pairs,
instead of the desired hash of attributes.
2021-04-14 16:11:57 +01:00
Harry Wood
95d682119a Display no diary comments message when empty
Display a 'No diary comments' message when there are no diary comments to display, rather than an empty table.
2021-04-10 00:47:20 +01:00
Harry Wood
de8ee536b1 Display no notes message when empty
Display a 'No notes' message when there are no notes to display, rather than an empty table with pagination features.
2021-04-09 19:21:09 +01:00
Andy Allan
b70da7b8ea
Merge pull request #1558 from plarus/master
Add start url and indicate minimal-ui is sufficient when added as a PWA.
2021-04-08 14:01:08 +01:00
Michal Migurski
143a90fcac Added root elements and dict support for preferences response 2021-04-07 17:45:24 -07:00
plarus
2b5e705006
Update manifest.json.erb
Change for minimal-ui
2021-04-07 19:45:58 +02:00
Tom Hughes
2d111c0f34 Merge remote-tracking branch 'upstream/pull/3166' 2021-04-07 16:44:06 +01:00
Andy Allan
6f2e3e9508 Add missing root attributes to User#show and User#index json responses 2021-04-07 16:30:08 +01:00
Andy Allan
094d6c8bb9 Move confirmation methods into ConfirmationsController 2021-04-07 16:05:32 +01:00
Andy Allan
7a66c6d4eb Split password reset functionality into PasswordsController 2021-04-07 16:05:28 +01:00
Michal Migurski
fd7526857b Updated JSON response format per feedback 2021-04-06 21:44:38 -07:00
Michal Migurski
a67ff9c038 Added JSON support to user preferences 2021-04-06 21:27:54 -07:00
Tom Hughes
e0d501f832 Don't allow deleted users to be confirmed 2021-04-01 17:28:03 +01:00
Tom Hughes
25510b6616 Add additional limits on sending messages
Additional limits apply to new accounts and accounts with
unresolved issues reported against them.

Fixes #3135
2021-03-31 22:40:34 +01:00
Tom Hughes
bf3743f190 Add missing callbacks to session controller 2021-03-29 20:36:07 +01:00
Andy Allan
12228510c3 Fix registration link
Fixes #3156
2021-03-29 14:57:41 +01:00
Andy Allan
f18baae22e Refactor login/logout into sessions controller
Certain controller methods are shared with oauth-based logins, and these have been
moved to a concern.
2021-03-24 11:32:46 +00:00
polarbearing
b4e2f8e34f
Show the crafted duration of a block independent of the reading time
Fixes #3143.
Not tested by myself. Treat like pseudocode, I don't speak Ruby.
2021-03-23 12:37:14 +01:00
Tom Hughes
4c2e4de5c0 Handle errors checking for gravatars 2021-03-21 10:24:53 +00:00
Andy Allan
a08fe1c291 Use list-inline to achieve spacing between elements on a line
This is a better solution than spans and margins. Additionally, rework
to use mb-* instead of my-* (bootstrap advises against using margin-top)
and get rid of <br>s by using paragraphs instead.
2021-03-17 18:57:36 +00:00
Tom Hughes
e2db409872 Merge remote-tracking branch 'upstream/pull/3138' 2021-03-17 18:16:15 +00:00
Andy Allan
4dc584421a Refactor traces list display
Ideas taken from #3036
2021-03-17 18:04:00 +00:00
Andy Allan
6f70c13062 Use .add method for adding errors
This avoids a deprecation warning on rails 6.1
2021-03-17 17:09:34 +00:00
Andy Allan
a2ddcda911 Merge branch 'pull/3112' 2021-03-17 16:07:43 +00:00
Tom Hughes
93b8c47c8f Reject referers that do not include an absolute path 2021-03-16 11:07:34 +00:00
Tom Hughes
afb22209bf Allow form submission to any location from the login page
This allows openid login to work on browsers like chrome that enforce
the form-action rule for redirect POST requests.

Fixes #3131
2021-03-14 10:18:32 +00:00
Michal Migurski
f5f84027fa Chasing parse errors 2021-03-13 10:49:52 -08:00
Michal Migurski
68896d5b2f Switched to hash rockets syntax per erblint feedback 2021-03-13 10:49:52 -08:00
Michal Migurski
d28ab8d3f2 Replaced H2 messages header links with Bootstrap nav links
Following suggestion from https://github.com/openstreetmap/openstreetmap-website/issues/2962#issuecomment-768985393
2021-03-13 10:49:52 -08:00
Tom Hughes
01b84a8107 Merge remote-tracking branch 'upstream/pull/3125' 2021-03-10 14:55:58 +00:00
Andy Allan
38ad8fbc36 Use login_path instead of explicit controller and actions
This makes future refactoring easier.
2021-03-10 14:31:55 +00:00
Tom Hughes
d8b9b6dd58 Merge remote-tracking branch 'upstream/pull/3121' 2021-03-04 13:45:34 +00:00
Tom Hughes
d66541124f Merge remote-tracking branch 'upstream/pull/3120' 2021-03-04 13:45:31 +00:00
Andy Allan
18b8780f21 Remove CSS overrides for the login page at small screen sizes
Some of these selectors no longer apply, and the one that did just
made the behaviour worse, so they are all no longer required.
2021-03-04 11:09:16 +00:00
Andy Allan
9bd1d74091 Prevent input group wrapping when sidebar is resized
Fixes #3119
2021-03-04 11:04:47 +00:00
Andy Allan
1c1bfd7488 Add a small margin before the changesets more button
See also #2717
2021-03-03 17:46:01 +00:00
Andy Allan
3fdf1e204a Remove unnecessary margin-tops 2021-03-03 17:16:31 +00:00
Andy Allan
926576881f Remove final uses of the deemphasize class 2021-03-03 15:51:11 +00:00
Andy Allan
952cf0fdb4 Remove the old richtext_area helper
This has been superseded by the `f.richtext_field` custom form builder.
2021-03-03 15:34:16 +00:00
Tom Hughes
2233edbcfa Use a 307 Temporary Redirect to redirect to authentication
When the user wants to enable an external authenticator we need
to redirect to omniauth but that now needs to be a POST so use a
redirect that preserves the POST method.

Fixes #3114
2021-03-03 09:27:33 +00:00
Tom Hughes
ff3a30d245 Fix new rubocop warnings 2021-03-02 08:24:15 +00:00
Andy Allan
df1ec6b680 Remove standard-form CSS rules 2021-02-24 14:48:10 +00:00
Andy Allan
f7b8b114a6 Convert the search forms to bootstrap
This moves the forms to a flex grid, albeit with a little twiddling
to get things working in a compact space.
2021-02-24 12:21:51 +00:00