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

19746 Commits

Author SHA1 Message Date
Claire cd2ee0ec5f Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept ours.
- `yarn.lock`:
  Upstream changed from yarn 1 to yarn 4, but we had some different
  dependencies.
  Updated to yarn 4 and re-added our dependencies.
 2023-12-18 18:25:33 +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
Claire 18856371be
Merge pull request #2520 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to f476d9dab2
 2023-12-18 13:19:45 +01:00
Claire 33dd5d8179 Fix Ruby lint issues 2023-12-17 23:17:55 +01: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 c8fe36c349
Merge pull request #2517 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3bf896c973
 2023-12-17 20:06:18 +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 537b88330d
Merge pull request #2514 from ClearlyClaire/glitch-soc/main 
Merge upstream changes up to a916251d8a
 2023-12-17 17:42:22 +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
Claire b7248485b1
Merge pull request #2477 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 2e6bf60f15
 2023-12-12 19:45:18 +01: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 98f50429d5
Merge pull request #2511 from ClearlyClaire/glitch-soc/cleanup-2 
Further reduce code differences with upstream
 2023-12-10 18:03:04 +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
Claire c0e562916c
Fix glitch-soc being uninstallable because of yanked dependency (#2507) 2023-12-06 13:32:27 +01: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
Claire 13902903d3
Merge pull request #2497 from ClearlyClaire/glitch-soc/ports/account_notes-typescript 
Port upstream's TypeScript refactor of account_notes
 2023-12-03 20:57:23 +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 c82d4cfb71
Merge pull request #2493 from ClearlyClaire/glitch-soc/even-more-painful-backports 
Port onboarding changes from upstream
 2023-12-03 13:18:50 +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