14788cf0ce
Switch to using a `common` runtime chunk rather than `locales`
1 year ago
b5872b0686
[Glitch] Change design of dropdowns in web UI
...
Port 7abfddd8a5
1 year ago
ee6682e48d
[Glitch] Rewrite `<LoadMore />` as FC and TS
...
Port f9c819e8db
1 year ago
ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
1 year ago
29e63ef4d5
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 21f904b344
1 year ago
00307189bc
[Glitch] Fix not shown announcements in hometimeline.
...
Port 94f9888d57
1 year ago
3dd186bbf1
[Glitch] Fix design issues with recent react-intl upgrade
...
Port 4c2503d36c
1 year ago
46b4268007
[Glitch] Add exclusive lists
...
Port 6debddcf89
1 year ago
60762fb8ba
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from c7a8838bd7
1 year ago
2877b12754
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port 2d2750c6a9
1 year ago
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
1 year ago
333c28ce6d
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port 29851c83bd
1 year ago
3b87fe21fa
Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
1 year ago
7ccf99b652
[Glitch] Fix using Date.now() instead of intl.now()
...
Port 4e28b89f51
1 year ago
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
1 year ago
fd0b9c9881
[Glitch] Add a confirmation screen when suspending a domain
...
Port 8ee98cfd2b
1 year ago
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
1 year ago
5715cd6b8a
[Glitch] Fix prev/next buttons color in media viewer
...
Port 40e756f291
1 year ago
8b958c0858
[Glitch] Translate CW, poll options and media descriptions
...
Port 971eafc709
1 year ago
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
66a5173629
Add `legal` as report category ( #23941 )
1 year ago
7abfddd8a5
Change design of dropdowns in web UI ( #25107 )
1 year ago
f9c819e8db
Rewrite `<LoadMore />` as FC and TS ( #25259 )
1 year ago
51046cb4db
Fix autocomplete suggestions being cut off in compose form ( #25275 )
1 year ago
8f34072fc0
Change follow button in account row to be more obvious in web UI ( #24956 )
1 year ago
21f904b344
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
1 year ago
94f9888d57
Fix not shown announcements in hometimeline. ( #25251 )
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
4c2503d36c
Fix design issues with recent react-intl upgrade ( #25272 )
1 year ago
6debddcf89
Add exclusive lists ( #22048 )
...
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
c4426198c3
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
1 year ago
85e0bd73cf
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 62f386d44e
1 year ago
c7a8838bd7
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
1 year ago
2d2750c6a9
Fix spacing of middle dots in the detailed status meta section ( #25247 )
1 year ago
29851c83bd
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
a82f036309
Fix overflow behavior of account rows ( #25131 )
1 year ago
4e28b89f51
Fix using Date.now() instead of intl.now() ( #25234 )
1 year ago
8ee98cfd2b
Add a confirmation screen when suspending a domain ( #25144 )
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
a3c2519ba0
[Glitch] Add type annotation for DisplayName component
...
Port a150bb4f2e
2 years ago
b3e018ce58
[Glitch] Rename Image component to ServerHeroImage
...
Port cbca954632
2 years ago
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.
2 years ago
5a99be78e4
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2 years ago
b13b71d1f5
Greatly simplify history management code ( #2230 )
...
Fixes #2220
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream.
2 years ago
56ac8eb6ea
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2 years ago
a19c1671af
Rewrite actions/modal and reducers/modal with typescript ( #24833 )
2 years ago
ae0341c203
Fix export style of `<LoadGap />` based on `<Domain />` ( #25128 )
2 years ago
169f141c4c
Update inconsistent `defaultMessage` ( #25114 )
2 years ago
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>
2 years ago
9be9f4f5e2
Fix `null` signUp URL handling from #25014 ( #25108 )
2 years ago
6077f3e24c
Rewrite `<LoadGap />` as FC and TS ( #25042 )
2 years ago
7b5a274836
Enforce import order with ESLint ( #25096 )
2 years ago
4d631fcfb7
Add support for custom sign-up URLs ( #25014 )
2 years ago
cbcf32777e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2 years ago
abbc6dfcba
Use JSX syntax for Fragments ( #25093 )
2 years ago
3b0c3e94e0
Use the new JSX transform ( #25064 )
2 years ago
9cfab99590
Rewrite `<TimelineHint />` as FC and TS ( #25091 )
2 years ago
0b87919abf
Rewrite `<Skeleton/>` as FC and TS ( #25055 )
2 years ago
18361ae0c5
Allow scripts in post embed previews ( #25071 )
2 years ago
ab029328cf
Upgrade to React 18 ( #24916 )
2 years ago
26cdb19dc6
Remove duplicate JPG type ( #25054 )
2 years ago
c4f2b1e86a
Fix minor typos in comments and spec names ( #21831 )
2 years ago
0206081e40
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2 years ago
844d8e101e
Add hCaptcha support ( #25019 )
2 years ago
86961b5b7b
Add polling and automatic redirection to `/start` on email confirmation ( #25013 )
2 years ago
d2eef78d1c
Fix being unable to load past a full page of filtered posts in Home timeline ( #24930 )
2 years ago
74ff0cd2d5
Change composer highlight border size to be more noticeable ( #25010 )
2 years ago
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>
2 years ago
778fd4d29b
Fix UI crash in moderation interface when opening the media modal ( #24816 )
2 years ago
db07cfb150
Fix Onboarding Errors ( #24883 )
2 years ago
d05ff56746
Change "Sign in" to "Login" ( #24942 )
2 years ago
de95d0ca8f
Fix videos being improperly positioned on safari ( #24943 )
2 years ago
6a3211876c
Add stricter ESLint rules for Typescript files ( #24926 )
2 years ago
b0dd260a7a
Enable ESLint react/no-deprecated ( #24471 )
2 years ago
2f09bbdfe0
Rewrite `logo.tsx` as FC ( #24909 )
2 years ago
c9dfc55b22
Disable RTK safety middlewares ( #24936 )
2 years ago
abb99eca95
Remove our copy of image.d.ts as tsconfig already uses upstream's
2 years ago
e63a08bafd
Run prettier on Typescript files
...
Port 0886856bd2
2 years ago
710151baf4
Merge commit '0886856bd2adecedcad6fad9dcb86ed8069c46c0' into glitch-soc/merge-upstream
2 years ago
487715a3e3
[Glitch] Type Redux store and middleware
...
Port d67de22458
2 years ago
b21d2eaeb6
[Glitch] Remove unused iOS agent sniffing function
...
Port d57be2731c
2 years ago
e8415aa727
[Glitch] Rework polyfills loading
...
Port b640f89777
2 years ago
c5fb52eb23
[Glitch] Add more detailed type annotation for Account
...
Port a2e9b9d87d
2 years ago
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.
2 years ago
a150bb4f2e
Add type annotation for DisplayName component ( #24752 )
2 years ago
cbca954632
Rename Image component to ServerHeroImage ( #24894 )
2 years ago
81b01c961b
Disable broken onboarding code
2 years ago
d0545c950c
[Glitch] Enforce stricter rules for Typescript files
...
Port 85b3823e66
2 years ago
a7d51b92f3
[Glitch] Enforce React Rules of Hooks with eslint
...
Port b785500809
2 years ago
4e88d37759
[Glitch] Dont use CommonJS (`require`, `module.exports`) anywhere
...
Port 45146e3f3b
2 years ago
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.
2 years ago
8a2bb3fb99
[Glitch] Add TypeScript support for `mastodon` alias and image imports
...
Port 5f709b1601
2 years ago
43b38dc9e6
Copy hooks/useHovering.ts to glitch-soc
2 years ago
a0047223a5
Fix IconButton prop types in glitch-soc
2 years ago
d8cae2752c
[Glitch] Mark `wheel` events on scrollable list as passive
...
Port b8d44c55fd
2 years ago
fe8412bcf4
[Glitch] Rewrite Domain component as function component
...
Port 4ab18dee50
2 years ago
7630b904ee
[Glitch] Use LayoutType from is_mobile in actions/app
...
Port 01caf92d80
2 years ago
bf45760e0b
[Glitch] Rewrite RadioButton component as FC
...
Port 13a16f3054
2 years ago
3c62d50502
[Glitch] Rewrite Image component as function component
...
Port c1ccb55a59
2 years ago
77edfc33ba
[Glitch] Rewrite <NotSignedInIndicator /> as FC
...
Port 23a97effdb
2 years ago
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.
2 years ago
0886856bd2
Use Prettier for ESLint formatting TypeScript ( #23631 )
2 years ago
d67de22458
Type Redux store and middleware ( #24843 )
2 years ago
da803512c9
Fix javascript on moderation interface ( #24933 )
2 years ago
Claire
Eugen Rochko
alfe
S.H
Darius Kazemi
Jed Fox
Renaud Chaput
Christian Schmidt
dependabot[bot]
y.takahashi
fusagiko / takayamaki
たいち ひ
Nick Schonning
Steven Munn
Emelia Smith