Tom Hughes
f2656f925e
Uniqify counts for containing ways and relations on browse pages
...
Fixes #3519
2022-03-30 22:26:39 +01:00
mxdanger
0217582ff1
Fix SVG query icon font
2022-03-17 16:25:17 -07:00
Tom Hughes
385272bdae
Mark redirects which need to be open with allow_other_host
2022-03-09 22:43:02 +00:00
Andy Allan
d6f8302eae
Merge pull request #3491 from tomhughes/legacy-trace
...
Remove support for legacy trace files
2022-03-09 17:10:40 +00:00
Andy Allan
13aead5601
Merge pull request #3492 from harry-wood/oauth-doc
...
OAuth updates to CONFIGURE doc + cosmetic tweak
2022-03-09 17:04:37 +00:00
Tom Hughes
44ac569d28
Merge remote-tracking branch 'upstream/pull/3493'
2022-03-08 20:30:19 +00:00
mmd-osm
c9e836a6cb
JSON output added to permissions endpoint
2022-03-08 20:21:35 +01:00
Tom Hughes
5d67fa3908
Fix some Naming/AccessorMethodName rubocop warnings
2022-03-08 19:10:05 +00:00
Tom Hughes
cfb4a70129
Fix Lint/DuplicateBranch rubocop warnings
2022-03-08 19:05:37 +00:00
Harry Wood
02338a80e1
Make oauth register app link into button
...
Cosmetic tweak. On the OAuth 1 setting tab, make "Register your app" into a button not a link
Also put the applications in a <ul>
2022-03-08 15:18:53 +00:00
Harry Wood
51b7c3a5be
More readable multi-line ruby in erbs
...
A couple of erb files had unnecessary start and end erb tags around every line in a multi-line block of ruby. More readable this way.
2022-03-05 02:56:43 +00:00
Harry Wood
80c639a6b5
Add newline to align with blocks_by
...
`blocks_on.html.erb` is almost identical to `block_by.html.erb`. Add a newline to align with the other file (makes it easier to see the more subtle important difference)
2022-03-05 02:45:50 +00:00
Harry Wood
2ce44a2a85
Fix minor HTML tag mismatches
...
Fix some HTML tag mismatches and other glitches. These are minor, and don't appear to cause browsers any problems, but for the sake of correctness:
* A closing td which should be a closing div.
* A closing h3 for a corresponding h6
* Two tables with `<thead>` tag and missing `<tr>` around the `<th>` headings.
test change for thead fix
2022-03-05 02:44:59 +00:00
Tom Hughes
cbcc7dc49f
Fix some rubocop Naming/PredicateName warnings
2022-03-03 22:47:55 +00:00
Tom Hughes
92b122759f
Remove support for legacy trace files
2022-03-03 19:47:40 +00:00
Andy Allan
45487e1ff8
Merge branch 'pull/3472'
2022-03-02 15:00:25 +00:00
Tom Hughes
b5f06e06c1
Fix rubocop Rails/TimeZone warnings
2022-03-01 22:55:10 +00:00
Andy Allan
8938ab7997
Remove redundant presence validation on belongs_to
...
There's no need for us to have it when rails does this for us.
2022-03-01 10:01:16 +00:00
Harry Bond
fd33b6e17f
Fix opensearch icon & update attribution
...
Fixes #3478
Closes #3479
2022-02-28 18:38:36 +00:00
Andy Allan
619ac4c5b2
Enable active_record.belongs_to_required_by_default
...
This switches the logic so that belongs_to parent objects must exist
by default, and marks the optional ones explicitly. This is reflected
in the null/not_null status on the relevant db columns.
2022-02-23 20:33:28 +00:00
Tom Hughes
03fdc6d67f
Add inverse_of to relationships that can't detect it automatically
2022-02-23 19:23:51 +00:00
Andy Allan
3cf3b3ce4e
Specify inverse_of for trace tags and points
...
Rails can't automatically detect bi-directional relationships when
`:foreign_key` is present. Adding the `inverse_of` helps when validating
traces and tags that haven't yet been saved.
2022-02-23 15:15:07 +00:00
Tom Hughes
fe79965869
Merge remote-tracking branch 'upstream/pull/3462'
2022-02-22 19:06:43 +00:00
Tom Hughes
398a39dd0a
Make sure the object layer is kept in front of the data layer
2022-02-22 18:55:34 +00:00
Tom Hughes
97bb135957
Don't highlight selected items in the data layer
...
Routing to the feature page is going to cause them to be overlaid
in orange anyway so there's no need for the blue highlight.
2022-02-22 18:54:40 +00:00
Tom Hughes
29d2f48214
Deep copy the original style when highlighting an object
...
Fixes #3465
2022-02-21 22:48:22 +00:00
Tom Hughes
b86390d303
Use a button element for button_to
2022-02-21 19:11:58 +00:00
Tom Hughes
cb8419456b
Apply bootstrap styling to "make public" button
2022-02-21 19:11:58 +00:00
Tobias Speicher
be878df097
Replace deprecated String.prototype.substr()
...
String.prototype.substr() is deprecated (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr ) so we replace it with slice() which works similarily but isn't deprecated.
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
2022-02-20 22:11:11 +01:00
Tom Hughes
1f8df781be
Merge remote-tracking branch 'upstream/pull/3398'
2022-02-16 18:13:16 +00:00
Andy Allan
2fabc46421
Merge pull request #3440 from mmd-osm/relationmemberlimit
...
Introduce relation member limit
2022-02-16 14:58:30 +00:00
Tom Hughes
53aa7259bb
Merge remote-tracking branch 'upstream/pull/3345'
2022-02-13 18:39:21 +00:00
Andy Allan
6c1d73a509
Allow users to delete their own accounts
...
This PR allows users to delete their own accounts. The logic implemented matches
that currently used by the admins when they manually close accounts, although
there is room to be more complex in future e.g. completely removing accounts
with no content.
The error handling has been slightly adapted for namespaced controllers, by
anchoring the controller name with a leading forward slash.
2022-02-09 16:15:24 +00:00
Tom Hughes
446837c351
Merge remote-tracking branch 'upstream/pull/3419'
2022-02-03 18:37:12 +00:00
Andy Allan
2d47d6b4f8
Ensure that deactivate isn't available in production
...
It's only used as a workaround for factories not being able to create
pending users while keeping active as the default
2022-02-02 17:48:17 +00:00
Andy Allan
2731e7244a
Add extra user transitions needed by the administrators
2022-02-02 16:37:50 +00:00
mmd-osm
2efd73c672
Introduce relation member limit
...
Adds a new parameter `max_number_of_relation_members` in settings.yml
2022-02-02 13:15:40 +01:00
Tom Hughes
81c58571c5
Fix route for "go public" button on the account edit page
2022-01-28 12:39:39 +00:00
Tom Hughes
c59471842f
Merge remote-tracking branch 'upstream/pull/3420'
2022-01-18 19:03:32 +00:00
Tom Hughes
988d7cd90d
Remove form_action restrictions for sessions#login
...
Login may redirect to ouath2_authorizations#create which may then
redirect to arbitrary schemes if the application is already authorized
so we need to allow login to redirect to any scheme.
Fixes #3424
2022-01-17 11:01:07 +00:00
Tom Hughes
ff995e7ea3
Restore form_action restrictions for ouath2_authorizations#create
2022-01-17 11:00:41 +00:00
Tom Hughes
707ebddbb5
Remove form_action restrictions for ouath2_authorizations#create
...
Fixes #3424
2022-01-17 09:33:28 +00:00
Nick Doiron
a4f601b114
rm spaces
2022-01-12 19:16:09 -05:00
Nick Doiron
e9522b0205
add dir="auto" to search fields
...
Improves right-to-left text input support
2022-01-12 19:06:18 -05:00
Andy Allan
1a11c4dc19
Use a state machine for user status
...
The user status is a bit complex, since there are various states and
not all transitions between them make sense.
Using AASM means that we can name and restrict the transitions, which
hopefully makes them easier to reason about.
2022-01-12 18:16:14 +00:00
Tom Hughes
d6da1499fc
Avoid putting ActionController::Parameters objects in the session
2022-01-11 19:43:43 +00:00
Tom Hughes
6403515897
Replace to_s on TimeWithZone objects with to_formatted_s
2022-01-10 18:59:22 +00:00
Tom Hughes
dcaf21602c
Merge remote-tracking branch 'upstream/pull/3409'
2022-01-05 18:40:13 +00:00
Tom Hughes
8e8f6ef990
Attempt to avoid polynomial time matches on user supplied data
2022-01-05 18:38:15 +00:00
Andy Allan
4bed9c12a0
Fix display of suspension message when a user is suspended mid-session
...
Without the ability defined, the user is still logged out, but then
the deny_access check redirects to the login page. The re-login attempt
would then fail anyway, with an error message, but let's fix the abilities
and use the intended page.
2022-01-05 18:21:42 +00:00
