]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sun, 11 Aug 2024 17:56:28 +0000 (18:56 +0100)]
Merge remote-tracking branch 'upstream/pull/5061'
dependabot[bot] [Fri, 9 Aug 2024 23:32:40 +0000 (23:32 +0000)]
Bump eslint from 9.8.0 to 9.9.0
Bumps [eslint](https://github.com/eslint/eslint) from 9.8.0 to 9.9.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.8.0...v9.9.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 [Thu, 8 Aug 2024 16:59:41 +0000 (17:59 +0100)]
Merge remote-tracking branch 'upstream/pull/5059'
translatewiki.net [Thu, 8 Aug 2024 12:15:22 +0000 (14:15 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Thu, 8 Aug 2024 03:48:13 +0000 (06:48 +0300)]
Set min preview height when switching away from edit tab
Previously it was set when switching to a preview tab. Now that won't work correctly because we have one extra tab.
Anton Khorev [Thu, 8 Aug 2024 03:30:35 +0000 (06:30 +0300)]
Switch away from help tab when help sidebar becomes visible
Anton Khorev [Thu, 8 Aug 2024 03:28:55 +0000 (06:28 +0300)]
Move help card between pane/sidebar depending on sidebar visibility
Anton Khorev [Thu, 8 Aug 2024 01:48:57 +0000 (04:48 +0300)]
Add richtext help tab
Anton Khorev [Thu, 8 Aug 2024 03:07:42 +0000 (06:07 +0300)]
Use closest() instead of parents() when looking for richtext container
Anton Khorev [Thu, 8 Aug 2024 00:33:46 +0000 (03:33 +0300)]
Remove unused richtext dom ids
Anton Khorev [Thu, 8 Aug 2024 02:56:06 +0000 (05:56 +0300)]
Remove .richtext_preview css class
Anton Khorev [Thu, 8 Aug 2024 00:20:57 +0000 (03:20 +0300)]
Remove .richtext_content css class
Anton Khorev [Thu, 8 Aug 2024 00:16:50 +0000 (03:16 +0300)]
Remove .richtext_dopreview css class
Tom Hughes [Wed, 7 Aug 2024 17:40:40 +0000 (18:40 +0100)]
Merge remote-tracking branch 'upstream/pull/5055'
Tom Hughes [Wed, 7 Aug 2024 17:38:09 +0000 (18:38 +0100)]
Merge remote-tracking branch 'upstream/pull/5054'
Tom Hughes [Wed, 7 Aug 2024 17:37:17 +0000 (18:37 +0100)]
Merge remote-tracking branch 'upstream/pull/5053'
Andy Allan [Wed, 7 Aug 2024 15:22:21 +0000 (16:22 +0100)]
Merge pull request #5019 from tomhughes/oauth2-cleanup
Add expiry for OAuth 2 grants and tokens
Andy Allan [Wed, 7 Aug 2024 15:12:53 +0000 (16:12 +0100)]
Merge pull request #5044 from mmd-osm/patch/rn1
JSON partial rendering in loop
Anton Khorev [Wed, 7 Aug 2024 02:08:27 +0000 (05:08 +0300)]
Don't order by id when getting last records
Anton Khorev [Wed, 7 Aug 2024 01:59:09 +0000 (04:59 +0300)]
Redirect to newly created diary comment
mmd-osm [Tue, 6 Aug 2024 17:51:48 +0000 (19:51 +0200)]
Lock note during status update to avoid race condition
Tom Hughes [Tue, 6 Aug 2024 17:35:36 +0000 (18:35 +0100)]
Merge remote-tracking branch 'upstream/pull/5051'
Tom Hughes [Tue, 6 Aug 2024 17:33:35 +0000 (18:33 +0100)]
Merge remote-tracking branch 'upstream/pull/5050'
Tom Hughes [Tue, 6 Aug 2024 17:30:27 +0000 (18:30 +0100)]
Merge remote-tracking branch 'upstream/pull/5049'
Tom Hughes [Tue, 6 Aug 2024 17:29:25 +0000 (18:29 +0100)]
Merge remote-tracking branch 'upstream/pull/5046'
Tom Hughes [Tue, 6 Aug 2024 17:08:04 +0000 (18:08 +0100)]
Update bundle
Anton Khorev [Tue, 6 Aug 2024 03:26:03 +0000 (06:26 +0300)]
Refactor copypasted invalid node attribute test code
Anton Khorev [Tue, 6 Aug 2024 02:31:26 +0000 (05:31 +0300)]
Don't use XML::Parser when testing changeset upload diffResults
Anton Khorev [Tue, 6 Aug 2024 01:08:18 +0000 (04:08 +0300)]
Always check the order when testing changeset queries
Anton Khorev [Mon, 5 Aug 2024 23:26:41 +0000 (02:26 +0300)]
Merge branch 'pull/5045'
translatewiki.net [Mon, 5 Aug 2024 12:14:59 +0000 (14:14 +0200)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Fri, 2 Aug 2024 15:48:04 +0000 (18:48 +0300)]
Set og:image:alt OpenGraph property
Anton Khorev [Thu, 1 Aug 2024 16:46:08 +0000 (19:46 +0300)]
Add image_alt accessor to rich text
mmd-osm [Sun, 4 Aug 2024 19:50:07 +0000 (21:50 +0200)]
Users: avoid calling json.partial! in loop
mmd-osm [Sun, 4 Aug 2024 19:49:38 +0000 (21:49 +0200)]
Notes: avoid calling json.partial! in loop
mmd-osm [Sun, 4 Aug 2024 20:35:48 +0000 (22:35 +0200)]
Changeset: avoid XML rendering in loop
mmd-osm [Sun, 4 Aug 2024 19:49:07 +0000 (21:49 +0200)]
Messages: avoid calling json.partial! in loop
mmd-osm [Sun, 4 Aug 2024 19:48:09 +0000 (21:48 +0200)]
Changesets: avoid calling json.partial! in loop
Anton Khorev [Sun, 4 Aug 2024 15:46:25 +0000 (18:46 +0300)]
Merge branch 'pull/5023'
Tom Hughes [Sun, 4 Aug 2024 11:36:27 +0000 (12:36 +0100)]
Merge remote-tracking branch 'upstream/pull/5042'
Tom Hughes [Sun, 4 Aug 2024 11:35:20 +0000 (12:35 +0100)]
Merge remote-tracking branch 'upstream/pull/5041'
Anton Khorev [Fri, 7 Jun 2024 14:48:05 +0000 (17:48 +0300)]
Switch between richtext edit/preview using Bootstrap tab panes
Anton Khorev [Fri, 7 Jun 2024 14:38:03 +0000 (17:38 +0300)]
Convert richtext edit/preview buttons into tabs
Anton Khorev [Sat, 3 Aug 2024 00:41:43 +0000 (03:41 +0300)]
Change richtext edit/preview buttons type to non-submit
Anton Khorev [Fri, 2 Aug 2024 17:19:10 +0000 (20:19 +0300)]
Skip images with missing src
Anton Khorev [Fri, 2 Aug 2024 17:01:52 +0000 (20:01 +0300)]
Detect <img> images in markdown rich text
Tom Hughes [Fri, 2 Aug 2024 06:06:22 +0000 (07:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5040'
Tom Hughes [Fri, 2 Aug 2024 06:06:19 +0000 (07:06 +0100)]
Merge remote-tracking branch 'upstream/pull/5039'
dependabot[bot] [Fri, 2 Aug 2024 02:10:30 +0000 (02:10 +0000)]
Bump rexml from 3.3.2 to 3.3.3
Bumps [rexml](https://github.com/ruby/rexml) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.2...v3.3.3)
---
updated-dependencies:
- dependency-name: rexml
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
dependabot[bot] [Thu, 1 Aug 2024 23:37:07 +0000 (23:37 +0000)]
Bump qs from 6.12.3 to 6.13.0
Bumps [qs](https://github.com/ljharb/qs) from 6.12.3 to 6.13.0.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.12.3...v6.13.0)
---
updated-dependencies:
- dependency-name: qs
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Tom Hughes [Thu, 1 Aug 2024 17:26:46 +0000 (18:26 +0100)]
Merge remote-tracking branch 'upstream/pull/5037'
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.
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'