1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 13:48:35 +09:00
Commit Graph

1493 Commits

Author SHA1 Message Date
Claire
f5c0c32edd Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
  Glitch-soc used this one but not upstream.
  Upstream pulled a presumably more up-to-date version of the file.
  Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/error.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
2024-08-20 18:31:50 +02:00
Renaud Chaput
4016fd5128
Update CSS color variables to match our latest design system (#31510) 2024-08-20 15:56:44 +00:00
Claire
31a00c0c1a Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
Claire
8a5b57f668
Revert "Support JSON-LD named graph (#31288)" (#31355) 2024-08-09 13:48:54 +00:00
Claire
08adca0c63 Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream 2024-08-06 17:27:48 +02:00
Christian Schmidt
9d0cafd06b
Check Content-Length in ResponseWithLimitAdapter (#31285) 2024-08-06 08:23:48 +00:00
Christian Schmidt
e9e63ed203
Support JSON-LD named graph (#31288) 2024-08-06 07:52:47 +00:00
Claire
e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
2024-08-02 18:09:48 +02:00
Claire
2a704add90
Fix status processing failing halfway when a remote post has a malformed replies attribute (#31246) 2024-08-02 10:39:12 +00:00
Claire
654187a995 Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
Michael Stanclift
91fbd5b422
Adjust magick version detection in admin panel (#30845) 2024-07-29 14:32:29 +00:00
Claire
fb411b6d0f Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
Michael Stanclift
b120792f27
Adjust ffmpeg version detection in admin panel (#31130)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-26 14:13:56 +00:00
Emelia Smith
693d9b03ed
Enable OAuth PKCE Extension (#31129) 2024-07-26 08:53:10 +00:00
Claire
cf5d2c3fe4 Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream 2024-07-25 17:47:02 +02:00
Adam Niedzielski
fbf95216c5
Fix LinkCrawlWorker NoMethodError: undefined method `[]' for nil (#31144) 2024-07-25 14:51:44 +00:00
Claire
68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Adam Niedzielski
cd0ca4b994
Select correct self link when parsing Webfinger response (#31110) 2024-07-23 14:42:31 +00:00
Claire
2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
2024-07-22 17:38:30 +02:00
Claire
ced5e853c7
Fix duplicate orderedItems in user archive's outbox.json (#31099) 2024-07-22 08:56:05 +00:00
Claire
c546757cd1 Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
Adam Niedzielski
fa54b61216
Handle missing links in Webfinger response (#31030) 2024-07-16 13:21:16 +00:00
Claire
52fb4f16ef Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream 2024-07-10 16:58:06 +02:00
David Roetzel
2ea9336b68
Do not pass unknown encoding names to nokogiri. (#30987) 2024-07-10 14:25:39 +00:00
Claire
6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
David Roetzel
fa8e972722
Fix author names as arrays in linked data. (#30957) 2024-07-08 16:04:36 +00:00
Claire
11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
2024-07-06 21:02:42 +02:00
David Roetzel
97eddb5906
Fix details extraction when no title exists. (#30933) 2024-07-05 13:28:52 +00:00
David Roetzel
016c1e4e78
Improve handling of encoding problems when creating link previews (#30929) 2024-07-05 11:54:38 +00:00
Claire
e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
2024-07-04 17:12:14 +02:00
Claire
d3a056adfd
Merge pull request from GHSA-xjvf-fm67-4qc3 2024-07-04 16:45:52 +02:00
Claire
395f17ca17
Merge pull request from GHSA-vp5r-5pgw-jwqx
* Fix streaming sessions not being closed when revoking access to an app

* Add tests for GHSA-7w3c-p9j8-mq3x
2024-07-04 16:11:28 +02:00
David Roetzel
9be77fc0db
Revert "Add system check for missing database indexes" (#30909) 2024-07-03 13:36:42 +00:00
David Roetzel
ebd8e1bbb6
Add system check for missing database indexes (#30888) 2024-07-03 07:19:54 +00:00
Claire
d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Eugen Rochko
0f3fef6fda
Change search modifiers to be case-insensitive (#30865) 2024-06-27 21:34:34 +00:00
Michael Stanclift
3225954865
Fix browser window color on light theme (#30861) 2024-06-27 16:46:20 +00:00
Matt Jankowski
ad53b0ab65
Rely on built-in ruby private IP detection (#30848) 2024-06-27 07:16:59 +00:00
Claire
3b4607991d Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream 2024-06-22 20:59:23 +02:00
Matt Jankowski
72484a194f
Remove CacheBuster default options (#30718) 2024-06-21 15:32:49 +00:00
David Roetzel
2cab1c7b09
Improve encoding detection for link cards (#30780) 2024-06-21 12:51:10 +00:00
Claire
52e34a6bd6 Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream 2024-06-19 11:59:06 +02:00
Matt Jankowski
a8b3d2e4e4
Consolidate time periods methods into base measure (#30757) 2024-06-19 08:45:47 +00:00
Claire
b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
Claire
58ace2e45e
Fix SQL error in admin measures API (#30753) 2024-06-18 16:04:58 +00:00
Matt Jankowski
38c6825eda
Remove unused Extractor#extract_cashtags_with_indices method (#30742) 2024-06-18 12:16:16 +00:00
Claire
395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
2024-06-17 18:30:28 +02:00
Michael Stanclift
d5f02adad7
Add option to use native Ruby driver for Redis (#30717) 2024-06-17 12:28:01 +00:00
Claire
677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Michael Stanclift
a777f7e3cc
Restore short Ruby version on admin dashboard (#30711) 2024-06-14 16:10:16 +00:00