Commit graph

13163 commits

Author SHA1 Message Date
Andy Allan
a569343e01
Merge pull request #4249 from AntonKhorev/no-traces-nav-empty-li
Change traces feed and upload button alignment
2023-09-27 15:33:58 +01:00
Andy Allan
228ab23ce1
Merge pull request #4184 from AntonKhorev/print
Show sidebar in print media
2023-09-27 15:10:52 +01:00
Andy Allan
c975bae507 Workaround for dartsass vs bootstrap 5.1 bug 2023-09-27 09:35:30 +01:00
Andy Allan
41f13ac73a Switch from sassc-rails to dartsass-sprockets
sassc-rails, and its underlying libsass, is deprecated. dartsass-sprockets
allows us to use the currently maintained dartsass implementation,
without having to change any of our toolchain.

The version of sass-embedded is pinned to avoid warnings in bootstrap. When
we upgrade bootstrap versions, we can upgrade sass-embedded to match.
2023-09-27 09:35:30 +01:00
Andy Allan
6b6c468915 Install git in Docker to allow git repos in Gemfile 2023-09-27 09:34:06 +01:00
Tom Hughes
e8af4b85bf Fix new rubocop warnings 2023-09-26 18:42:57 +01:00
Tom Hughes
a18366903e Update bundle 2023-09-26 18:21:09 +01:00
translatewiki.net
93691b3595 Localisation updates from https://translatewiki.net. 2023-09-25 13:17:56 +02:00
Tom Hughes
3eacfc31d2 Merge remote-tracking branch 'upstream/pull/4258' 2023-09-24 18:34:50 +01:00
dependabot[bot]
c650eab576
Bump eslint from 8.49.0 to 8.50.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.49.0 to 8.50.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.49.0...v8.50.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-22 23:47:53 +00:00
Tom Hughes
3e8bbe70fb Add whitespace 2023-09-22 17:54:18 +01:00
Tom Hughes
44c30fa6ce Merge remote-tracking branch 'upstream/pull/4255' 2023-09-22 17:45:42 +01:00
translatewiki.net
7a597d2972 Localisation updates from https://translatewiki.net. 2023-09-21 13:32:19 +02:00
Paul Norman
00d085ed5d
Add Tracestrack Topo as featured layer 2023-09-19 22:16:42 -07:00
Paul Norman
cfcb89a9c9
Update leaflet-osm repo owner 2023-09-19 21:56:54 -07:00
Tom Hughes
926229e286 Drop rubocop config patch now that rubocop-factory_bot is fixed 2023-09-19 11:33:03 +01:00
Tom Hughes
20e03c73bb Update bundle 2023-09-19 10:48:09 +01:00
Tom Hughes
8bd52cec3f Limit SOTM EU banner to one month 2023-09-19 09:33:20 +01:00
Tom Hughes
29c51d7915 Allow banners to have a start date as well as an end date 2023-09-19 09:33:03 +01:00
Marjan Van de Kauter
781b5166ce Add banner for State of the Map Europe 2023
Closes #4252
2023-09-19 09:17:30 +01:00
translatewiki.net
6bc81dc3e7 Localisation updates from https://translatewiki.net. 2023-09-18 13:18:08 +02:00
Anton Khorev
ed99c62874 Tweak sizes and alignment of traces rss/upload buttons 2023-09-14 21:00:57 +03:00
Tom Hughes
85b17a1f2a Merge remote-tracking branch 'upstream/pull/4240' 2023-09-14 17:42:04 +01:00
Tom Hughes
55b2ddc6df Merge remote-tracking branch 'upstream/pull/4247' 2023-09-14 17:09:31 +01:00
Anton Khorev
bdb4e025f8 Use start margin instead of empty <li> for gap before traces rss button 2023-09-14 18:02:55 +03:00
translatewiki.net
6b86be6dec Localisation updates from https://translatewiki.net. 2023-09-14 13:22:37 +02:00
Andy Allan
841cff678b Refactor remaining sass division operators to use multiplication 2023-09-13 13:26:19 +01:00
Andy Allan
f3a4443120 Remove unusual margins and line-height from comments
This allows them to follow normal conventions used elsewhere, as
well as removing some custom css.
2023-09-13 13:18:30 +01:00
Andy Allan
5d4c96878a Remove sass division for export input boxes margins 2023-09-13 11:42:12 +01:00
Andy Allan
3c4f48e59b Remove custom styling from export alternative sources dl
These were mostly the same as the bootstrap defaults.
2023-09-13 11:35:55 +01:00
Andy Allan
5473be178a Refactor the directions table to use bootstrap table styling
This allows us to remove some custom CSS
2023-09-13 11:30:50 +01:00
Andy Allan
d45c1435e6 Use spacer for margins on leaflet popups 2023-09-13 10:58:36 +01:00
Andy Allan
0a41b19bbc Use an inline list for the login auth buttons 2023-09-13 10:58:36 +01:00
Andy Allan
ffe637f23d Use multiplication for secondary-actions margin and padding
This avoids using the sass division operator, which is deprecated.
2023-09-13 10:58:36 +01:00
Andy Allan
79868aeae7 Remove unnecessary paragraph margin override on diary comments 2023-09-13 10:58:36 +01:00
Tom Hughes
93da8bdbe3 Update bundle 2023-09-12 18:12:06 +01:00
translatewiki.net
3628bfd493 Localisation updates from https://translatewiki.net. 2023-09-11 13:18:30 +02:00
Tom Hughes
144c48737b Merge remote-tracking branch 'upstream/pull/4239' 2023-09-10 18:47:07 +01:00
Tom Hughes
7ac0e897ff Merge remote-tracking branch 'upstream/pull/4245' 2023-09-10 17:24:16 +01:00
Tom Hughes
d14e97e1be Merge remote-tracking branch 'upstream/pull/4243' 2023-09-10 17:23:24 +01:00
Tom Hughes
43cc2bd6e0 Merge remote-tracking branch 'upstream/pull/4242' 2023-09-10 17:22:21 +01:00
Tom Hughes
7cf0936295 Update to rails 7.0.8 2023-09-10 17:11:17 +01:00
Anton Khorev
4b92988555 Add comment ids to changeset discussion api responses 2023-09-10 17:30:06 +03:00
Anton Khorev
9c9edb6054 Remove authorize_web call from traces api controller 2023-09-09 19:40:28 +03:00
Anton Khorev
9442829d31 Add json output for show user block api 2023-09-09 16:50:36 +03:00
Anton Khorev
71654e563e Add show user block api endpoint 2023-09-09 15:53:22 +03:00
Anton Khorev
e143726f1a Combine comments and traces pagination partials 2023-09-09 14:33:59 +03:00
Anton Khorev
a780a7456f Don't interpolate in pagination partial 2023-09-09 14:33:58 +03:00
Anton Khorev
ea86f8f682 Make pagination partial view 2023-09-09 14:23:12 +03:00
Anton Khorev
c213abb8e3 Refactor diary paging queries 2023-09-09 14:23:11 +03:00