me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18169 commits 2 branches 0 tags 429 MiB
Commit graph

3107 commits

Author SHA1 Message Date
Claire
e6b6a0535e Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream 2023-06-10 15:17:08 +02:00
Claire
13b84da439 Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream 2023-06-10 15:09:19 +02:00
Claire
447b44a5d6 Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
 2023-06-10 14:38:04 +02:00
Claire
c22b032483 Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, but we've deleted it.
  Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
  Reworked upstream, but the code was mostly in
  `app/javascript/locales/index.js` in glitch-soc.
  Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
  Deleted upstream, as upstream now directly loads the
  JSON at runtime.
  Deleted as well, will switch to runtime loading in
  an upcoming commit.
- `config/webpack/shared.js`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
  Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
  instead.
  Moved the glitch-soc logic there and deleted the file.
 2023-06-10 12:38:33 +02:00
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
Claire
a82f036309 Fix overflow behavior of account rows (#25131) 2023-06-01 14:47:55 +02:00
S.H
4e28b89f51 Fix using Date.now() instead of intl.now() (#25234) 2023-06-01 13:46:19 +02:00
Claire
8ee98cfd2b Add a confirmation screen when suspending a domain (#25144) 2023-06-01 09:37:38 +02:00
Christian Schmidt
971eafc709 Translate CW, poll options and media descriptions (#24175) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-01 00:10:21 +02:00
Renaud Chaput
76960f128a Upgrade react-intl (#24906) 2023-05-31 23:43:39 +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