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

13208 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
45f0589e62 Merge remote-tracking branch 'upstream/pull/4329' 2023-11-28 22:21:50 +00:00
Tom Hughes
64c9ff08e3 Merge remote-tracking branch 'upstream/pull/4374' 2023-11-28 18:43:45 +00:00
Tom Hughes
c63ae5ab6c Merge remote-tracking branch 'upstream/pull/4373' 2023-11-28 18:37:48 +00:00
Tom Hughes
7f6f015636 Update expected response for doorkeeper errors 2023-11-28 18:35:11 +00:00
Tom Hughes
a74f07d507 Allow FactoryBot to set primary key attributes 
We have at least model (Language) which does not use datbase
generated primary keys so we need to be able to set them.

https://github.com/thoughtbot/factory_bot_rails/pull/419
 2023-11-28 18:25:35 +00:00
Tom Hughes
447089330a Update bundle 2023-11-28 18:18:17 +00:00
Tom Hughes
c7a4705c90 Merge remote-tracking branch 'upstream/pull/4352' 2023-11-28 18:11:40 +00:00
Anton Khorev
88e7d3b05f Start summit mapnik map key at zoom 11 2023-11-27 17:02:58 +03:00
Anton Khorev
04b839c301 Start dashed rail line mapnik map key at zoom 12 2023-11-27 16:51:38 +03:00
translatewiki.net
97d2c223aa Localisation updates from https://translatewiki.net. 2023-11-27 13:19:08 +01:00
Tom Hughes
2d1f756f75 Merge remote-tracking branch 'upstream/pull/4368' 2023-11-26 19:01:20 +00:00
Tom Hughes
8c8aa10428 Merge remote-tracking branch 'upstream/pull/4367' 2023-11-26 18:57:16 +00:00
Tom Hughes
58a94af629 Merge remote-tracking branch 'upstream/pull/4366' 2023-11-26 18:56:05 +00:00
Anton Khorev
857e9179b8 Read layers with available map key from config/key.yml 2023-11-24 16:38:38 +03:00
Anton Khorev
bf65abf268 Add tooltip to disabled html share button 2023-11-24 16:12:30 +03:00
Anton Khorev
6dd34d8430 Disable html share button for tracestracktopo layer 2023-11-24 15:12:41 +03:00
Tom Hughes
2153e00f9f Drop ACL check from notes#comment as we no longer allow anonymous comments 2023-11-23 16:56:07 +00:00
Tom Hughes
efd2b92a80 Prevent unauthenticated users commenting on notes via the API 2023-11-23 16:56:07 +00:00
Anton Khorev
1354a95eeb Remove unused css for lists inside primary nav on narrow screens 2023-11-23 19:52:51 +03:00
translatewiki.net
5d916975db Localisation updates from https://translatewiki.net. 2023-11-23 13:21:39 +01:00
Andy Allan
9026b84d84
Merge pull request #4296 from AntonKhorev/header-flex 
Use flex container instead of floats in header
 2023-11-22 17:22:46 +00:00
Andy Allan
5e90b569db
Merge pull request #4353 from tomhughes/rtlcss 
Improve handling of RTL styling
 2023-11-22 17:13:35 +00:00
Andy Allan
5fdddf2a8a
Merge pull request #4313 from AntonKhorev/account-delete-delay 
Account deletion cool-down period
 2023-11-22 15:07:34 +00:00
Anton Khorev
b5f8df642a Disallow account deletion after confirmation 2023-11-22 17:37:04 +03:00
Anton Khorev
14bd660114 Disable delete account button if there are recent changesets 2023-11-22 17:37:04 +03:00
Anton Khorev
a8aaf62e62 Add earliest allowed deletion time to user model 2023-11-22 17:02:48 +03:00
Anton Khorev
91a4fd6b5a Add user account deletion delay test helper 2023-11-22 16:15:59 +03:00
Anton Khorev
dfe299eff9 Add user account deletion delay setting 2023-11-22 16:15:59 +03:00
Tom Hughes
f08fb4f30f Prevent API tokens without write_notes creating attributed comments 
Fixes #4362
 2023-11-22 12:30:39 +00:00
Tom Hughes
5da286bb45 Fix dependency 2023-11-21 17:26:52 +00:00
Tom Hughes
ce385c88eb Merge remote-tracking branch 'upstream/pull/4358' 2023-11-21 17:24:19 +00:00
Tom Hughes
8a02d33bec Merge remote-tracking branch 'upstream/pull/4356' 2023-11-21 17:22:21 +00:00
Tom Hughes
316cac53ae Update bundle 2023-11-21 17:19:06 +00:00
Milan Cvetkovic
aeb4271a27 Do not merge zoom/lat/lon options with oauth_return_url 2023-11-21 13:01:52 +00:00
Milan Cvetkovic
1fbd1d11c4 Extract welcome_options function to simplify save function 2023-11-21 11:56:09 +00:00
Milan Cvetkovic
87a5a0844b Welcome screen works with confirmation email too 2023-11-21 11:56:09 +00:00
Milan Cvetkovic
60c885d071 Welcome screen displays 'Continue with authorization' 
do not hide notes
 2023-11-21 11:56:09 +00:00
Anton Khorev
f23993a4df Remove 'need to return bbox' comment on conditions_bbox 2023-11-21 13:55:35 +03:00
Anton Khorev
e90d48adc9 Remove 'basic attributes' comments from changeset api output builders 2023-11-20 15:39:27 +03:00
translatewiki.net
26f12ef11a Localisation updates from https://translatewiki.net. 2023-11-20 13:21:51 +01:00
Tom Hughes
6cd9caa4e1 Force rubygems 3.4.10 for github actions 
This works around a problem where mini_racer doesn't like the psych
in the GitHub Actions images for ruby 3.0 and 3.1 but it fine with
the ruby 3.2 image that uses a newer rubygems version.

https://github.com/rubyjs/mini_racer/issues/289
 2023-11-18 11:04:10 +00:00
dependabot[bot]
b18ba50420
Bump eslint from 8.53.0 to 8.54.0 
Bumps [eslint](https://github.com/eslint/eslint) from 8.53.0 to 8.54.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.53.0...v8.54.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-11-17 23:02:11 +00:00
Anton Khorev
f3144a962b Fix tiny user thumbnail size at 25x25 px 2023-11-17 12:45:20 +03:00
Anton Khorev
b5679e16db Disable text wrapping while measuring header width 2023-11-17 10:27:38 +03:00
Anton Khorev
693fe3b587 Switch to flex header container 2023-11-17 10:27:38 +03:00
Tom Hughes
b45bce3370 Fix positioning of placeholder text in RTL mode 
Fixes #3910
 2023-11-16 22:54:03 +00:00
Tom Hughes
a328ec84a2 Use rtlcss instead of r2 for RTL support 
This ensures that the RTL directives in bootstrap are processed
correctly as it is designed around RTLCSS for RTL support.

Fixes #4347
 2023-11-16 22:53:09 +00:00
Tom Hughes
b9cb8f0921 Merge remote-tracking branch 'upstream/pull/4351' 2023-11-16 13:43:46 +00:00
Tom Hughes
50e2df57ab Merge remote-tracking branch 'upstream/pull/4350' 2023-11-16 13:43:44 +00:00
translatewiki.net
d7b9f70c80 Localisation updates from https://translatewiki.net. 2023-11-16 13:19:00 +01:00