djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-20 06:33:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
20,527 Commits 69 Branches 22 Tags 412 MiB
Commit Graph

12458 Commits

Author SHA1 Message Date
Claire
60eb57ce1b Fix HAML listing issue 2023-12-18 19:07:15 +01:00
Claire
f5de9fe99a [Glitch] Allow viewing and severing relationships with suspended accounts 
Port c451bbe249475b937906f8f4d85c1f1eb9804343 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-18 18:49:48 +01:00
Aleks Xhuvani
dee28c3fbf [Glitch] Do not try to update an undefined video element 
Port 7840c6b75b61e64d89d7fd9f291277fb177e513f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-18 18:42:30 +01:00
Aleks Xhuvani
372c455218 [Glitch] Add volume saving/reuse to video player 
Port 58f01a5c9a314072d69c157ebfcf5fdd67330068 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-18 18:42:07 +01:00
Claire
b474cbbd28 Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
  We differed by listing suspended users when requesting relationships.
  Updated to upstream's code.
 2023-12-18 18:40:58 +01:00
Claire
46ddaffd40 Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream 2023-12-18 18:34:25 +01:00
Claire
bc33be0342 Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
  Kept our version of `json-ld` while updating other dependencies.
 2023-12-18 18:07:24 +01:00
Claire
7d9b209fe8
Fix call to inefficient delete_matched cache method in domain blocks (#28374) 2023-12-18 16:14:43 +00:00
Claire
3d3fa75c81
Reduce composer differences with upstream and simplify code (#2518) 2023-12-18 13:20:08 +01:00
Matt Jankowski
1820bad646
Fix Performance/StringIdentifierArgument cop (#28399) 2023-12-18 10:26:09 +00:00
Matt Jankowski
2bd8d343cf
Fix Style/SoleNestedConditional and Style/IfInsideElse cops, regenerate haml todo (#28384) 2023-12-18 10:06:42 +00:00
Matt Jankowski
0e5b8fc46b
Fix Style/RedundantReturn cop (#28391) 2023-12-18 09:50:51 +00:00
github-actions[bot]
f99e05710e
New Crowdin Translations (automated) (#28373) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-18 08:25:21 +00:00
Claire
4113fbf6e8 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
 2023-12-17 23:04:16 +01:00
mogaminsk
cc265f760e [Glitch] Fix inserting emojis from emoji picker fails with TypeError 
Port ac8e4ed38db2f391f7f8749a8e3afe265deeae72 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-17 18:03:22 +01:00
Claire
bb4fa0c374 [Glitch] Rewrite AutosuggestTextarea as Functional Component 
Port 9c8891b39a2d04898880f4bd0754a52739ada30a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-17 17:59:33 +01:00
Renaud Chaput
e22c3cd768 [Glitch] Improve Babel configuration and automatically load polyfills 
Port 0e3401bc1c24fc1f6d7e04e9d2394d71b53a1845 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-17 17:50:31 +01:00
Claire
ddf3ad9541 Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main 
Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency.
 2023-12-17 17:43:30 +01:00
Claire
f62bafc7a1 Fix HAML linting issue 2023-12-17 16:37:11 +01:00
Claire
1474318691 Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream fixed a bug in the trending post condition.
  Glitch-soc's condition is different because we potentially allow CWed content
  to trend.
  Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
  Kept our version for now, we will switch to upstream later down the road.
 2023-12-17 15:32:29 +01:00
Matt Jankowski
b1dec09d20
Fix Style/InverseMethods cop (#28377) 2023-12-15 15:52:00 +00:00
Matt Jankowski
e17faedffb
Move default meta options from InitialStateSerializer to private method (AbcSize reduction) (#28355) 2023-12-14 14:04:55 +00:00
github-actions[bot]
b2f915b31a
New Crowdin Translations (automated) (#28344) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-13 09:52:37 +00:00
Claire
dcc24db793
Fix N+1s because of association preloaders not actually getting called (#28339) 2023-12-13 07:47:32 +00:00
Claire
3f1ec16377
Fix empty column explainer getting cropped under certain conditions (#28337) 2023-12-12 14:31:37 +00:00
github-actions[bot]
14e64bc880
New Crowdin Translations (automated) (#28334) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-12 11:45:10 +00:00
Claire
89a496b42f
Fix status edits not always being streamed to mentioned users (#28324) 2023-12-12 10:39:21 +00:00
Claire
a8a5c6514f
Fix LinkCrawlWorker error when encountering empty OEmbed response (#28268) 2023-12-12 08:29:46 +00:00
Matt Jankowski
2c6369918c
Fix Style/RedundantArgument cop (#28321) 2023-12-11 14:58:29 +00:00
Claire
f3864db409
Fix notification sounds (#28316) 2023-12-11 14:23:30 +00:00
github-actions[bot]
79a81da69c
New Crowdin Translations (automated) (#28291) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-11 08:22:52 +00:00
Michael Stanclift
afc8550b63
Change preview card deletes to be done using batch method (#28183) 2023-12-11 07:49:10 +00:00
Claire
9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
 2023-12-10 18:05:02 +01:00
Claire
df5c64fe57 Further reduce differences with upstream 2023-12-09 21:19:43 +01:00
Claire
cc1d68ace8 [Glitch] Show announcements in reverse chronological order 
Port f1f0400adcd667b8ea558dad0bf42236f12530f4 and 8e2530ea16332f389edaeba7e87d7447c077bb00 to glitch-soc

Co-Authored-By: Darius Kazemi <darius.kazemi@gmail.com>
 2023-12-09 21:19:43 +01:00
Claire
4b2ddaf106 Further reduce differences with upstream 2023-12-09 21:19:43 +01:00
Claire
408d4710ed Further reduce differences with upstream 2023-12-09 20:58:50 +01:00
Claire
a27abb4802
Further reduce code differences with upstream (#2509) 2023-12-09 20:29:23 +01:00
Claire
1ddf2012ee
Fix status avatar size discrepancies (#2510) 
Follow-up to #2508
 2023-12-09 20:29:15 +01:00
Claire
b2647bc3f2
[Glitch] Update Avatar, AvatarComposite, and AvatarOverlay components (#2508) 
Various ports including 8dfe5179ee7186e549dbe1186a151ffa848fe8ab,
d1de7fb7fa561a76c30f3b1f60b82856443ed4b3 and
9f8d34620b6fa502da683f3775805bf2a5474f92.

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: fusagiko / takayamaki <24884114+takayamaki@users.noreply.github.com>
 2023-12-09 18:33:42 +01:00
github-actions[bot]
ca1b7efb06
New Crowdin Translations (automated) (#28275) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-08 09:52:32 +00:00
Matt Jankowski
3918dc68c7
Use composite primary key for PreviewCardsStatus model (#28208) 2023-12-07 14:49:05 +00:00
Michael Stanclift
da3d8aff79
Error handling for attachment batch delete process (#28184) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-07 14:40:44 +00:00
github-actions[bot]
e0dacf6b4c
New Crowdin Translations (automated) (#28264) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-07 09:38:44 +00:00
Claire
7593465c23
Fix error when processing link preview with an array as inLanguage (#28252) 2023-12-07 09:05:08 +00:00
Matt Jankowski
ee83d5c760
Enable the eslint react/no-unknown-property rule (#28217) 2023-12-06 13:42:12 +00:00
github-actions[bot]
954169966b
New Crowdin Translations (automated) (#28245) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-06 08:52:55 +00:00
github-actions[bot]
4238ec844d
New Crowdin Translations (automated) (#28120) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-05 16:07:53 +00:00
Jonathan de Jong
d0a5ebf914
Fix error when encountering malformed Tag objects from Kbin (#28235) 2023-12-05 13:59:15 +00:00
Claire
9fcf5d4192
[Glitch] Fix emoji picker button scrolling with textarea content in single-column view (#2501) 
Port bbea0529354c392f70843860956421e9bc25f2c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-04 13:30:27 +01:00