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

12252 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
3e46c7c87d Merge remote-tracking branch 'upstream/pull/3695' 2022-09-18 18:38:57 +01:00
Tom Hughes
79f0796325 Merge remote-tracking branch 'upstream/pull/3699' 2022-09-18 18:35:58 +01:00
Tom Hughes
364a56dfc3 Merge remote-tracking branch 'upstream/pull/3698' 2022-09-18 18:34:51 +01:00
Tom Hughes
e24b624547 Merge remote-tracking branch 'upstream/pull/3697' 2022-09-18 18:32:12 +01:00
Tom Hughes
771bb2c17b Merge remote-tracking branch 'upstream/pull/3696' 2022-09-18 18:30:55 +01:00
Anton Khorev
a22094c5cf Remove old map sidebar close button css 2022-09-17 13:53:21 +03:00
Anton Khorev
10babd39b0 Remove background image-related css from about page 
Background images are no longer used on the page so these properties are not required.
 2022-09-17 13:09:41 +03:00
Anton Khorev
e5002d9c70 Remove buttons css class used only on new note page 2022-09-17 11:03:04 +03:00
Anton Khorev
7d31a659ab Remove unused pager secondary nav css 2022-09-17 10:09:35 +03:00
Anton Khorev
7702035963 Remove unnecessary appendTo() that is undone by append() right away 2022-09-17 09:14:46 +03:00
Anton Khorev
e60282da09 Remove share-tabs css class 2022-09-17 08:47:22 +03:00
Anton Khorev
79c524832e Use button group for share tabs 2022-09-17 08:34:53 +03:00
lectrician1
d602c7d0af
Clarify Windows installation bad + alternatives 
State some ruby gems might not be supported and Docker is easiest solution.
 2022-09-16 16:52:07 -04:00
lectrician1
e927819d5d Add further instructions for Windows users 2022-09-16 16:34:28 -04:00
translatewiki.net
aae5cd3d4e Localisation updates from https://translatewiki.net. 2022-09-15 13:14:32 +02:00
Harry Wood
e057e1c479 Define a DEFAULT_FRESHLY_CLOSED_LIMIT constant 
Define DEFAULT_FRESHLY_CLOSED_LIMIT in the Note model to allow the 7 day limit to be referenced in the API controller and in the new `freshy_closed_until` logic. The default value is `7.days`. API users can still override this, but the website uses that default for the duration of the green "freshly closed" notes markers.
 2022-09-14 23:59:41 +01:00
Harry Wood
d8e51614cb Display how long until a note will disappear 
Modify the message displayed at the bottom of the notes sidepanel. For already resolved notes we don't want to say "please resolve it". Fixes https://github.com/openstreetmap/openstreetmap-website/issues/3663

Instead explain that it will disappear from the map (so reporting is probably not necessary) and display how long to go until that happens. Tackling https://github.com/openstreetmap/openstreetmap-website/issues/3071
 2022-09-14 23:59:25 +01:00
Tom Hughes
5eb09448c5 Merge remote-tracking branch 'upstream/pull/3689' 2022-09-14 18:24:14 +01:00
Andy Allan
48ed305163
Merge pull request #3678 from AntonKhorev/close-button-margins 
Remove top margins from close buttons
 2022-09-14 17:48:41 +01:00
Andy Allan
4d1f83d6bb Use bootstrap breakpoint mixin 
This has the same end result, but is more clear than an arbitrary
pixel number.
 2022-09-14 17:32:43 +01:00
Andy Allan
a3474de4d8 Use bootstrap utility classes for showing the new user arm 
The original value was close to the 'lg' breakpoint, but the 'md'
breakpoint is fine for this too.
 2022-09-14 17:32:43 +01:00
Andy Allan
5ab682dbbd Combine small.scss into common.scss 
We've moved away from the idea of having extra rules for small screens,
and instead follow the bootstrap convention of designing for small
screens first and overriding those rules if needed for larger screens.

Having a separate file remaining for a limited number of small screen
rules is therefore counter-productive. Moving the remaining rules into
common.scss, adjacent to the related rules for larger screen, makes
the behaviour easier to understand, as well as making it easier to
refactor the rules to a small-screen-first approach.
 2022-09-14 17:32:43 +01:00
Tom Hughes
35392c1a2f Merge remote-tracking branch 'upstream/pull/3680' 2022-09-13 19:19:12 +01:00
Tom Hughes
4b36fee5de Merge remote-tracking branch 'upstream/pull/3687' 2022-09-13 19:14:24 +01:00
Tom Hughes
5f0c04d7ea Update bundle 2022-09-13 18:17:42 +01:00
Andy Allan
1094fe92b2
Merge pull request #3686 from AntonKhorev/embed-https 
Use https in 'report a problem' link of embedded map
 2022-09-13 09:08:47 +01:00
Anton Khorev
63f9ee3db6 Add bootstrap to js globals 2022-09-13 06:52:36 +03:00
Anton Khorev
84c8289e06 Fix zoom level related tooltip for Edit button 2022-09-13 05:26:49 +03:00
Anton Khorev
e8f2af833a Fix zoom level related tooltips for layer checkboxes 2022-09-13 04:20:57 +03:00
dependabot[bot]
3178b524ca
Bump eslint from 8.23.0 to 8.23.1 
Bumps [eslint](https://github.com/eslint/eslint) from 8.23.0 to 8.23.1.
- [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.23.0...v8.23.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-12 23:00:55 +00:00
Anton Khorev
e409e83b48 Merge tooltip fixes/tests 2022-09-13 01:52:23 +03:00
Anton Khorev
cb438ac3f6 Use https in 'report a problem' link of embedded map 2022-09-13 01:18:48 +03:00
Tom Hughes
00112700d7 Update doorkeeper to 5.6.0 2022-09-12 19:27:33 +01:00
translatewiki.net
0abd8ea78d Localisation updates from https://translatewiki.net. 2022-09-12 13:13:55 +02:00
Adam Hoyle
7e5cbe87ed Merge branch 'master' into feature/add-communities-page 
# Conflicts:
#	Gemfile.lock
#	package.json
#	yarn.lock
 2022-09-10 16:13:17 +01:00
Adam Hoyle
4a6e7b7815 Update osm-community-index dependency version 2022-09-10 15:54:44 +01:00
Adam Hoyle
1542951b5a Update text above list of local chapters 2022-09-10 15:52:57 +01:00
Tom Hughes
9cd96bd452 Fix new rubocop warnings 2022-09-09 22:45:58 +01:00
Tom Hughes
f7e168b8e1 Update to rails 7.0.4 2022-09-09 22:45:58 +01:00
Tom Hughes
7df4a7f8a3 Fix background colour for badges on GPS traces 
Fixes #3681
 2022-09-09 11:01:20 +01:00
translatewiki.net
88cec0880b Localisation updates from https://translatewiki.net. 2022-09-08 13:13:36 +02:00
Anton Khorev
1fc2a70c17 Rewrite bbox only in place history atom links 2022-09-07 22:13:57 +03:00
Tom Hughes
fa93526f76 Use nominatim_url setting more consistently 2022-09-07 08:45:27 +01:00
Tom Hughes
d4da1dce97 Update bundle 2022-09-06 18:14:11 +01:00
Tom Hughes
95ceaef3b2 Merge remote-tracking branch 'upstream/pull/3673' 2022-09-06 18:13:43 +01:00
translatewiki.net
1795407caa Localisation updates from https://translatewiki.net. 2022-09-05 13:13:01 +02:00
Tom Hughes
2948b86eb5 Merge remote-tracking branch 'upstream/pull/3677' 2022-09-02 22:27:15 +01:00
Anton Khorev
fb75f447d7 Remove top margins from close buttons 2022-09-02 17:02:46 +03:00
Anton Khorev
78b4ff4a29 Simplify css for text selection with stretched link 2022-09-02 16:22:54 +03:00
Anton Khorev
a0f52e8b4f Make changeset id also a link so it can be displayed over the stretched link and be text-selectable 2022-09-02 16:13:52 +03:00