]>
git.openstreetmap.org Git - rails.git/log
Andy Allan [Wed, 15 Nov 2023 19:46:10 +0000 (19:46 +0000)]
Simplify date display by using friendly_date helpers
Andy Allan [Wed, 15 Nov 2023 19:45:48 +0000 (19:45 +0000)]
Avoid wrapping friendly_date with abbr tags
Andy Allan [Wed, 15 Nov 2023 19:44:10 +0000 (19:44 +0000)]
Use friendly_date helpers for revoking user blocks
Andy Allan [Wed, 15 Nov 2023 19:36:35 +0000 (19:36 +0000)]
Use friendly_date for note disappear description
There's no need to reimplement this in its own helper.
Andy Allan [Wed, 15 Nov 2023 19:21:51 +0000 (19:21 +0000)]
Use the friendly_data_ago helper for contacts on the dashboard
Also take the opportunity to fix the translation key.
Andy Allan [Wed, 15 Nov 2023 19:19:57 +0000 (19:19 +0000)]
Use time instead of abbr element for changesets_helper
Andy Allan [Wed, 15 Nov 2023 19:18:01 +0000 (19:18 +0000)]
Avoid wrapping time tags in abbr for note_helper
Andy Allan [Wed, 15 Nov 2023 19:16:18 +0000 (19:16 +0000)]
Add missing tests for friendly_date_ago helper
Andy Allan [Wed, 15 Nov 2023 17:53:38 +0000 (17:53 +0000)]
Use html 'time' element for friendly date helpers
This provides more structure than just a simple span.
Tom Hughes [Tue, 14 Nov 2023 17:19:54 +0000 (17:19 +0000)]
Merge remote-tracking branch 'upstream/pull/4297'
Anton Khorev [Wed, 18 Oct 2023 12:19:25 +0000 (15:19 +0300)]
Remove some tag table custom css
Tom Hughes [Tue, 14 Nov 2023 15:40:03 +0000 (15:40 +0000)]
Merge remote-tracking branch 'upstream/pull/4345'
Tom Hughes [Tue, 14 Nov 2023 15:37:38 +0000 (15:37 +0000)]
Update bundle
Anton Khorev [Tue, 14 Nov 2023 05:37:05 +0000 (08:37 +0300)]
Remove $spacer css from browse status panel
Anton Khorev [Tue, 14 Nov 2023 05:22:43 +0000 (08:22 +0300)]
Remove $spacer css from sidebar content
Tom Hughes [Mon, 13 Nov 2023 22:10:55 +0000 (22:10 +0000)]
Update to rails 7.1.2
Tom Hughes [Mon, 13 Nov 2023 18:44:16 +0000 (18:44 +0000)]
Merge remote-tracking branch 'upstream/pull/4343'
Tom Hughes [Mon, 13 Nov 2023 18:42:46 +0000 (18:42 +0000)]
Merge remote-tracking branch 'upstream/pull/4342'
Tom Hughes [Mon, 13 Nov 2023 18:40:55 +0000 (18:40 +0000)]
Merge remote-tracking branch 'upstream/pull/4341'
Tom Hughes [Mon, 13 Nov 2023 18:39:32 +0000 (18:39 +0000)]
Merge remote-tracking branch 'upstream/pull/4340'
Tom Hughes [Mon, 13 Nov 2023 18:35:13 +0000 (18:35 +0000)]
Merge remote-tracking branch 'upstream/pull/4339'
translatewiki.net [Mon, 13 Nov 2023 12:20:37 +0000 (13:20 +0100)]
Localisation updates from https://translatewiki.net.
Anton Khorev [Mon, 13 Nov 2023 09:24:51 +0000 (12:24 +0300)]
Remove custom css and large left margin for map noscript message
Anton Khorev [Mon, 13 Nov 2023 08:13:56 +0000 (11:13 +0300)]
Remove unused maximiseMap/minimiseMap functions
Anton Khorev [Mon, 13 Nov 2023 07:46:17 +0000 (10:46 +0300)]
Remove some custom css for pages with embedded iD
Anton Khorev [Mon, 13 Nov 2023 07:05:35 +0000 (10:05 +0300)]
Remove custom css and unnecessary div nesting of welcome panel
Anton Khorev [Mon, 13 Nov 2023 06:46:11 +0000 (09:46 +0300)]
Remove relative position from sidebar child divs other than banners
Tom Hughes [Sun, 12 Nov 2023 14:26:02 +0000 (14:26 +0000)]
Merge remote-tracking branch 'upstream/pull/4336'
Anton Khorev [Sun, 12 Nov 2023 07:17:06 +0000 (10:17 +0300)]
Set banner close button background/opacity with Bootstrap
Anton Khorev [Sun, 12 Nov 2023 07:13:48 +0000 (10:13 +0300)]
Use dark theme to invert banner close button
translatewiki.net [Thu, 9 Nov 2023 12:22:02 +0000 (13:22 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 8 Nov 2023 22:53:18 +0000 (22:53 +0000)]
Use the URL safe base64 variant for mail tokens
Tom Hughes [Wed, 8 Nov 2023 19:02:49 +0000 (19:02 +0000)]
Add secrets to gitignore
Tom Hughes [Wed, 8 Nov 2023 18:22:50 +0000 (18:22 +0000)]
Merge remote-tracking branch 'upstream/pull/4331'
Martin Raifer [Wed, 8 Nov 2023 11:41:30 +0000 (12:41 +0100)]
use api.openstreetmap.org for API calls when running on www.osm.org
see https://github.com/openstreetmap/operations/issues/951
Martin Raifer [Wed, 8 Nov 2023 11:23:21 +0000 (12:23 +0100)]
Update to iD v2.27.3
Tom Hughes [Tue, 7 Nov 2023 10:31:57 +0000 (10:31 +0000)]
Strengthen the tokens used in email reply addresses
Tom Hughes [Tue, 7 Nov 2023 10:18:04 +0000 (10:18 +0000)]
Remove production credentials from the repository
These (well master.key at least) should never have been here
but fortunately we haven't really been using them.
Tom Hughes [Tue, 7 Nov 2023 17:16:21 +0000 (17:16 +0000)]
Use secure_compare to compare passwords and tokens
It's unlikely there is an explotable attack here given than network
latencies and variability will swamp any local timing differences but
it's best practice and there's no reason not to.
Tom Hughes [Tue, 7 Nov 2023 17:07:28 +0000 (17:07 +0000)]
Merge remote-tracking branch 'upstream/pull/4322'
Tom Hughes [Tue, 7 Nov 2023 17:00:22 +0000 (17:00 +0000)]
Update bundle
translatewiki.net [Mon, 6 Nov 2023 12:23:07 +0000 (13:23 +0100)]
Localisation updates from https://translatewiki.net.
dependabot[bot] [Fri, 3 Nov 2023 23:35:24 +0000 (23:35 +0000)]
Bump eslint from 8.52.0 to 8.53.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.52.0 to 8.53.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.52.0...v8.53.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Andy Allan [Fri, 3 Nov 2023 15:00:35 +0000 (15:00 +0000)]
Merge pull request #4321 from HolgerJeromin/patch-1
fix link to stateofthemap.africa
Holger Jeromin [Fri, 3 Nov 2023 14:54:24 +0000 (15:54 +0100)]
fix link to stateofthemap.africa
translatewiki.net [Thu, 2 Nov 2023 12:19:27 +0000 (13:19 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 2 Nov 2023 10:11:36 +0000 (10:11 +0000)]
Fix eslint warnings
Tom Hughes [Thu, 2 Nov 2023 10:08:19 +0000 (10:08 +0000)]
Make change set comment rate limit errors display properly
Fixes #4320
Tom Hughes [Thu, 2 Nov 2023 08:44:43 +0000 (08:44 +0000)]
Only count new reports as active for rate limits
Tom Hughes [Tue, 31 Oct 2023 18:16:46 +0000 (18:16 +0000)]
Fix new rubocop warnings
Tom Hughes [Tue, 31 Oct 2023 18:11:57 +0000 (18:11 +0000)]
Update bundle
translatewiki.net [Mon, 30 Oct 2023 12:20:30 +0000 (13:20 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Fri, 27 Oct 2023 13:26:54 +0000 (14:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4308'
Tom Hughes [Thu, 26 Oct 2023 21:51:55 +0000 (22:51 +0100)]
Enable rails 7.1 changes to model callbacks
Tom Hughes [Thu, 26 Oct 2023 21:44:02 +0000 (22:44 +0100)]
Enable precompilation of filter_parameters
Tom Hughes [Thu, 26 Oct 2023 21:35:23 +0000 (22:35 +0100)]
Enable rails 7.1 defaults that relate to rolling upgrades
Tom Hughes [Thu, 26 Oct 2023 21:23:15 +0000 (22:23 +0100)]
Enable rails 7.1 defaults for features we don't use
Tom Hughes [Thu, 26 Oct 2023 21:19:02 +0000 (22:19 +0100)]
Disable deprecated singular association names
Tom Hughes [Thu, 26 Oct 2023 18:58:11 +0000 (19:58 +0100)]
Build new relation member indexes concurrently
Tom Hughes [Thu, 26 Oct 2023 18:48:25 +0000 (19:48 +0100)]
Disable transactions for relation member index changes
Andy Allan [Thu, 26 Oct 2023 18:40:57 +0000 (19:40 +0100)]
Merge pull request #4300 from tomhughes/relation-members-primary-key
Simplify primary key for relation members tables
Tom Hughes [Tue, 10 Oct 2023 20:35:00 +0000 (21:35 +0100)]
Assign proper sequence numbers to relation members in tests
Tom Hughes [Tue, 10 Oct 2023 19:53:20 +0000 (20:53 +0100)]
Remove extraneous fields from primary keys for relation members
Tom Hughes [Thu, 26 Oct 2023 12:14:43 +0000 (13:14 +0100)]
Merge remote-tracking branch 'upstream/pull/4317'
Andy Allan [Thu, 26 Oct 2023 12:06:56 +0000 (13:06 +0100)]
Merge pull request #4170 from osmcz/cuzk
Add contributor info for Czechia for copyright web page
translatewiki.net [Thu, 26 Oct 2023 11:20:38 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Thu, 26 Oct 2023 10:38:10 +0000 (11:38 +0100)]
Switch back to bootstrap releases
Bootstrap-rubygem 5.3.2 onwards allows us to use dartsass-sprockets.
Refs #4262
Tom Hughes [Wed, 25 Oct 2023 17:19:57 +0000 (18:19 +0100)]
Merge remote-tracking branch 'upstream/pull/4293'
Tom Hughes [Wed, 25 Oct 2023 17:15:26 +0000 (18:15 +0100)]
Merge remote-tracking branch 'upstream/pull/4315'
Anton Khorev [Tue, 17 Oct 2023 12:08:22 +0000 (15:08 +0300)]
Override left/right tooltip arrow placement in rtl mode
Anton Khorev [Tue, 17 Oct 2023 12:19:37 +0000 (15:19 +0300)]
Don't pass placement: right to tooltip()
Bootstrap flips it on its own, see https://getbootstrap.com/docs/5.2/components/tooltips/#directions
Anton Khorev [Wed, 25 Oct 2023 12:02:28 +0000 (15:02 +0300)]
Apply unread message background to table cells
Required after updating Bootstrap.
Tom Hughes [Tue, 24 Oct 2023 16:37:48 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/4262'
Andy Allan [Wed, 20 Sep 2023 15:15:04 +0000 (16:15 +0100)]
Upgrade to bootstrap 5.3
Tom Hughes [Tue, 24 Oct 2023 16:26:39 +0000 (17:26 +0100)]
Merge remote-tracking branch 'upstream/pull/4309'
Tom Hughes [Tue, 24 Oct 2023 16:09:39 +0000 (17:09 +0100)]
Update bundle
Adam Hoyle [Tue, 24 Oct 2023 11:11:51 +0000 (12:11 +0100)]
Fix file dimensions and switch from png to jpg
Adam Hoyle [Tue, 24 Oct 2023 07:44:23 +0000 (08:44 +0100)]
Add Africa banner (with @2x)
Mateusz Konieczny [Mon, 23 Oct 2023 19:50:22 +0000 (21:50 +0200)]
rerun script/misc/update-wiki-pages
Adam Hoyle [Mon, 23 Oct 2023 13:14:59 +0000 (14:14 +0100)]
Add banner for SOTM Asia 2023
translatewiki.net [Mon, 23 Oct 2023 11:21:59 +0000 (13:21 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 21 Oct 2023 10:05:04 +0000 (11:05 +0100)]
Merge remote-tracking branch 'upstream/pull/4305'
Tom Hughes [Sat, 21 Oct 2023 10:04:10 +0000 (11:04 +0100)]
Merge remote-tracking branch 'upstream/pull/4306'
dependabot[bot] [Fri, 20 Oct 2023 23:43:06 +0000 (23:43 +0000)]
Bump eslint from 8.51.0 to 8.52.0
Bumps [eslint](https://github.com/eslint/eslint) from 8.51.0 to 8.52.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.51.0...v8.52.0)
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Anton Khorev [Fri, 20 Oct 2023 17:42:38 +0000 (20:42 +0300)]
Remove user list custom css
Tom Hughes [Fri, 20 Oct 2023 16:11:13 +0000 (17:11 +0100)]
Merge remote-tracking branch 'upstream/pull/4304'
Tom Hughes [Fri, 20 Oct 2023 16:07:07 +0000 (17:07 +0100)]
Merge remote-tracking branch 'upstream/pull/4303'
Tom Hughes [Fri, 20 Oct 2023 16:01:03 +0000 (17:01 +0100)]
Merge remote-tracking branch 'upstream/pull/4302'
Anton Khorev [Fri, 20 Oct 2023 14:54:51 +0000 (17:54 +0300)]
Remove oauth list custom css
Anton Khorev [Fri, 20 Oct 2023 14:26:51 +0000 (17:26 +0300)]
Remove some print-related custom css
Anton Khorev [Fri, 20 Oct 2023 13:38:25 +0000 (16:38 +0300)]
Remove some search/directions custom css
translatewiki.net [Thu, 19 Oct 2023 11:20:13 +0000 (13:20 +0200)]
Localisation updates from https://translatewiki.net.
tom.k [Tue, 15 Aug 2023 16:23:27 +0000 (18:23 +0200)]
add contributor info for Czechia
Andy Allan [Wed, 18 Oct 2023 17:51:16 +0000 (18:51 +0100)]
Merge pull request #4278 from tomhughes/rails71
Upgrade to rails 7.1.1
Tom Hughes [Sat, 7 Oct 2023 11:39:01 +0000 (12:39 +0100)]
Update database structure for change in migration ordering
Tom Hughes [Sat, 7 Oct 2023 10:44:38 +0000 (11:44 +0100)]
Update test results for changes to rescuable exception handling
https://github.com/rails/rails/pull/45867
Tom Hughes [Fri, 6 Oct 2023 21:19:22 +0000 (22:19 +0100)]
Fix test as rails no longer seems to return a body for redirects
Tom Hughes [Fri, 6 Oct 2023 21:18:30 +0000 (22:18 +0100)]
Adjust code for rails internal changes
Tom Hughes [Fri, 6 Oct 2023 21:13:50 +0000 (22:13 +0100)]
Replace composite_primary_keys with rails builtin support
Tom Hughes [Wed, 18 Oct 2023 16:36:53 +0000 (17:36 +0100)]
Use db:schema:load to populate the database when linting annotations