monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,345 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

7006 Commits

Author SHA1 Message Date
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
Renaud Chaput a4a728b01d [Glitch] Fix the loading bar with the new Redux actions 
Port 8b1eeb2f90 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Claire 93c71e2c7c [Glitch] Fix notification sounds 
Port f3864db409 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Claire 70652e49eb [Glitch] Fix error when muting users from Web UI 
Port 32319187ee to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Renaud Chaput e94fecdcc8 [Glitch] Fix the `notificationsUpdate` call 
Port f476d9dab2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Renaud Chaput 79678cf841 [Glitch] Fixes website not loading for unlogged users 
Port 6712bf86cd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Renaud Chaput 7fe5623a27 [Glitch] Use Immutable `Record` for accounts in Redux state 
Port 3bf2a7296e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Renaud Chaput 3b7caa00e2 [Glitch] Add Typescript types for some API objects 
Port 57f592fed5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 19:49:44 +01:00
Claire a3a58c041e
Merge pull request #2527 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8ebc94dd22
 2023-12-20 19:48: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
Essem b7cb17fecf
Fix the poll option add button attempting to submit a form (#2530) 2023-12-20 08:24:28 +01:00
Claire 9bfb699c4c [Glitch] Change search popout to not list unusable search options when logged out 
Port 6e70819840 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-19 21:25:55 +01: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 7db68e2dca [Glitch] Fix upper border radius of onboarding columns 
Port 0a6ec048a8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-19 20:26:22 +01:00
Claire b24f676cf1 Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream 2023-12-19 20:24:57 +01:00
Jeong Arm 94c4c7f330 [Glitch] Fix open status on media modal 
Port 922f086253 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-19 20:17:45 +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
Brian Holley 4259f4a4aa [Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists 
Port 4aa06cbdbf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-18 20:59:33 +01:00
Claire a111fd7a0b Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream 2023-12-18 20:47:27 +01:00
pajowu 6261db2a26 [Glitch] Fix modal content not being selectable 
Port ed79713f3a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-18 19:15:57 +01:00
Claire d6ad9d351e Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 2023-12-18 19:10:43 +01:00
Claire f5de9fe99a [Glitch] Allow viewing and severing relationships with suspended accounts 
Port c451bbe249 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 7840c6b75b 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 58f01a5c9a 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 3d3fa75c81
Reduce composer differences with upstream and simplify code (#2518) 2023-12-18 13:20:08 +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
mogaminsk cc265f760e [Glitch] Fix inserting emojis from emoji picker fails with TypeError 
Port ac8e4ed38d 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 9c8891b39a 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 0e3401bc1c 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 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
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 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
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 f1f0400adc and 8e2530ea16 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 8dfe5179ee,
d1de7fb7fa and
9f8d34620b.

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
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 9fcf5d4192
[Glitch] Fix emoji picker button scrolling with textarea content in single-column view (#2501) 
Port bbea052935 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-04 13:30:27 +01:00
Essem a46b6af1d6
Fix constant redirects to onboarding page (#2505) 2023-12-04 13:30:17 +01:00
Claire 23ee393fdd
Merge pull request #2499 from ClearlyClaire/glitch-soc/port-toasts 
Port upstream's toast changes
 2023-12-03 20:57:42 +01:00
Eugen Rochko cede2f533c [Glitch] Fix toast saying "published" instead of "saved" after editing post in web UI 
Port 71641766f2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 19:39:08 +01:00
Renaud Chaput 9ac73a1fbf [Glitch] Change `eslint` config to autofix missing comma and indentation in JS files 
Partial port of 774e1189d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 16:44:40 +01:00
Christian Schmidt ea004108b8 [Glitch] Make notification respect reduce-motion 
Port 6d0767558a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 16:38:41 +01:00
Stanislas Signoud 811b8b200e [Glitch] Use invariant colors on notification toasts 
Port ca955ada0b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 16:38:41 +01:00
Eugen Rochko 3bbe39f233 [Glitch] Add toast with option to open post after publishing in web UI 
Port a7ca33ad96 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 16:38:41 +01:00
Claire 046cb408b7 [Glitch] Fix front-end bug when processing relationship-related account actions 
Port 287520453c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 13:19:10 +01:00
Renaud Chaput c3a0d5aca3 [Glitch] Fix Redux types 
Port 0712cc2b99 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 13:19:10 +01:00
Renaud Chaput 6fb5fafd28 [Glitch] Convert `actions/account_notes` into Typescript 
Port bd06c13204 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 13:19:10 +01:00
Claire ee58f680e8 [Glitch] Fix autocomplete suggestions being cut off in compose form 
Port 6833732852 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Claire 6269a5336f [Glitch] Change composer highlight border size to be more noticeable 
Port aa4c9730f6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Claire 204fe83fcc [Glitch] Fix compose textarea scroll behavior 
Port 746979f75d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Claire a8f6a5b40f Update translation strings 2023-12-03 11:23:12 +01:00
Claire 786b42e2b5 Fix SCSS and JS linting issues 2023-12-03 11:23:12 +01:00
Claire a0943b8f6d Remove glitch-soc's old onboarding modal 2023-12-03 11:23:12 +01:00
Renaud Chaput 6dc812dd51 [Glitch] Upgrade to react-router v5 in onboarding code 
Port 1b70d7ed7c to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Eugen Rochko 06e819537b [Glitch] Change labels and styles on the onboarding screen in web UI 
Port a985d587e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Eugen Rochko d5bad93460 [Glitch] Change "Follow 7 people" to "Find at least 7 people to follow" in web UI 
Port 4a5464f360 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
たいち ひ c2c25122e8 [Glitch] Rewrite <Check /> as FC 
Port 6fdbee240c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Renaud Chaput a1667ba796 [Glitch] Upgrade react-intl usage in onboarding code 
Port remaining of 44cd88adc4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Claire e47c582283 Fix import order 2023-12-03 11:23:12 +01:00
Renaud Chaput ba4c8a9b41 [Glitch] Use the new JSX transform in onboarding code 
Port the remaining of 8f66126b10 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Steven Munn 6e4497ab2d [Glitch] Fix spelling of "Lets" on the onboarding page after clicking the confirmation email 
Port 52d36f0f98 to glitch-soc

Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Emelia Smith 1cb8df655b [Glitch] Fix Onboarding Errors 
Port b8a2430642 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Renaud Chaput 0b1556b7f7 [Glitch] Enforce stricter rules for Typescript files 
Port c8181eb0a4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Eugen Rochko 542f2fb1e0 [Glitch] Add default post text to onboarding flow in web UI 
Port 8979b70975 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Eugen Rochko e0b401e295 [Glitch] Add more tips to onboarding flow in web UI 
Port c35e3cb6ac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Eugen Rochko 4537b4b961 [Glitch] Add new onboarding flow to web UI 
Port 0461f83320 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-03 11:23:12 +01:00
Claire 335cfab32f
Change account note design to match upstream's (#2495) 2023-12-03 11:22:38 +01:00
Claire f1241b4a3a
Fix translation string for `status.favourite` not having been changed everywhere (#2494) 2023-12-03 09:51:29 +01:00
Claire edd96ce786
Merge pull request #2492 from ClearlyClaire/glitch-soc/painful-backports 
Port account rows design change from upstream
 2023-12-03 09:51:07 +01:00
Claire 21df2a68ac Hide followers count when hidden by instance or user 2023-12-02 17:38:07 +01:00
Claire 09062d393f Fix more styling issues 2023-12-02 17:38:07 +01:00
Claire 28d4f3ab70 Fix account component styling wrt. upstream 2023-12-02 17:05:54 +01:00
fusagiko / takayamaki dc917cfcdf [Glitch] Fix account.jsx imports (#25541) 
Port remaining part of e0d230fb37,
20e85c0e83 and
9d45a444f9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Eugen Rochko 17372a3ec0 [Glitch] Change labels and styles on the onboarding screen in `Account` component 
Partial port of a985d587e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Eugen Rochko 0421b44f22 [Glitch] Change follow button in account row to be more obvious in web UI (#24956) 
Port 0ddc895282 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Claire f1691eca55 [Glitch] Fix overflow behavior of account rows 
Port 5fae2de454 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00
Renaud Chaput 98a7b95058 [Glitch] Update inconsistent `defaultMessage` in `Account` component 
Partial port of e58c36d308 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-02 16:59:40 +01:00