mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,767 Commits
69 Branches
21 Tags
341 MiB
Commit Graph

3544 Commits (cce3f3d6da1da81de01b767f518f3b96dec86443)

Author SHA1 Message Date
Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
 2024-01-10 17:51:12 +01:00
gunchleoc 173953c23e
Fix ISO code for Canadian French (#26015) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-09 10:56:13 +00:00
github-actions[bot] 8e7d5fe2ac
New Crowdin Translations (automated) (#28658) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-09 09:30:33 +00:00
github-actions[bot] cc67943df2
New Crowdin Translations (automated) (#28627) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-08 12:46:25 +00:00
Renaud Chaput a0e237a96f
Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
github-actions[bot] 43d800ada6
New Crowdin Translations (automated) (#28604) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-05 11:29:19 +00:00
Claire d0fd14f851
Fix scrolling to detailed status not always working (#28577) 2024-01-04 14:17:38 +00:00
github-actions[bot] bdf4750633
New Crowdin Translations (automated) (#28590) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-04 09:24:13 +00:00
Claire 9d9008666b Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream 2024-01-03 12:38:49 +01:00
github-actions[bot] 7cce2a41f2
New Crowdin Translations (automated) (#28573) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-03 09:19:46 +00:00
Claire f685c953e5 Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream 2024-01-02 18:12:28 +01:00
Claire 65ea097f1d
Fix loading local accounts with extraneous domain part in WebUI (#28559) 2024-01-02 15:02:25 +00:00
Claire b3542ac57b Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our README.
 2024-01-02 13:35:11 +01:00
github-actions[bot] 0374e11091
New Crowdin Translations (automated) (#28529) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-02 09:11:53 +00:00
Michael Stanclift fdec8d7ffb
Fix OCR when using S3/CDN for assets (#28551) 2024-01-02 09:09:54 +00:00
Claire 35b6583371 Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream 2023-12-29 17:40:57 +01:00
Claire 6374358357
Change media to be hidden/blurred by default in report modal (#28522) 2023-12-29 16:34:13 +00:00
github-actions[bot] 7df9c4f6f3
New Crowdin Translations (automated) (#28481) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-29 10:39:10 +00:00
Santiago Kozak 1cba91d6d1
Fix reply icon display in picture-in-picture footer (#28519) 2023-12-29 09:48:27 +00:00
Claire c5b0e6d5a0 Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
github-actions[bot] e70a65761a
New Crowdin Translations (automated) (#28467) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-22 07:58:20 +00:00
Renaud Chaput 1c041356a1
Fix error on viewing a profile when unlogged (#28465) 2023-12-21 20:19:18 +00:00
Claire 92aa6e2ec9 Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream 2023-12-21 19:42:13 +01:00
Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.
 2023-12-21 19:24:10 +01:00
Claire a60b9acf3c Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream 2023-12-21 19:04:20 +01:00
Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file.
 2023-12-21 18:17:17 +01:00
Eugen Rochko 5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452) 2023-12-21 09:44:09 +00:00
github-actions[bot] 9e5ddc1745
New Crowdin Translations (automated) (#28451) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-21 09:09:00 +00:00
Eugen Rochko 01f0a6ca4f
Fix profile setup showing default avatar in web UI (#28453) 2023-12-21 08:32:25 +00:00
Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
 2023-12-20 22:16:50 +01:00
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
 2023-12-20 20:10:45 +01:00
github-actions[bot] fecc07856c
New Crowdin Translations (automated) (#28439) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-20 09:15:30 +00:00
Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Conflict caused by glitch-soc having a different file size limit constant
  name.
  Updated like upstream did while keeping glitch-soc's constant name.
 2023-12-19 21:24:01 +01:00
Claire 2e786e13cb Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/status_pin_validator.rb`:
  Upstream refactored that file, while glitch-soc had configurable limits for
  pinned statuses.
  Updated the code with upstream's refactor, while keeping glitch-soc's
  configurability.
 2023-12-19 20:51:37 +01:00
Claire d288a6162a Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream 2023-12-19 20:40:05 +01:00
Claire b24f676cf1 Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream 2023-12-19 20:24:57 +01:00
Claire 3ad92e8d0d Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream 2023-12-19 20:17:23 +01:00
Renaud Chaput 7b1d390734
Fixes dropdown target without a `buttonRef` (edit history) (#28427) 2023-12-19 10:47:53 +00:00
github-actions[bot] fa987db738
New Crowdin Translations (automated) (#28423) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-19 09:40:37 +00:00
Claire 3598c2e1db
Revert "Feature - Prevents multiple audio/video attachments from being played at the same time (#24717)" (#28251) 2023-12-19 05:08:52 +00:00
Renaud Chaput 8b1eeb2f90
Fix the loading bar with the new Redux actions (#28422) 2023-12-18 23:19:27 +00:00
Claire a111fd7a0b Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream 2023-12-18 20:47:27 +01:00
Claire d6ad9d351e Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 2023-12-18 19:10:43 +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
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
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 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
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
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 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
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
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
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
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
Claire 7faa27e17d
Change dismissed banners to be stored server-side (#27055) 2023-11-30 11:45:54 +00:00
Josh Goldberg ✨ 3a7f10c3f1
Converted hashtag.jsx to TypeScript (#27872) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-11-28 18:20:10 +00:00
Josh Goldberg ✨ 1142f4c79e
Converted app/javascript/mastodon/utils/ folder to TypeScript (#27895) 2023-11-28 17:47:55 +00:00
github-actions[bot] af02484714
New Crowdin Translations (automated) (#28096) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-28 08:59:48 +00:00
github-actions[bot] fad9343bab
New Crowdin Translations (automated) (#28069) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-27 10:06:35 +00:00
github-actions[bot] 8521238677
New Crowdin Translations (automated) (#28060) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-24 10:25:39 +00:00
Claire 6e70819840
Change search popout to not list unusable search options when logged out (#27918) 2023-11-24 09:27:54 +00:00
github-actions[bot] c810b197ad
New Crowdin Translations (automated) (#28050) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-23 09:34:50 +00:00
github-actions[bot] d3ed03fd6b
New Crowdin Translations (automated) (#28036) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-22 15:48:12 +00:00
Claire 32319187ee
Fix error when muting users from Web UI (#28016) 2023-11-21 11:16:16 +00:00
github-actions[bot] 3c3e0c25ef
New Crowdin Translations (automated) (#28015) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-21 10:35:02 +00:00
github-actions[bot] 8ceae2bce6
New Crowdin Translations (automated) (#27966) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-20 08:47:34 +00:00
Eugen Rochko 0e9801443f
Change to single opt-in during profile setup in onboarding in web UI (#27876) 2023-11-17 10:37:04 +00:00
github-actions[bot] 9c68741f46
New Crowdin Translations (automated) (#27914) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-17 09:16:12 +00:00
Eugen Rochko 87696ea26e
Add prominent share/copy button on profiles in web UI (#27865) 2023-11-16 10:23:14 +00:00
github-actions[bot] 7232d4750d
New Crowdin Translations (automated) (#27884) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-16 10:08:22 +00:00
Eugen Rochko d67bd44ca1
Add profile setup to onboarding in web UI (#27829) 2023-11-15 11:13:53 +00:00
github-actions[bot] d8074128f9
New Crowdin Translations (automated) (#27866) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-15 09:41:24 +00:00
Jeong Arm 922f086253
Fix open status on media modal (#27867) 2023-11-15 09:29:10 +00:00
github-actions[bot] c1e071f634
New Crowdin Translations (automated) (#27848) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-14 10:53:47 +00:00
Brian Holley 4aa06cbdbf
Fix "Hide these posts from home" list setting not refreshing when switching lists (#27763) 2023-11-14 00:39:54 +00:00
Eugen Rochko 7e3c10dec6
Add icons for private and disabled boost in web UI (#27817) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-13 14:39:45 +00:00
github-actions[bot] e5a7b73ef4
New Crowdin Translations (automated) (#27815) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-13 13:21:02 +00:00
github-actions[bot] ac62b995ef
New Crowdin Translations (automated) (#27804) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-10 13:07:04 +00:00
Aleks Xhuvani 7840c6b75b
Do not try to update an undefined video element (#27798) 2023-11-09 22:35:53 +00:00
Claire c451bbe249
Allow viewing and severing relationships with suspended accounts (#27667) 2023-11-09 14:50:25 +00:00
Claire 9b06c0f24a
Fix Web UI not displaying appropriate explanation when a user hides their follows/followers (#27791) 2023-11-09 12:58:02 +00:00
github-actions[bot] 5c328ae674
New Crowdin Translations (automated) (#27768) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-08 12:40:09 +00:00
João Pedro Marques d3cd37d73e
Feature - Prevents multiple audio/video attachments from being played at the same time (#24717) 2023-11-07 23:37:58 +00:00
Jasmin Johal 27cbdc6f22
Change alt text to empty string for avatars (#21875) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-11-07 21:46:08 +00:00
Aleks Xhuvani 58f01a5c9a
Add volume saving/reuse to video player (#27488) 2023-11-07 18:15:38 +00:00
Renaud Chaput f476d9dab2
Fix the `notificationsUpdate` call (#27758) 2023-11-07 14:18:59 +00:00
github-actions[bot] 1b28ab7263
New Crowdin Translations (automated) (#27687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-07 09:03:59 +00:00
Renaud Chaput 6712bf86cd
Fixes website not loading for unlogged users (#27698) 2023-11-04 21:52:56 +00:00
Renaud Chaput 3bf2a7296e
Use Immutable `Record` for accounts in Redux state (#26559) 2023-11-03 15:00:03 +00:00
github-actions[bot] 2d548e273e
New Crowdin Translations (automated) (#27646) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-03 10:10:13 +00:00
mogaminsk ac8e4ed38d
Fix inserting emojis from emoji picker fails with TypeError (#27647) 2023-11-01 07:22:02 +00:00
Renaud Chaput 277e6968f5
Use helpers to check environment in frontend (#27633) 2023-10-31 16:05:44 +00:00
Renaud Chaput 0e3401bc1c
Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
Claire 9c8891b39a
Rewrite `AutosuggestTextarea` as Functional Component (#27618) 2023-10-31 10:17:37 +00:00