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

11229 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Allan
014b86f91c Use bootstrap font family 
This contains and expanded list of fonts, covering more platforms
and edge cases than ours, so there's no need to override.
 2021-06-30 11:29:34 +01:00
Andy Allan
2a347e71be Remove some default styling from body 
These mirror, either exactly or pretty close to exactly, what is set
by the bootstrap reboot style, so there's no need for us to duplicate.
 2021-06-30 11:17:30 +01:00
Tom Hughes
a32b751fed Remove some references to webmaster 2021-06-29 19:22:31 +01:00
Tom Hughes
ef092045e0 Fix some broken translation lookups 2021-06-29 19:14:50 +01:00
Tom Hughes
e97eaed276 Fix new erblint warnings 2021-06-29 18:42:34 +01:00
Tom Hughes
d3c800fdb4 Fix new rubocop warnings 2021-06-29 18:29:00 +01:00
Tom Hughes
819ad523b5 Update bundle 2021-06-29 18:21:22 +01:00
translatewiki.net
84f6029ead Localisation updates from https://translatewiki.net. 2021-06-28 15:36:14 +02:00
Tom Hughes
b4a1e41968 Switch web site to use OAuth 2 2021-06-27 19:00:36 +01:00
Tom Hughes
90360df6d7 Merge remote-tracking branch 'upstream/pull/3235' 2021-06-27 18:44:05 +01:00
Tom Hughes
608aafbf14 Make /api/0.6/permissions work for OAuth 2 clients 2021-06-27 00:38:16 +01:00
dependabot[bot]
9dd82c96dd
Bump leaflet.locatecontrol from 0.73.0 to 0.74.0 
Bumps [leaflet.locatecontrol](https://github.com/domoritz/leaflet-locatecontrol) from 0.73.0 to 0.74.0.
- [Release notes](https://github.com/domoritz/leaflet-locatecontrol/releases)
- [Changelog](https://github.com/domoritz/leaflet-locatecontrol/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/domoritz/leaflet-locatecontrol/compare/v0.73.0...v0.74.0)

---
updated-dependencies:
- dependency-name: leaflet.locatecontrol
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-25 23:00:44 +00:00
Tom Hughes
1bc1905248 Restore browse-section class to changeset view 
Fixes #3234
 2021-06-25 20:26:51 +01:00
Tom Hughes
4ac5c10383 Update to rails 6.1.4 2021-06-24 22:22:54 +01:00
Tom Hughes
0a7a2644b9 Revert "Localisation updates from https://translatewiki.net." 
This reverts commit 93660ec9e8.
 2021-06-24 20:48:14 +01:00
Tom Hughes
e9010306c5 Enable access token reuse for OAuth 2 2021-06-24 20:40:23 +01:00
Tom Hughes
76b45e5dde Update doorkeeper configuration file from master template 2021-06-24 20:40:23 +01:00
translatewiki.net
93660ec9e8 Localisation updates from https://translatewiki.net. 2021-06-24 12:06:09 +02:00
Tom Hughes
6aed84bf7b Update bundle 2021-06-24 08:44:03 +01:00
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