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

11294 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tom Hughes
22fbd05f1f Merge remote-tracking branch 'upstream/pull/3317' 2021-09-12 18:41:05 +01:00
Morten Bruhn
244362f957 Added crossing as key 2021-09-09 22:01:13 +02:00
Morten Bruhn
346ec33168 Added a couple of keys under natural to en.yml 2021-09-09 20:53:11 +02:00
translatewiki.net
93144b5d29 Localisation updates from https://translatewiki.net. 2021-09-09 13:10:03 +02:00
Paul Norman
b1b2b52477
Add Fastly as top three donor 2021-09-08 20:05:47 -07:00
Tom Hughes
6e476bc897 Update bundle 2021-09-07 18:41:05 +01:00
Grant Slater
40d7a0bc27
Add gitattribute to force lf line endings 2021-09-07 10:55:01 +01:00
Grant Slater
55e6d537ce
Add .editorconfig 2021-09-07 10:46:02 +01:00
translatewiki.net
cd1f895d4f Localisation updates from https://translatewiki.net. 2021-09-06 13:09:45 +02:00
translatewiki.net
f8623a9d17 Localisation updates from https://translatewiki.net. 2021-09-02 13:10:23 +02:00
Tom Hughes
51b62ec57b Merge remote-tracking branch 'upstream/pull/3308' 2021-09-02 07:05:40 +01:00
dependabot[bot]
9dad99d4a4
Bump js-cookie from 3.0.0 to 3.0.1 
Bumps [js-cookie](https://github.com/js-cookie/js-cookie) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/js-cookie/js-cookie/releases)
- [Changelog](https://github.com/js-cookie/js-cookie/blob/master/.release-it.json)
- [Commits](https://github.com/js-cookie/js-cookie/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: js-cookie
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-01 23:00:55 +00:00
Tom Hughes
7dd9783bae Update bundle 2021-09-01 18:28:06 +01:00
translatewiki.net
307726217d Localisation updates from https://translatewiki.net. 2021-08-30 13:15:19 +02:00
Tom Hughes
6a9ab7cb2d Update bundle 2021-08-24 18:44:34 +01:00
Tom Hughes
4389eff647 Improve testing of user details API responses 2021-08-24 18:41:07 +01:00
Tom Hughes
cc461b126d Correct policing of access to private user details 2021-08-24 17:49:08 +01:00
translatewiki.net
55c195f46d Localisation updates from https://translatewiki.net. 2021-08-23 13:11:11 +02: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
Tom Hughes
10fcaeb164 Update to rails 6.1.4.1 2021-08-21 14:38:08 +01:00
Tom Hughes
ed404850fb Update bundle 2021-08-21 14:36:27 +01:00
translatewiki.net
0d5e634669 Localisation updates from https://translatewiki.net. 2021-08-19 13:10:28 +02:00
Tom Hughes
eac749dbf2 Merge remote-tracking branch 'upstream/pull/3298' 2021-08-18 15:29:17 +01:00
Tom Hughes
6efc77b473 Merge remote-tracking branch 'upstream/pull/3296' 2021-08-18 15:12:43 +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