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`.
1 year ago
b428d82286
[Glitch] Upgrade react-intl
...
Port 76960f128a
1 year ago
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.
1 year ago
d6feba366b
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 9ba1135000
1 year ago
cd107b054d
[Glitch] Fix `null` signUp URL in various places
...
Port 75ebb60ef6
1 year ago
e7cb0dc83b
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 5c744a5d7d
1 year ago
bda5be1406
Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
85e0bd73cf
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 62f386d44e
1 year ago
40e756f291
Fix prev/next buttons color in media viewer ( #25231 )
1 year ago
971eafc709
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
76960f128a
Upgrade react-intl ( #24906 )
1 year ago
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>
1 year ago
75ebb60ef6
Fix `null` signUp URL in various places ( #25190 )
1 year ago
5c744a5d7d
Handle Surrogate Pairs in truncate() ( #25148 )
1 year ago
615a7d5795
Fix extraneous newlines
1 year ago
62f386d44e
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port a19c1671af
1 year ago
cd0ff98425
[Glitch] Fix export style of `<LoadGap />` based on `<Domain />`
...
Port ae0341c203
1 year ago
f58504f2c7
[Glitch] Update inconsistent `defaultMessage`
...
Port 169f141c4c
1 year ago
53b8a15ee9
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
2592015ce6
[Glitch] Change share action from being in action bar to being in dropdown in web UI
...
Port 97235baa4f
1 year ago
b17b1827e7
[Glitch] Fix `null` signUp URL handling from #25014
...
Port 9be9f4f5e2
1 year ago
8134d62112
[Glitch] Rewrite `<LoadGap />` as FC and TS
...
Port 6077f3e24c
1 year ago
973743ff50
Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
1 year ago
a7e6f3df20
Fix import order with ESLint
...
Port 7b5a274836
1 year ago
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.
1 year ago
214f04f04b
[Glitch] Add support for custom sign-up URLs
...
Port 4d631fcfb7
1 year ago
ffc7a57f8b
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port cbcf32777e
1 year ago
006bc485e4
Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream
1 year ago
8793625bf3
[Glitch] Use JSX syntax for Fragments
...
Port abbc6dfcba
1 year ago
31c4b3183b
Merge commit 'abbc6dfcbaa105faee402694061c408d37320b75' into glitch-soc/merge-upstream
1 year ago
fb2bf621eb
[Glitch] Use the new JSX transform everywhere
...
Port 3b0c3e94e0
1 year ago
03a3ff1f02
Merge commit '3b0c3e94e0831edcf4298bf9940799a2e94c5583' into glitch-soc/merge-upstream
1 year ago
20e8b117e3
fixup! [Glitch] Upgrade to React 18
1 year ago
114ad2d4d1
[Glitch] Rewrite `<TimelineHint />` as FC and TS
...
Port 9cfab99590
2 years ago
76e9386332
[Glitch] Rewrite `<Skeleton/>` as FC and TS
...
Port 0b87919abf
2 years ago
758a0ae1e9
[Glitch] Allow scripts in post embed previews
...
Port 18361ae0c5
2 years ago
569302e5ce
Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream
2 years ago
056dd39631
[Glitch] Upgrade to React 18
...
Port ab029328cf
2 years ago
3413fc7002
Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream
2 years ago
ee6f9d2c92
Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream
2 years ago
9e224add8a
Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
Additional changes:
- `Gemfile`:
Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
Upstream added the `captcha_enabled` setting in another place in the file.
2 years ago
b55d56387b
[Glitch] Add polling and automatic redirection to `/start` on email confirmation
...
Port 86961b5b7b
2 years ago
560f605dc2
Merge commit '86961b5b7b459fd778a9b697bbdfbda03512babb' into glitch-soc/merge-upstream
2 years ago
c3cca0eff4
[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline
...
Port d2eef78d1c
2 years ago
6cde4718c0
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 778fd4d29b
2 years ago
12c177a34e
[Glitch] Change "Sign in" to "Login"
...
Port d05ff56746
2 years ago
0042d5a246
[Glitch] Fix videos being improperly positioned on safari
...
Port de95d0ca8f
2 years ago
e11d884c53
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 6a3211876c
2 years ago
dc9dcd0fa9
[Glitch] Enable ESLint react/no-deprecated
...
Port b0dd260a7a
2 years ago
afde99dc29
[Glitch] Disable RTK safety middlewares
...
Port c9dfc55b22
2 years ago
Claire
Renaud Chaput
dependabot[bot]
y.takahashi
Christian Schmidt
fusagiko / takayamaki
たいち ひ
Eugen Rochko
Nick Schonning