tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,303 Commits 10 Branches 0 Tags
eba3411bfa40cbb36205f58a36e34c446fed0ffa
Commit Graph

18303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Plastikmensch
eba3411bfa Re-allow title attribute in <abbr> (#2254) 
* Re-allow title attribute in <abbr>

This was accidentally removed in 7623e18124

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add test

Add a new test to check that title attribute on <abbr> is kept.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-06-19 18:01:35 +02:00
Claire
4ddb736d95 Merge pull request #2252 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-06-18 16:38:08 +02:00
Claire
dc68306b8e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
 2023-06-18 16:14:29 +02:00
Claire
f3c2035fce Merge pull request #2251 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-06-18 16:11:49 +02:00
Claire
64f7a11658 Fix cross-origin loading of locales (#25498) 2023-06-18 15:47:04 +02:00
Claire
3b04e39534 [Glitch] Fix non-interactive upload container being given a button role and tabIndex 
Port c9d06d10d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 14:10:49 +02:00
Claire
e5978184a6 Fix glitch-soc-only test being broken by refactor of the surrounding tests 2023-06-18 13:59:47 +02:00
Claire
6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
 2023-06-18 13:41:33 +02:00
Eugen Rochko
d795c2c70c [Glitch] Fix CAPTCHA page not following design pattern of sign-up flow 
Port 39110d1d0a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:11:58 +02:00
たいち ひ
b1b95ddd1f [Glitch] Rewrite emoji_mart_data_light as TS 
Port 3b5e302f7f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:11:19 +02:00
alfe
9bf63257fb [Glitch] Rewrite <LoadingIndicator/> as FC and TS (#25364) 
Port a86886b1fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 12:10:37 +02:00
Renaud Chaput
0a212cfa7f [Glitch] Add missing report category translation 
Port 1cb4514d0e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:43:07 +02:00
alfe
cdec45eca9 [Glitch] Rewrite <LoadPending /> as FC and TS 
Port dfaf59d99a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:42:04 +02:00
Eugen Rochko
f815bd5fd9 [Glitch] Change "bot" label to "automated" 
Port 432a5d2d4b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-18 10:40:56 +02:00
Claire
65cbcce997 Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
renovate[bot]
9e245d147b Update dependency aws-sdk-s3 to v1.125.0 (#25458) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-16 14:23:58 +02:00
Claire
c9d06d10d4 Fix non-interactive upload container being given a button role and tabIndex (#25462) 2023-06-16 12:03:06 +02:00
Matt Jankowski
b276b3bb83 Remove Ruby GC config from spec helper (#25455) 2023-06-15 22:14:46 +01:00
renovate[bot]
e686a54064 Update dependency better_errors to v2.10.1 (#25445) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-15 10:41:04 +02:00
Daniel M Brasil
b10c05e702 Migrate to request specs in /api/v1/lists (#25443) 2023-06-15 10:19:51 +02:00
renovate[bot]
8b2048d0c8 Lock file maintenance (#25434) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-15 10:13:12 +02:00
renovate[bot]
a6d7abb29d Update dependency intl-messageformat to v10.5.0 (#25431) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-15 09:36:10 +02:00
renovate[bot]
36566e9245 Update dependency core-js to v3.31.0 (#25430) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 18:32:55 +02:00
renovate[bot]
478687fc49 Update libretranslate/libretranslate Docker tag to v1.3.11 (#25428) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 18:15:32 +02:00
renovate[bot]
841e35e291 Update devDependencies (non-major) (#25427) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 18:12:33 +02:00
Matt Jankowski
4c5aa0e470 Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop (#24698) 2023-06-14 16:44:37 +02:00
Daniel M Brasil
24015ef0cc Migrate to request specs in /api/v1/domain_blocks (#25414) 2023-06-14 16:08:53 +02:00
Daniel M Brasil
87aff5aad8 Migrate to request specs in /api/v1/follow_requests (#25411) 2023-06-14 15:43:50 +02:00
Daniel M Brasil
d9c6f70cc6 Fix ArgumentError in /api/v1/admin/accounts/:id/action (#25386) 2023-06-14 15:21:36 +02:00
renovate[bot]
b9e8d2b352 Update dependency sass to v1.63.3 (#25422) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 11:23:54 +02:00
renovate[bot]
95b84874f3 Update dependency redis-namespace to v1.11.0 (#25421) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 11:18:37 +02:00
renovate[bot]
360759df7b Update formatjs monorepo (#25418) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 11:16:36 +02:00
renovate[bot]
f10f4f2359 Update dependency glob to v10.2.7 (#25417) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 10:56:22 +02:00
Matt Jankowski
ae9f5379d1 Reduce factory data created in spec/models/trends/statuses spec (#25410) 2023-06-14 09:57:06 +02:00
Matt Jankowski
31d5bc89d1 Speed improvement for AccountsStatusesCleanupScheduler spec (#25406) 2023-06-14 09:56:11 +02:00
Daniel M Brasil
a5b62e56d0 Migrate to request specs in /api/v1/apps/verify_credentials (#25404) 2023-06-14 09:48:57 +02:00
Daniel M Brasil
a6407aa662 Migrate to request specs in /api/v1/apps (#25401) 2023-06-14 09:48:48 +02:00
Matt Jankowski
4c5f62de99 Extract shared examples from api specs (#25387) 2023-06-14 09:34:01 +02:00
renovate[bot]
ae2790d84f Update babel monorepo to v7.22.5 (#25405) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-06-14 09:22:54 +02:00
renovate[bot]
a99201c735 Update dependency capybara to v3.39.2 (#25407) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 09:21:30 +02:00
renovate[bot]
780d54e5c3 Update dependency aws-sdk-s3 to v1.124.0 (#25297) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-14 09:05:30 +02:00
Eugen Rochko
f20698000f Fix always redirecting to onboarding in web UI (#25396) 2023-06-14 09:05:03 +02:00
Claire
ec59166844 Fix ArgumentError when loading newer Private Mentions (#25399) 2023-06-14 08:54:52 +02:00
Eugen Rochko
bca649ba79 Change edit profile page (#25413) 2023-06-14 04:38:07 +02:00
Eugen Rochko
39110d1d0a Fix CAPTCHA page not following design pattern of sign-up flow (#25395) 2023-06-13 22:30:40 +02:00
たいち ひ
3b5e302f7f Rewrite emoji_mart_data_light as TS (#25138) 2023-06-13 19:28:31 +02:00
alfe
a86886b1fd Rewrite <LoadingIndicator/> as FC and TS (#25364) 2023-06-13 19:26:25 +02:00
Nick Schonning
72590e601a Update Rubocop 1.52.1 (#25376) 2023-06-13 18:42:51 +02:00
Renaud Chaput
1cb4514d0e Add missing report category translation (#25400) 2023-06-13 15:05:40 +02:00
Matt Jankowski
10746af82f Remove unused shared examples for scoped settings (#25389) 2023-06-13 14:59:04 +02:00