Commit graph

6372 commits

Author SHA1 Message Date
Tom Hughes
e91c02f2ce Merge remote-tracking branch 'upstream/pull/3297' 2021-09-15 18:44:23 +01:00
Andy Allan
dfcecb0118 Remove the ObjectMetadata concern, since it's only used in tests now 2021-09-15 17:05:50 +01:00
Andy Allan
baea8dc10e Remove unused to_xml and to_xml_node methods from models 2021-09-15 17:05:50 +01:00
Andy Allan
76f1d7bc78 Use a builder to render changeset downloads 2021-09-15 16:33:04 +01:00
Andy Allan
9aa17258fc Use flexbox to position user thumbnails on the dashboard
This fixes a poor interaction involving lots of margins and the secondary-actions list
2021-09-15 14:30:32 +01:00
Andy Allan
99abdeb683 Refactor paragraph margin to avoid custom css 2021-09-15 14:29:15 +01:00
Andy Allan
31e247c1e2 Restore the grey border around the user image on the profile page
This approach keeps the look without adding in the margins (and floats)
which are inappropriate for the flex-based layout.
2021-09-15 14:11:05 +01:00
Andy Allan
dfaea75c27 Use an 'inline' dl to unify the appearance of the mapper and admin info details lines 2021-09-15 13:19:56 +01:00
Andy Allan
3b1ef97c69 Move the admin actions into line with the other links
This avoids wrapping them under the user profile picture
2021-09-15 11:57:58 +01:00
Tom Hughes
8a9dbc94c8 Update rubocop todo and fix new warnings 2021-09-14 20:40:36 +01:00
Paul Norman
b1b2b52477
Add Fastly as top three donor 2021-09-08 20:05:47 -07:00
Adam Hoyle
a57bc158fd Improve encapsulation / location of osm-community-index files 2021-09-08 20:44:35 +01:00
Adam Hoyle
4bcc88161c Refactor osm-community-index and local chapters models 2021-09-08 18:11:50 +01:00
Tom Hughes
f4d1d97848 Add a privileged scope that allows email addresses to be returned 2021-08-26 17:22:25 +01:00
Tom Hughes
6c6e8883f7 Introduce privileged scopes that only an administrator can enable 2021-08-26 17:22:24 +01:00
Adam Hoyle
9d5fd432ee Prioritise strings[].name over strings[].community 2021-08-25 22:00:41 +01:00
Adam Hoyle
db8d437ae3 Remove failed attempt to stop internal methods being public 2021-08-25 21:12:51 +01:00
Adam Hoyle
d7a965bf3f Reinstate memoisation 2021-08-25 21:03:33 +01:00
Adam Hoyle
0a3b052cf6 Improve method privacy 2021-08-24 21:38:05 +01:00
Adam Hoyle
94f9c2b86f Tidy 2021-08-24 21:38:05 +01:00
Adam Hoyle
8f529a337f Localise local chapters 2021-08-24 21:38:05 +01:00
Tom Hughes
cc461b126d Correct policing of access to private user details 2021-08-24 17:49:08 +01:00
Tom Hughes
29e9857145 Improve behaviour of secondary action lists when wrapping
Based on https://stackoverflow.com/a/31732902 this ensure that when
a secondary action list wraps the additional lines don't start with
an item delimiter by pushing it to the left, outside of a parent nav
element which then hides it.
2021-08-21 15:38:00 +01:00
Andy Allan
6ab522b2b3 Convert account setting menu to tabs, and include on other pages
This makes it easier to navigate around these pages. Since each tab
corresponds to a given controller, this makes the selection of active
tabs straightforward.
2021-08-18 14:30:35 +01:00
Andy Allan
3f8cf32272 Refactor the profile page to move the profile information out of the header
This makes it look like other normal pages, along with removing the unusual full-width class.
2021-08-18 13:33:14 +01:00
Andy Allan
cb7b79a58f Split the non-public information off of the profile page
This opens up many possibilities for more interesting things to be
shown on the dashboard, as well as making it easier to find if
you have lots of content in your profile.
2021-08-18 13:32:36 +01:00
Tom Hughes
7d46f5db60 Fix new rubocop warnings 2021-08-17 18:17:18 +01:00
Adam Hoyle
62ecf15975 Merge branch 'master' into feature/add-communities-page 2021-08-12 19:41:12 +01:00
Tom Hughes
9778714046 Merge remote-tracking branch 'upstream/pull/3293' 2021-08-12 18:10:54 +01:00
Tom Hughes
700bf13279 Merge remote-tracking branch 'upstream/pull/3292' 2021-08-12 17:57:54 +01:00
Andy Allan
2436f9e580 Use named paths for diary comments path 2021-08-12 17:57:40 +01:00
Andy Allan
536dee8fc7 Use named paths for various user blocks links 2021-08-12 17:57:40 +01:00
Andy Allan
d797de4317 Use user_account_path for links to settings page
Much easier to read than having to be explicit about controllers etc
2021-08-12 17:09:07 +01:00
Andy Allan
06d73857d1 Avoid using raw html in translations for links.
This is a followup to 26698d6 which introduced the html. It's better
to use interpolation for links, since this avoids the translations
from introducing html syntax errors.

I had to change the translation key, since changing the interpolation
variables alone would lead to breakages.
2021-08-12 16:35:54 +01:00
Andy Allan
57302832a4 Update the link for changing your editor preferences
I've left the internal name of the link the same, to avoid having to
change the translation key and retranslate everything.
2021-08-12 16:30:34 +01:00
Adam Hoyle
5df061f558 improve link ordering 2021-08-12 09:53:43 +01:00
Adam Hoyle
3eb80baaea tidy up / remove debug 2021-08-12 09:43:27 +01:00
Adam Hoyle
116cfe2f4d render local chapters in html 2021-08-11 23:45:58 +01:00
Adam Hoyle
59e6cdebdc add osm-community-index and parse in communities 2021-08-11 23:45:44 +01:00
Adam Hoyle
26aecfb2bf add route to pass locale 2021-08-10 10:13:24 +01:00
Tom Hughes
26698d6d26 Use correct link for users with no location
Fixes #3290
2021-08-09 18:29:54 +01:00
Adam Hoyle
86912a61df stub model and show in view 2021-08-08 23:28:44 +01:00
Adam Hoyle
ffc6b697f0 add communities page 2021-08-08 23:27:34 +01:00
Adam Hoyle
d8d1ab1776 add route for communities 2021-08-07 15:46:39 +01:00
Tom Hughes
08e2a06e41 Merge remote-tracking branch 'upstream/pull/3279' 2021-07-28 20:18:07 +01:00
Andy Allan
36f6d8d85d Fix redirect to terms path when not logged in
This was missed during #3147 since it wasn't covered by a test.
2021-07-28 16:36:13 +01:00
Andy Allan
dd9eca9346 Switch to html5-compatible fragment encoding for wikipedia URLs
Fixes #3269

In the HTML4 days, fragments weren't allowed to have `%` signs, so
mediawiki generated fragments with `%` replaced with a `.`

In HTML5, fragments can have % encoded characters, and so in 2017
wikipedia switched over to this for their automatically generated
fragments, while keeping the "dot" versions available as a fallback.

However, we have been automatically converting all fragments,
including manually specified anchors that do not have "dot"-encoded
versions available. So we can now simplify everything by just using
the HTML5 percent-encoded fragments.
2021-07-28 16:01:48 +01:00
Andy Allan
ab8d3485bd Use our darkgrey for bootstrap secondary colour
Our blue is less saturated and lighter, and so the bootstrap-default
secondary colour is too dark and too saturated when beside our
primary buttons.
2021-07-28 14:17:55 +01:00
Tom Hughes
e842c7be97 Add missing autocomplete attributes 2021-07-27 19:36:47 +01:00
Tom Hughes
9bf0dee51a Update path to js-cookie 2021-07-27 08:18:53 +01:00