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

11494 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
81e2c7152a Merge remote-tracking branch 'upstream/pull/3339' 2021-10-12 18:13:49 +01:00
dependabot[bot]
638158a1c0
Bump eslint from 7.32.0 to 8.0.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.32.0 to 8.0.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.32.0...v8.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-11 23:00:50 +00:00
translatewiki.net
8c6b694720 Localisation updates from https://translatewiki.net. 2021-10-11 13:10:35 +02:00
Tom Hughes
5966acc207 Merge remote-tracking branch 'upstream/pull/3300' 2021-10-07 17:45:07 +01:00
translatewiki.net
0ac0f4fb36 Localisation updates from https://translatewiki.net. 2021-10-07 13:10:39 +02:00
Tom Hughes
7a4f54adb4 Merge remote-tracking branch 'upstream/pull/3336' 2021-10-06 15:05:34 +01:00
Andy Allan
608276b8b0 Remove mention of trac in README 
We no longer use or refer to trac, which has in the meantime been archived anyway.
 2021-10-06 14:53:46 +01:00
Tom Hughes
a5a4938d78 Update bundle 2021-10-05 18:16:53 +01:00
translatewiki.net
e920b2eb62 Localisation updates from https://translatewiki.net. 2021-10-04 13:11:11 +02:00
translatewiki.net
c2985cba93 Localisation updates from https://translatewiki.net. 2021-09-30 13:09:07 +02:00
Tom Hughes
cb10c10ea3 Merge remote-tracking branch 'upstream/pull/3332' 2021-09-29 19:10:22 +01:00
Tom Hughes
7609c11884 Merge remote-tracking branch 'upstream/pull/3316' 2021-09-29 19:07:44 +01:00
Tom Hughes
22377cbdd4 Fix new rubocop warning 2021-09-29 18:54:56 +01:00
Tom Hughes
6e0f4acfe1 Update bundle 2021-09-29 18:51:34 +01:00
Andy Allan
9ab15f38ea Move the tracepoint coordinate format test to the controller test 
This allows us to remove the model method
 2021-09-29 15:25:28 +01:00
Andy Allan
95e5178bfb Refactor tracepoint index to use an xml builder view 
This avoids constructing xml by hand in both the controller and
the model, and opens the way for other rendering in future.

The complexity of deciding which point goes where, along with revisiting
previous tracks and tracksegs means that I've broken it down into
two parts - sorting the points into the right trksegs is done first,
before rendering them all as xml. I couldn't find a way to allow
revisiting using the builder.
 2021-09-29 15:14:53 +01:00
Tom Hughes
c56113aaed Merge remote-tracking branch 'upstream/pull/3331' 2021-09-27 22:31:40 +01:00
dependabot[bot]
1bcfdad632
Bump ansi-regex from 5.0.0 to 5.0.1 
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 21:16:53 +00:00
Tom Hughes
a3a14eb01a Merge remote-tracking branch 'upstream/pull/3330' 2021-09-27 22:11:24 +01:00
dependabot[bot]
2312dd902e
Bump nokogiri from 1.12.4 to 1.12.5 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.4 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.4...v1.12.5)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 20:42:52 +00:00
Adam Hoyle
06c2db433d Merge branch 'master' into feature/add-communities-page 2021-09-27 19:30:25 +01:00
translatewiki.net
397a03d780 Localisation updates from https://translatewiki.net. 2021-09-27 13:11:19 +02:00
translatewiki.net
8443e9a996 Localisation updates from https://translatewiki.net. 2021-09-23 13:11:33 +02:00
Tom Hughes
137e46355c Update bundle 2021-09-21 18:33:42 +01:00
translatewiki.net
47a216d051 Localisation updates from https://translatewiki.net. 2021-09-20 13:10:19 +02:00
Tom Hughes
4492e94a45 Merge remote-tracking branch 'upstream/pull/3327' 2021-09-16 19:05:04 +01:00
Andy Allan
710bf75411 Rename file so that it's included in test runs 2021-09-16 18:04:37 +01:00
Tom Hughes
e91c02f2ce Merge remote-tracking branch 'upstream/pull/3297' 2021-09-15 18:44:23 +01:00
Tom Hughes
5652e9f6b9 Merge remote-tracking branch 'upstream/pull/3324' 2021-09-15 18:38:25 +01:00
Tom Hughes
c6b9f5af59 Drop customisation for Rails/ContentTag 2021-09-15 18:35:00 +01:00
Tom Hughes
5f11c2d679 Merge remote-tracking branch 'upstream/pull/3323' 2021-09-15 18:34:49 +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
d07ce46929 Move the xml format test for old nodes to the controller test 
This allows us to remove the model method
 2021-09-15 17:05:34 +01:00
Andy Allan
76f1d7bc78 Use a builder to render changeset downloads 2021-09-15 16:33:04 +01:00
Andy Allan
fa7d64b788 Fix test 2021-09-15 14:36:08 +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
Andy Allan
86061a8816
Merge pull request #179 from tomhughes/secondary-actions 
Improve behaviour of secondary action lists when wrapping
 2021-09-15 11:40:40 +01:00
Andy Allan
8bbb021a4a Temporary pin on rubocop-rails until next bugfix release 
There is a bug in the Rails/ContentTag cop that causes rubocop to crash. The bug has already been fixed and so should be available in the next release.

See https://github.com/rubocop/rubocop-rails/issues/543
 2021-09-15 10:10:21 +01:00
Tom Hughes
8a9dbc94c8 Update rubocop todo and fix new warnings 2021-09-14 20:40:36 +01:00
Tom Hughes
0041375721 Update bundle 2021-09-14 19:22:41 +01:00
translatewiki.net
ee57ed336a Localisation updates from https://translatewiki.net. 2021-09-13 13:09:50 +02:00
Tom Hughes
b11957a395 Use autodetection for text files 2021-09-12 18:51:51 +01:00
Tom Hughes
537ec347da Merge remote-tracking branch 'upstream/pull/3313' 2021-09-12 18:50:06 +01:00
Tom Hughes
e1065adc61 Merge remote-tracking branch 'upstream/pull/3285' 2021-09-12 18:47:50 +01:00
Tom Hughes
3fc0f78157 Merge remote-tracking branch 'upstream/pull/3318' 2021-09-12 18:46:09 +01:00