]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Thu, 1 Aug 2024 17:25:26 +0000 (18:25 +0100)]
Merge remote-tracking branch 'upstream/pull/5036'
Anton Khorev [Thu, 1 Aug 2024 16:07:00 +0000 (19:07 +0300)]
Test plaintext trace emails
Anton Khorev [Thu, 1 Aug 2024 16:02:16 +0000 (19:02 +0300)]
Test tags with &-encoded characters in trace emails
Anton Khorev [Thu, 1 Aug 2024 15:32:12 +0000 (18:32 +0300)]
Merge branch 'pull/5031'
translatewiki.net [Thu, 1 Aug 2024 12:14:48 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Thu, 1 Aug 2024 02:15:56 +0000 (05:15 +0300)]
Don't pass width/height to user menu thumbnail
Anton Khorev [Wed, 31 Jul 2024 23:36:26 +0000 (02:36 +0300)]
Merge branch 'pull/5035'
mmd-osm [Wed, 31 Jul 2024 19:31:17 +0000 (21:31 +0200)]
Trace picture with fixed size
mmd-osm [Wed, 31 Jul 2024 17:12:19 +0000 (19:12 +0200)]
GPX Import email in text format
Fixes #5025
Anton Khorev [Wed, 31 Jul 2024 13:56:28 +0000 (16:56 +0300)]
Merge branch 'pull/5030'
Nenad Vujicic [Tue, 30 Jul 2024 22:24:45 +0000 (00:24 +0200)]
Added bootstrap alert when body preview is empty
Fixes #3748. Added check to SiteController#preview to detect if (message, diary entry, diary entry comment) body is empty and if positive, returns rendered bootstrap alert "Nothing to preview" to be displayed in richtext_field.
Guillaume Rischard [Tue, 30 Jul 2024 20:21:31 +0000 (15:21 -0500)]
Add wiki for documentation and regional extracts
Guillaume Rischard [Tue, 30 Jul 2024 20:00:46 +0000 (15:00 -0500)]
Add planet link and explanation to robots.txt
Tom Hughes [Tue, 30 Jul 2024 17:43:44 +0000 (18:43 +0100)]
Merge remote-tracking branch 'upstream/pull/4605'
Tom Hughes [Tue, 30 Jul 2024 17:14:29 +0000 (18:14 +0100)]
Update bundle
mmd-osm [Mon, 29 Jul 2024 18:39:00 +0000 (20:39 +0200)]
Trace image with fixed size
translatewiki.net [Mon, 29 Jul 2024 12:18:18 +0000 (14:18 +0200)]
Localisation updates from https://translatewiki.net.
Milan Cvetkovic [Mon, 11 Mar 2024 13:14:04 +0000 (13:14 +0000)]
Add Messages API
as discussed in [Issue #4509](https://wiki.openstreetmap.org/w/index.php?title=Messaging_API_proposal)
and documented in [Messaging API reference](https://wiki.openstreetmap.org/w/index.php?title=Messaging_API_proposal)
Anton Khorev [Sun, 28 Jul 2024 15:54:42 +0000 (18:54 +0300)]
Merge branch 'pull/5020'
Tom Hughes [Sun, 28 Jul 2024 11:03:20 +0000 (12:03 +0100)]
Merge remote-tracking branch 'upstream/pull/5027'
dependabot[bot] [Fri, 26 Jul 2024 23:47:41 +0000 (23:47 +0000)]
Bump eslint from 9.7.0 to 9.8.0
Bumps [eslint](https://github.com/eslint/eslint) from 9.7.0 to 9.8.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/v9.7.0...v9.8.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Fri, 26 Jul 2024 16:52:54 +0000 (17:52 +0100)]
Merge remote-tracking branch 'upstream/pull/5022'
Tom Hughes [Fri, 26 Jul 2024 16:50:29 +0000 (17:50 +0100)]
Merge remote-tracking branch 'upstream/pull/5021'
Tom Hughes [Fri, 26 Jul 2024 16:47:58 +0000 (17:47 +0100)]
Merge remote-tracking branch 'upstream/pull/5016'
Anton Khorev [Fri, 26 Jul 2024 00:42:11 +0000 (03:42 +0300)]
Move check_block_buttons method to other private methods
Anton Khorev [Thu, 25 Jul 2024 01:29:43 +0000 (04:29 +0300)]
Allow revokers to edit revoked blocks
Anton Khorev [Fri, 26 Jul 2024 00:28:42 +0000 (03:28 +0300)]
Simplify issue path helper calls
Anton Khorev [Fri, 26 Jul 2024 00:01:08 +0000 (03:01 +0300)]
Move notes and blocks resources to api namespace
Tom Hughes [Thu, 25 Jul 2024 16:06:59 +0000 (17:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5018'
Tom Hughes [Thu, 25 Jul 2024 16:05:35 +0000 (17:05 +0100)]
Merge remote-tracking branch 'upstream/pull/5017'
Tom Hughes [Wed, 24 Jul 2024 18:11:12 +0000 (19:11 +0100)]
Convert tests using OAuth 1 tokens to use OAuth 2 tokens
Tom Hughes [Wed, 24 Jul 2024 19:46:27 +0000 (20:46 +0100)]
Add expiry for OAuth 2 grants and tokens
Anton Khorev [Thu, 25 Jul 2024 13:55:27 +0000 (16:55 +0300)]
Simplify api changeset path helper calls
translatewiki.net [Thu, 25 Jul 2024 12:16:04 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Thu, 25 Jul 2024 01:56:57 +0000 (04:56 +0300)]
Use assert_not_predicate instead of assert_not next to assert_predicate
Anton Khorev [Thu, 25 Jul 2024 01:05:31 +0000 (04:05 +0300)]
Show edit links for revoked blocks to revokers
Tom Hughes [Wed, 24 Jul 2024 17:24:50 +0000 (18:24 +0100)]
Merge remote-tracking branch 'upstream/pull/5014'
Tom Hughes [Wed, 24 Jul 2024 17:17:07 +0000 (18:17 +0100)]
Merge remote-tracking branch 'upstream/pull/5013'
Tom Hughes [Wed, 24 Jul 2024 17:16:02 +0000 (18:16 +0100)]
Merge remote-tracking branch 'upstream/pull/5012'
Anton Khorev [Wed, 24 Jul 2024 01:55:59 +0000 (04:55 +0300)]
Show edit links for inactive blocks on block pages
Anton Khorev [Wed, 24 Jul 2024 01:44:59 +0000 (04:44 +0300)]
Show edit links for inactive blocks in block lists
Anton Khorev [Wed, 24 Jul 2024 01:22:49 +0000 (04:22 +0300)]
Allow to edit inactive blocks
Tom Hughes [Tue, 23 Jul 2024 16:18:14 +0000 (17:18 +0100)]
Merge remote-tracking branch 'upstream/pull/5011'
Tom Hughes [Tue, 23 Jul 2024 16:16:02 +0000 (17:16 +0100)]
Update bundle
Anton Khorev [Tue, 23 Jul 2024 16:00:02 +0000 (19:00 +0300)]
Change diary comment post paths
Anton Khorev [Tue, 23 Jul 2024 15:22:46 +0000 (18:22 +0300)]
Check diary entry edit/update ability using CanCanCan
Anton Khorev [Mon, 22 Jul 2024 15:52:41 +0000 (18:52 +0300)]
Select closest value to remaining duration when editing a block
translatewiki.net [Mon, 22 Jul 2024 12:16:47 +0000 (14:16 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 20 Jul 2024 11:10:29 +0000 (12:10 +0100)]
Only load the english resources for community index if they exist
Tom Hughes [Sat, 20 Jul 2024 11:03:43 +0000 (12:03 +0100)]
Merge remote-tracking branch 'upstream/pull/5007'
Tom Hughes [Sat, 20 Jul 2024 11:02:03 +0000 (12:02 +0100)]
Merge remote-tracking branch 'upstream/pull/5006'
Anton Khorev [Fri, 19 Jul 2024 15:34:04 +0000 (18:34 +0300)]
Move auth provider icons to auth_providers subdirectory
Anton Khorev [Fri, 19 Jul 2024 17:02:04 +0000 (20:02 +0300)]
Use Bootstrap collapse to toggle OpenID login form
Tom Hughes [Thu, 18 Jul 2024 17:00:19 +0000 (18:00 +0100)]
Fallback to english locale when looking for community index templates
Starting with the v5.8.0 release osm-community-index has removed
strings from translations which are identical to the engish version
which mostly causes no problem except for some of the template values
that don't involve any localised text.
Tom Hughes [Thu, 18 Jul 2024 16:39:44 +0000 (17:39 +0100)]
Merge remote-tracking branch 'upstream/pull/5000'
Tom Hughes [Thu, 18 Jul 2024 16:21:28 +0000 (17:21 +0100)]
Merge remote-tracking branch 'upstream/pull/5003'
Tom Hughes [Thu, 18 Jul 2024 16:21:25 +0000 (17:21 +0100)]
Merge remote-tracking branch 'upstream/pull/5002'
Tom Hughes [Thu, 18 Jul 2024 16:21:23 +0000 (17:21 +0100)]
Merge remote-tracking branch 'upstream/pull/5001'
Anton Khorev [Thu, 18 Jul 2024 15:48:14 +0000 (18:48 +0300)]
Fix marking muted messages as read/unread
Anton Khorev [Thu, 18 Jul 2024 12:45:43 +0000 (15:45 +0300)]
Use Auth.providers in auth providers template
Anton Khorev [Thu, 18 Jul 2024 12:30:08 +0000 (15:30 +0300)]
Remove 'None' from auth providers
translatewiki.net [Thu, 18 Jul 2024 12:15:10 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Thu, 18 Jul 2024 11:56:36 +0000 (14:56 +0300)]
Set search input value when searching for coordinates
dependabot[bot] [Wed, 17 Jul 2024 23:50:50 +0000 (23:50 +0000)]
Bump osm-community-index from 5.7.1 to 5.8.0
Bumps [osm-community-index](https://github.com/osmlab/osm-community-index) from 5.7.1 to 5.8.0.
- [Release notes](https://github.com/osmlab/osm-community-index/releases)
- [Changelog](https://github.com/osmlab/osm-community-index/blob/main/CHANGELOG.md)
- [Commits](https://github.com/osmlab/osm-community-index/compare/v5.7.1...v5.8.0)
---
updated-dependencies:
- dependency-name: osm-community-index
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Wed, 17 Jul 2024 17:40:11 +0000 (18:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4992'
Tom Hughes [Wed, 17 Jul 2024 17:26:17 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4999'
Tom Hughes [Wed, 17 Jul 2024 17:25:03 +0000 (18:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4998'
Anton Khorev [Wed, 17 Jul 2024 14:47:13 +0000 (17:47 +0300)]
Remove unnecessary loop when rendering preferred auth provider button
Anton Khorev [Wed, 17 Jul 2024 13:43:52 +0000 (16:43 +0300)]
Set search input value to 'lat, lon' params if query param is missing
Tom Hughes [Tue, 16 Jul 2024 16:21:10 +0000 (17:21 +0100)]
Improve wording of exported image dimensions
Tom Hughes [Tue, 16 Jul 2024 16:16:45 +0000 (17:16 +0100)]
Merge remote-tracking branch 'upstream/pull/4973'
Tom Hughes [Tue, 16 Jul 2024 16:15:47 +0000 (17:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4996'
Tom Hughes [Tue, 16 Jul 2024 16:13:36 +0000 (17:13 +0100)]
Merge remote-tracking branch 'upstream/pull/4995'
Tom Hughes [Tue, 16 Jul 2024 16:10:58 +0000 (17:10 +0100)]
Update bundle
Anton Khorev [Tue, 16 Jul 2024 14:35:04 +0000 (17:35 +0300)]
Simplify hide path helper calls
Anton Khorev [Tue, 16 Jul 2024 14:32:00 +0000 (17:32 +0300)]
Simplify subscribe path helper calls
Anton Khorev [Tue, 16 Jul 2024 14:12:17 +0000 (17:12 +0300)]
Remove name parameter from auth button helpers
Tom Hughes [Mon, 15 Jul 2024 18:19:23 +0000 (19:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4993'
Tom Hughes [Mon, 15 Jul 2024 18:17:58 +0000 (19:17 +0100)]
Merge remote-tracking branch 'upstream/pull/4991'
Tom Hughes [Mon, 15 Jul 2024 18:16:29 +0000 (19:16 +0100)]
Merge remote-tracking branch 'upstream/pull/4964'
Anton Khorev [Mon, 15 Jul 2024 15:18:12 +0000 (18:18 +0300)]
Set OpenID URL input value in html instead of javascript
nertc [Wed, 10 Jul 2024 10:04:58 +0000 (14:04 +0400)]
When downloading image, allow other map styles
Emin Kocan [Mon, 15 Jul 2024 14:44:32 +0000 (16:44 +0200)]
make docker image use nodejs v18
Anton Khorev [Mon, 15 Jul 2024 14:25:07 +0000 (17:25 +0300)]
Check comment ids instead of factory sequence numbers in changeset feed tests
translatewiki.net [Mon, 15 Jul 2024 12:17:49 +0000 (14:17 +0200)]
Localisation updates from https://translatewiki.net.
Enock Seth Nyamador [Mon, 15 Jul 2024 07:33:09 +0000 (09:33 +0200)]
Remove SotM Africa 2023 and SotM Asia x FOSS4G 2023, add SotM 2024
Tom Hughes [Sun, 14 Jul 2024 14:56:20 +0000 (15:56 +0100)]
Merge remote-tracking branch 'upstream/pull/4929'
Tom Hughes [Sun, 14 Jul 2024 14:40:39 +0000 (15:40 +0100)]
Merge remote-tracking branch 'upstream/pull/4984'
Anton Khorev [Sat, 13 Jul 2024 14:40:01 +0000 (17:40 +0300)]
Parse lat and lon independently when using dms notation
Tom Hughes [Sat, 13 Jul 2024 14:02:23 +0000 (15:02 +0100)]
Merge remote-tracking branch 'upstream/pull/4979'
Tom Hughes [Sat, 13 Jul 2024 14:00:42 +0000 (15:00 +0100)]
Merge remote-tracking branch 'upstream/pull/4983'
Tom Hughes [Sat, 13 Jul 2024 14:00:15 +0000 (15:00 +0100)]
Merge remote-tracking branch 'upstream/pull/4982'
Tom Hughes [Sat, 13 Jul 2024 13:59:15 +0000 (14:59 +0100)]
Merge remote-tracking branch 'upstream/pull/4981'
Anton Khorev [Sat, 13 Jul 2024 13:09:08 +0000 (16:09 +0300)]
Check that fractional part is present after . in geocoder latlon tests
Anton Khorev [Sat, 13 Jul 2024 13:00:45 +0000 (16:00 +0300)]
Use casecmp?() instead of casecmp().zero?
Dimitar [Sat, 13 Jul 2024 12:46:21 +0000 (15:46 +0300)]
Fixed grammar mistake
Anton Khorev [Sat, 13 Jul 2024 11:48:44 +0000 (14:48 +0300)]
Merge branch 'pull/4961'
dependabot[bot] [Fri, 12 Jul 2024 23:38:35 +0000 (23:38 +0000)]
Bump eslint from 9.6.0 to 9.7.0
Bumps [eslint](https://github.com/eslint/eslint) from 9.6.0 to 9.7.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/v9.6.0...v9.7.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Fri, 12 Jul 2024 18:25:21 +0000 (19:25 +0100)]
Merge remote-tracking branch 'upstream/pull/4978'
Tom Hughes [Fri, 12 Jul 2024 18:22:19 +0000 (19:22 +0100)]
Merge remote-tracking branch 'upstream/pull/4977'