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

18338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
たいち ひ
c71fc42f4e [Glitch] Rewrite <AutosuggestHashtag /> as FC and TS 
Port 804488d38e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-25 14:27:46 +02:00
Claire
178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
 2023-06-25 14:27:38 +02:00
Claire
55e7c08a83 Fix verified badge in account lists potentially including rel="me" links (#25561) 2023-06-24 17:24:31 +02:00
Eugen Rochko
a985d587e1 Change labels and styles on the onboarding screen in web UI (#25559) 2023-06-23 16:34:27 +02:00
Claire
0842a68532 Remove unique accounts condition from Home onboarding prompt (#25556) 2023-06-23 14:44:54 +02:00
Eugen Rochko
00ec43914a Add onboarding prompt when home feed too slow in web UI (#25267) 2023-06-22 23:48:40 +02:00
Claire
1d622c8033 Add POST /api/v1/conversations/:id/unread (#25509) 2023-06-22 18:46:43 +02:00
Matt Jankowski
c9cd634184 Use default bootsnap/setup in boot.rb (#25502) 2023-06-22 18:46:32 +02:00
Claire
a8c1c8bd37 Fix j/k keyboard shortcuts on some status lists (#25554) 2023-06-22 17:54:43 +02:00
Claire
a5b6f6da80 Change /api/v1/statuses/:id/history to always return at least one item (#25510) 2023-06-22 14:56:14 +02:00
Matt Jankowski
05f9e39b32 Fix RSpec/VerifiedDoubles cop (#25469) 2023-06-22 14:55:22 +02:00
Matt Jankowski
38433ccd0b Reduce Admin::Reports::Actions spec db activity (#25465) 2023-06-22 14:53:13 +02:00
Claire
602c458ab6 Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00
Matt Jankowski
63d15d5330 Speed-up on StatusesController spec (#25549) 2023-06-22 14:51:53 +02:00
mogaminsk
8d2c26834f Fix custom signup URL may not loaded (#25531) 2023-06-22 12:10:49 +02:00
Matt Jankowski
0b39b9abee Speed-up on BackupService spec (#25527) 2023-06-22 11:53:28 +02:00
Daniel M Brasil
6ac271c2a0 Migrate to request specs in /api/v1/suggestions (#25540) 2023-06-22 11:49:35 +02:00
Ian
69db507924 Change emoji picker icon (#25479) 2023-06-21 17:58:00 +02:00
Claire
37a9c2258a Add per-test timeouts to AutoStatusesCleanupScheduler tests (#24841) 2023-06-20 18:54:05 +02:00
Claire
ebfeaebedb Fix /api/v1/conversations sometimes returning empty accounts (#25499) 2023-06-20 18:32:26 +02:00
Claire
ec91ea4457 Fix missing validation on default_privacy setting (#25513) 2023-06-20 18:32:14 +02:00
Daniel M Brasil
e53eb38a8d Migrate to request specs in /api/v1/admin/account_actions (#25514) 2023-06-20 18:16:48 +02:00
Claire
fd23f50243 Fix wrong view being displayed when a webhook fails validation (#25464) 2023-06-20 18:15:35 +02:00
Claire
c78280a8ce Add translate="no" to outgoing mentions and links (#25524) 2023-06-20 18:10:19 +02:00
Emelia Smith
3a91603b15 Prevent UserCleanupScheduler from overwhelming streaming (#25519) 2023-06-20 18:04:35 +02:00
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
dd07393e75 Fix user settings not getting validated (#25508) 2023-06-19 14:06:06 +01:00
たいち ひ
804488d38e Rewrite <AutosuggestHashtag /> as FC and TS (#25481) 2023-06-19 14:11:46 +02:00
Matt Jankowski
e1c9d52e91 Reduce sleep time in request pool spec (#25470) 2023-06-19 13:48:25 +02:00
renovate[bot]
cec4f1d506 Update dependency dotenv to v16.2.0 (#25506) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-19 11:28:59 +02:00
Matt Jankowski
3a65fb044f Add coverage for UserMailer methods (#25484) 2023-06-19 09:50:35 +02:00
Matt Jankowski
e835198b26 Combine assertions in api/v1/notifications spec (#25486) 2023-06-19 09:05:42 +02:00
Matt Jankowski
155ec185b2 Remove unused picture_hint helper method (#25485) 2023-06-19 09:04:15 +02:00
renovate[bot]
a0d7ae257d Update dependency aws-sdk-s3 to v1.126.0 (#25480) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-19 09:03:50 +02:00
Daniel M Brasil
b9bc9d0bda Fix incorrect pagination headers in /api/v2/admin/accounts (#25477) 2023-06-19 08:53:05 +02:00
Daniel M Brasil
0a0a1f1495 Migrate to request specs in /api/v1/tags (#25439) 2023-06-19 08:51:40 +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