treehouse
/
mastodon
19
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
18,136 Commits
11 Branches
15 Tags
736 MiB
Commit Graph

3098 Commits (ef10e189ed5e41eed149390ddc0e97cd526118e7)

Author SHA1 Message Date
Claire bda5be1406 Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
 2023-06-05 13:25:22 +02:00
dependabot[bot] 9ba1135000 Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-05-31 09:27:21 +02:00
Claire 75ebb60ef6 Fix `null` signUp URL in various places (#25190) 2023-05-30 19:01:42 +02:00
y.takahashi 5c744a5d7d Handle Surrogate Pairs in truncate() (#25148) 2023-05-29 11:55:16 +02:00
Claire 53b8a15ee9 Merge branch 'main' into glitch-soc/merge-upstream 2023-05-28 17:01:25 +02:00
Claire 973743ff50 Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted.
 2023-05-28 16:41:14 +02:00
Claire fa16de4a4e Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules.
 2023-05-28 15:54:31 +02:00
Claire 006bc485e4 Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream 2023-05-28 15:01:53 +02:00
Claire 31c4b3183b Merge commit 'abbc6dfcbaa105faee402694061c408d37320b75' into glitch-soc/merge-upstream 2023-05-28 14:32:26 +02:00
Claire 03a3ff1f02 Merge commit '3b0c3e94e0831edcf4298bf9940799a2e94c5583' into glitch-soc/merge-upstream 2023-05-28 13:55:30 +02:00
Claire 569302e5ce Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream 2023-05-25 23:47:28 +02:00
Claire 3413fc7002 Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream 2023-05-25 23:18:57 +02:00
Claire ee6f9d2c92 Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream 2023-05-25 22:59:30 +02:00
Claire 11368da545 Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
 2023-05-25 20:43:25 +02:00
fusagiko / takayamaki a19c1671af Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
たいち ひ ae0341c203 Fix export style of `<LoadGap />` based on `<Domain />` (#25128) 2023-05-25 13:03:37 +02:00
Renaud Chaput 169f141c4c Update inconsistent `defaultMessage` (#25114) 2023-05-24 12:38:50 +02:00
Eugen Rochko 97235baa4f Change share action from being in action bar to being in dropdown in web UI (#25105) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-24 11:04:43 +02:00
Renaud Chaput 9be9f4f5e2 Fix `null` signUp URL handling from #25014 (#25108) 2023-05-24 09:49:26 +02:00
たいち ひ 6077f3e24c Rewrite `<LoadGap />` as FC and TS (#25042) 2023-05-24 09:20:39 +02:00
Renaud Chaput 7b5a274836 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
Claire 4d631fcfb7 Add support for custom sign-up URLs (#25014) 2023-05-23 15:17:09 +02:00
Claire cbcf32777e Fix video player offering to expand in a lightbox when it's in an iframe (#25067) 2023-05-23 14:28:21 +02:00
Renaud Chaput abbc6dfcba Use JSX syntax for Fragments (#25093) 2023-05-23 11:47:36 +02:00
Renaud Chaput 3b0c3e94e0 Use the new JSX transform (#25064) 2023-05-23 10:52:27 +02:00
たいち ひ 9cfab99590 Rewrite `<TimelineHint />` as FC and TS (#25091) 2023-05-23 10:04:10 +02:00
たいち ひ 0b87919abf Rewrite `<Skeleton/>` as FC and TS (#25055) 2023-05-23 08:58:08 +02:00
Claire 18361ae0c5 Allow scripts in post embed previews (#25071) 2023-05-22 21:18:21 +02:00
Renaud Chaput ab029328cf Upgrade to React 18 (#24916) 2023-05-22 15:48:01 +02:00
Nick Schonning c4f2b1e86a Fix minor typos in comments and spec names (#21831) 2023-05-19 17:13:29 +02:00
Claire d2eef78d1c Fix being unable to load past a full page of filtered posts in Home timeline (#24930) 2023-05-16 15:36:25 +02:00
Steven Munn da2d3cc795 Fix spelling of "Lets" on the onboarding page after clicking the confirmation email (#24959) 
Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-15 22:42:07 +02:00
Christian Schmidt 778fd4d29b Fix UI crash in moderation interface when opening the media modal (#24816) 2023-05-11 12:41:55 +02:00
Emelia Smith db07cfb150 Fix Onboarding Errors (#24883) 2023-05-11 07:55:10 +02:00
Eugen Rochko d05ff56746 Change "Sign in" to "Login" (#24942) 2023-05-10 20:17:55 +02:00
Renaud Chaput 6a3211876c Add stricter ESLint rules for Typescript files (#24926) 2023-05-10 12:59:29 +02:00
Nick Schonning b0dd260a7a Enable ESLint react/no-deprecated (#24471) 2023-05-10 09:05:32 +02:00
たいち ひ 2f09bbdfe0 Rewrite `logo.tsx` as FC (#24909) 2023-05-10 08:58:21 +02:00
Renaud Chaput c9dfc55b22 Disable RTK safety middlewares (#24936) 2023-05-10 08:38:02 +02:00
Claire 710151baf4 Merge commit '0886856bd2adecedcad6fad9dcb86ed8069c46c0' into glitch-soc/merge-upstream 2023-05-09 23:37:38 +02:00
Claire 7f078e41c0 Merge commit 'd67de22458e599447c0d5c85ecbd6fb5aef9b4f4' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  We deleted it.
  Kept it removed.
- `app/javascript/packs/public.jsx`:
  Upstream changed an import, we have slightly different ones.
  Ported upstream changes.
 2023-05-09 23:12:48 +02:00
fusagiko / takayamaki a150bb4f2e Add type annotation for DisplayName component (#24752) 2023-05-09 23:08:54 +02:00
fusagiko / takayamaki cbca954632 Rename Image component to ServerHeroImage (#24894) 2023-05-09 23:08:28 +02:00
Claire 5c4a012ac5 Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
 2023-05-09 22:12:05 +02:00
Claire 63c706d26f Merge commit 'b8d44c55fd9264cdacf66c32541b4343e164bbfb' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream changed the config to properly process imports.
  Glitch-soc had previously already done so.
  Changed the config to better match upstream.
 2023-05-09 20:12:33 +02:00
Nick Schonning 0886856bd2 Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
Renaud Chaput d67de22458 Type Redux store and middleware (#24843) 2023-05-09 16:56:26 +02:00
Renaud Chaput d57be2731c Remove unused iOS agent sniffing function (#24931) 2023-05-09 15:48:53 +02:00
Renaud Chaput b640f89777 Rework polyfills loading (#24907) 2023-05-09 14:55:35 +02:00
Renaud Chaput 85b3823e66 Enforce stricter rules for Typescript files (#24910) 2023-05-09 03:11:56 +02:00