Commit graph

11110 commits

Author SHA1 Message Date
Tom Hughes
8d76be71bb Merge remote-tracking branch 'upstream/pull/3177' 2021-06-24 08:43:18 +01:00
Tom Hughes
36b0a3d135 Merge remote-tracking branch 'upstream/pull/3232' 2021-06-23 21:36:57 +01:00
Andy Allan
0876ea0bee Refactor terms declined flash message to use a partial
This allows us to include a link in the flash message, without having
to use html_safe. Also refactor to avoid having html angle brackets in
the translation strings, while still allowing locale-specific urls.
2021-06-23 20:11:19 +01:00
Andy Allan
3dd639c8d0 Refactor flash messages to use a flex row for positioning
This works better for narrow widths and needs less custom CSS.
2021-06-23 20:11:19 +01:00
Andy Allan
7809bfa027 Ensure that all floated elements in the header stay within it
In certain circumstance, due to either extreme narrow screen widths,
or due to padding on floating elements exceeding the header height,
some things could appear outwith the header. This clearfix avoids
this from happening.
2021-06-23 20:11:19 +01:00
Andy Allan
e9a3c55e83 Remove unnecessary padding-bottom override on the header h1 2021-06-23 20:11:19 +01:00
Andy Allan
40589960be Use paragraphs instead of line breaks, and avoid using html in translation strings 2021-06-23 20:11:19 +01:00
Andy Allan
24f6aeda6a Use hash-based flash objects to render complex flash messages
Since flash objects can only be String, Hash or Array (notably excluding SafeBuffers), then this approach is necessary to render complex html in a safe manner.

Each local can be treated as an (unsafe) string, and therefore escaped normally when rendered into the template. The template (and translation strings) can
contain html since they are no longer stored in the flash as a plain string.

Fixes #3215
2021-06-23 20:10:55 +01:00
Tom Hughes
1096b3b8e2 Don't mark banner cookies as HttpOnly
Fixes #3231
2021-06-23 15:08:45 +01:00
Tom Hughes
f6818bb2ed Avoid accidental locale changes in tests 2021-06-22 19:05:55 +01:00
Tom Hughes
63e4a89323 Fix new ruboop warnings 2021-06-22 18:34:15 +01:00
Tom Hughes
449b2b869a Update bundle 2021-06-22 18:18:47 +01:00
Tom Hughes
4f63234e23 Merge remote-tracking branch 'upstream/pull/3229' 2021-06-21 22:21:09 +01:00
Martin Raifer
6b73edc415 add banner for SotM 2021 2021-06-21 21:42:05 +02:00
translatewiki.net
aefcc52411 Localisation updates from https://translatewiki.net. 2021-06-21 12:36:39 +02:00
Tom Hughes
11cf957460 Merge remote-tracking branch 'upstream/pull/3227' 2021-06-19 14:45:23 +01:00
dependabot[bot]
44fe2417b8
Bump eslint from 7.28.0 to 7.29.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.28.0 to 7.29.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.28.0...v7.29.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-18 23:00:40 +00:00
Tom Hughes
4a45092e27 Remove the Yahoo OpenID link as they no longer support OpenID 2021-06-17 22:33:05 +01:00
Tom Hughes
d02b8d9f1e Merge remote-tracking branch 'upstream/pull/3226' 2021-06-16 18:07:38 +01:00
Tom Hughes
086f31f291 Merge remote-tracking branch 'upstream/pull/3225' 2021-06-16 18:06:40 +01:00
Tom Hughes
35d24fac88 Merge remote-tracking branch 'upstream/pull/3224' 2021-06-16 18:04:02 +01:00
Tom Hughes
0d55497fca Merge remote-tracking branch 'upstream/pull/3222' 2021-06-16 18:01:43 +01:00
Andy Allan
a32854fa52 Wrap the rss and upload buttons in a div, with suitable padding for both vertical and horizontal tab layouts
This ensures it looks right when the tabs are collapsed vertically.
2021-06-16 17:08:26 +01:00
Andy Allan
81ad715474 Rework tabs to use flexbox
This improves the behaviour on small widths, where the tabs stack neatly. It also avoids the use of ml-auto which isn't RTL compatible.

The change in indentation is because it was previously coded with multiple li nested inside another li
2021-06-16 16:48:23 +01:00
Andy Allan
62349d1856 Make tab labels into nouns that describe what's on the tab
I think that works better with tabs, whereas actions (verbs) work better with buttons.
2021-06-16 16:27:45 +01:00
Andy Allan
7996b84380 Rearrange tabs for inter-page consistency
The all traces tab comes first, since it's shown on every page as you click around. Otherwise the tabs appear to be constantly rearranging themselves.
2021-06-16 16:26:25 +01:00
Michal Migurski
33f9b7c55f Fixed remaining erblint complaint 2021-06-16 15:55:55 +01:00
Michal Migurski
d133d0ab1b Fixed missing translation test failures 2021-06-16 15:55:55 +01:00
Michal Migurski
21eafac304 Fix erblint complaints 2021-06-16 15:55:55 +01:00
Tobias Jordans
f4e998804d Traces#index: Introduce tab navigation, fix tag-filter
- introduce bootstrap tabs to switch the views
- introduce `content_for :heading_class` to remove the padding below the bootstrap tabs
- update the rss-image to use a svg, adopted from https://icons.getbootstrap.com/icons/rss/ (without the outer border)
- move rss- and new-button away from the view-switching actions
- the `@tag` logic was broken. introduce new link to remove the tag-filter; the tabs keep the filter once given; use params[:tag] directly in the view
- use `&.` syntax nil-safety so we can remove `@display_name`
2021-06-16 15:55:55 +01:00
Andy Allan
db5501bb77 Remove unused padding classes
These were last used for sidebar padding, which is now handled more easily.
2021-06-16 15:45:59 +01:00
Andy Allan
c8f0a81eb7 Rework sidebar to use padding on the sidebar_content div
This saves every header, list, paragraph etc having to sort out their own padding. The couple of instances where we want edge-to-edge can be acheived using the negative margin spacing utilities.

The padding is based on $spacer so that it can be adjusted automatically via bootstrap configuration.

This also means that we can remove many (mis-)uses of the browse-section class, which is only supposed to be for cases where there are multiple browse-sections in sequence (e.g. multiple nodes in the node history browse pages).
2021-06-16 15:45:58 +01:00
Andy Allan
4e45f3a76f Fix the email address that's suggested for whitelisting
Refs #3215
2021-06-16 15:37:40 +01:00
Andy Allan
c2587b5b57 Rework the routing credit to use a bootstrap class
The padding is unnecessary given it's in a paragraph anyway.
2021-06-16 13:28:33 +01:00
Andy Allan
7407d444fb Match the width of the overlay-sidebar on narrow screens to the width on full-sized screens
It's not clear why they are different widths, since the non-overlay sidebar doesn't change.
2021-06-16 12:07:04 +01:00
Andy Allan
408c883d24 Skip intermediate lengths when testing tag validity
It's really the upper and lower boundaries that we want to check,
and it's reasonable to assume all the intermediate values will work
fine if the boundary values are tested.

This also saves about 75% of the time taken and almost 85% of the
assertions when running all the model tests.
2021-06-16 09:53:57 +01:00
Tom Hughes
60b16b9421 Update bundle 2021-06-15 18:39:24 +01:00
translatewiki.net
85dadb1082 Localisation updates from https://translatewiki.net. 2021-06-14 09:58:54 +02:00
translatewiki.net
32c4181f41 Localisation updates from https://translatewiki.net. 2021-06-10 16:55:57 +02:00
Tom Hughes
3fff377b00 Merge remote-tracking branch 'upstream/pull/3217' 2021-06-09 17:46:45 +01:00
Tom Hughes
616f3783df Merge remote-tracking branch 'upstream/pull/3216' 2021-06-09 17:46:11 +01:00
Andy Allan
63c82ed72f Set updated_by when resolving issues
Refs #3211
2021-06-09 15:47:31 +01:00
Andy Allan
7e5bbce23d
Merge pull request #3208 from osm-hr/update-rcn-color
fix map key color for regional OpenCycleMap
2021-06-09 15:29:57 +01:00
Andy Allan
71be435886 Fix case when user block durations are slightly negative
The output from ActiveSupport::Duration is wildly unhelpful in those cases

Fixes #3210
2021-06-09 15:16:35 +01:00
Andy Allan
5ce14cfa4d Ensure that short duration blockss are shown as '0 hours'
Passing `:count => nil` means that i18n.t will return the hash of translations, so use a default value of 0 when checking for hours to prevent this.

Refs #3210
2021-06-09 14:17:56 +01:00
Tom Hughes
baa32464cd Drop last vestiges of ruby 2.5 support 2021-06-08 20:33:25 +01:00
Tom Hughes
77304d4f50 Update bundle 2021-06-08 19:44:48 +01:00
Tom Hughes
0bd3229f89 Merge remote-tracking branch 'upstream/pull/3214' 2021-06-08 19:41:39 +01:00
translatewiki.net
cba1b6a640 Localisation updates from https://translatewiki.net. 2021-06-07 14:58:59 +02:00
dependabot[bot]
a8020dc475
Bump eslint from 7.27.0 to 7.28.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.27.0 to 7.28.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.27.0...v7.28.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-07 05:01:26 +00:00