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
1dd243cc09
Add time zone preference ( #25342 )
1 year ago
8b5680fd9a
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
1 year ago
975914e0a6
Fix translations for changing theme ( #25340 )
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
ef344388c5
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
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
2252e4d8bb
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
8f34072fc0
Change follow button in account row to be more obvious in web UI ( #24956 )
1 year ago
14dc8a6a5f
Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )
1 year ago
21f904b344
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
1 year ago
c74040abfa
Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )
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
a04157e69f
Add `allow_other_host: true` to backups controller ( #25266 )
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
e24a587f84
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
1 year ago
c7a8838bd7
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
1 year ago
1c298d97c5
Change wording of “Content cache retention period” setting to highlight destructive implications ( #23261 )
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
572086c8ad
Add support for importing lists ( #25203 )
1 year ago
4e28b89f51
Fix using Date.now() instead of intl.now() ( #25234 )
1 year ago
a6f0456756
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
1 year ago
8ee98cfd2b
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
52b4e33d7f
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
1 year ago
3d550b5712
Fix multiple N+1s in ConversationsController ( #25134 )
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
68296cfb32
Remove unused Settings::Extend module ( #25214 )
1 year ago
8bd9ce4d09
Disable some metrics cops ( #25215 )
1 year ago
654f5c9cdc
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
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
f145662c05
Align argument type to keyword argument for private process method in FetchResourceService ( #25189 )
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
31fe0780bf
Change captcha to be presented even for invited users ( #2227 )
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
245a4eac89
Improve various queries against account domains ( #25126 )
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
a5b52eb618
Change Identity to not destroy associated User on destroy ( #25098 )
2 years ago
cbcf32777e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2 years ago
4e8d882274
Remove dead code in Api::V1::FeaturedTagsController ( #25073 )
2 years ago
0b4d3bf363
Remove invalid X-Frame-Options: ALLOWALL ( #25070 )
2 years ago
abbc6dfcba
Use JSX syntax for Fragments ( #25093 )
2 years ago
3b0c3e94e0
Use the new JSX transform ( #25064 )
2 years ago
9e8323fdb9
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
d64a2c7aa8
Fix Performance/StartWith cop ( #24818 )
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
6e38ffcaee
Fix uncaught TypeError in POST `/api/v1/featured_tags` ( #25072 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
5009e9aed5
Fix uncaught NoMethodError in POST `/api/v1/featured_tags` ( #25063 )
2 years ago
c59cbf1a38
Fix account confirmation flow not returning to app after captcha validation ( #25057 )
2 years ago
ab029328cf
Upgrade to React 18 ( #24916 )
2 years ago
da9237adb5
Fix “Authorized applications” inefficiently and incorrectly getting last use date ( #25060 )
2 years ago
4d07793150
Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified ( #24958 )
2 years ago
8b4d7b22ed
Allow reports with long comments from remote instances, but truncate ( #25028 )
2 years ago
26cdb19dc6
Remove duplicate JPG type ( #25054 )
2 years ago
0635b1c228
Change OpenGraph-based embeds to allow fullscreen ( #25058 )
2 years ago
9cf831be0b
Order sessions by most-recent to least-recently updated ( #25005 )
2 years ago
c4f2b1e86a
Fix minor typos in comments and spec names ( #21831 )
2 years ago
a76777c33b
Fix oversight in backup service ( #25034 )
2 years ago
0206081e40
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2 years ago
5bf9e2ebec
Fix race condition when reblogging a status ( #25016 )
2 years ago
b030441368
Fix being able to vote on your own polls ( #25015 )
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
99f1302cc3
Fix reports not being closed when performing batch suspensions ( #24988 )
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
7cf0ce19e2
Fix uncaught NoMethodError error in `/api/v1/admin/canonical_email_blocks/test` ( #24947 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
c8998a2678
Change profile updates to be sent to recently-mentioned servers ( #24852 )
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
c752e939d5
Change AccessTokensVacuum to also delete expired tokens ( #24868 )
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
d57be2731c
Remove unused iOS agent sniffing function ( #24931 )
2 years ago
b640f89777
Rework polyfills loading ( #24907 )
2 years ago
a2e9b9d87d
Add more detailed type annotation for Account ( #24815 )
2 years ago
85b3823e66
Enforce stricter rules for Typescript files ( #24910 )
2 years ago
b785500809
Enforce React Rules of Hooks with eslint ( #24911 )
2 years ago
45146e3f3b
Dont use CommonJS (`require`, `module.exports`) anywhere ( #24913 )
2 years ago
b8d44c55fd
Mark `wheel` events on scrollable list as passive ( #24914 )
2 years ago
2354041cb7
[Glitch] Fixes build errors from some previous TS-related commits
...
Port e1985e14f6
2 years ago
31e4da41ee
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 9ed91c444e
2 years ago
2c5141e5ed
[Glitch] Remove MastodonMap TS type
...
Port 7bc13c1ca3
2 years ago
ac97d77cb3
[Glitch] Add type annotation for some js files
...
Port 6fa4054a5d
2 years ago
902b2175df
Copy Typescript type definitions to glitch-soc
2 years ago
9775d02a15
[Glitch] Fix incorrect import of redux store
...
Port d76495d080
2 years ago
5af7007906
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 69bd3a86f3
2 years ago
c10a2036bc
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port d6808a561e
2 years ago
62f5d29c25
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 8c43856691
2 years ago
319ff9bd71
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port 52ed627d9e
2 years ago
e225a49255
[Glitch] Add type annotation for Blurhash component
...
Port fc4bb5ed66
2 years ago
cccf0bdace
[Glitch] Add type annotation for IconButton component
...
Port bee49de3db
2 years ago
348aed03cf
Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes, but we had removed it.
Discarded upstream changes.
- `.rubocop_todo.yml`:
Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
Minor upstream code style change where glitch-soc had slightly different code
due to handling of local-only posts.
Updated to match upstream's code style.
- `app/models/status.rb`:
Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
Upstream rewrote a lot of the backup service, glitch-soc had changes because
of exporting local-only posts.
Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
Upstream split the file into different files, while glitch-soc had a few
extra routes.
Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
and `config/routes/admin.rb`
- `db/schema.rb`:
Upstream has new migrations, while glitch-soc had an extra migration.
Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
Upstream added support to set version tags from environment variables, while
glitch-soc has an extra `+glitch` tag.
Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests due to
`directMessage` handling.
Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests.
Applied upstream's changes while keeping glitch-soc's extra tests.
2 years ago
2847b0423b
Fix glitch-soc's thread line styling ( #2214 )
...
Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes.
2 years ago
dd098625f0
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 90e4ab9f8f
2 years ago
c17c65aa57
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 27a750cc04
2 years ago
5bfff5807a
[Glitch] Fix icons having an image role
...
Port c7924acf16
2 years ago
acc7cdc664
[Glitch] Fix audio player width in thread view
...
Port 9cf043f63a
2 years ago
55561098c4
[Glitch] Add eslint-plugin-jsdoc
...
Port 0224c3c0d9
2 years ago
a9089a2458
[Glitch] Fix media description not being cleared
...
Port 6ccea199ca
2 years ago
2aaf3528ca
Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2 years ago
c90f09d36f
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2 years ago
4ab18dee50
Rewrite Domain component as function component ( #24896 )
2 years ago
01caf92d80
Use LayoutType from is_mobile in actions/app ( #24863 )
2 years ago
db240323f6
Fix some more JS linting issues ( #2211 )
...
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js
2 years ago
5f709b1601
Add TypeScript support for `mastodon` alias and image imports ( #24895 )
2 years ago
13a16f3054
Rewrite RadioButton component as FC ( #24897 )
2 years ago
c1ccb55a59
Rewrite Image component as function component ( #24893 )
2 years ago
23a97effdb
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2 years ago
daecca565e
Rewrite <Check /> as FC ( #24901 )
2 years ago
12e8bcac9d
Fix some more Javascript linting issues and discrepancies with upstream ( #2209 )
...
* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream
2 years ago
43c40b5df8
Fix thread lines not being properly updated when new posts are received ( #2210 )
2 years ago
ef5df7fc66
Reset language to default when cancelling a reply ( #2114 )
...
When cancelling a reply, the language was still set to the language of the replied to toot.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2 years ago
e390c26429
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream ( #2208 )
...
* Run eslint --fix
* Fix linting issues in video player and reduce divergences with upstream
This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.
* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`
Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.
* Fix linting issue and bug in streaming/index.js
* Fix linting issues in config/webpack/shared.js
* Fix unused import in flavours/glitch/features/ui/index.js
* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx
* Fix linting issues in flavours/glitch/reducers
* Fix linting issues in glitch-soc onboarding modal
* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx
* Remove dead code for unused local setting navbar_under
* Fix various linting issues
* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2 years ago
6dbd28c763
Fix rubocop warnings ( #2206 )
2 years ago
b80dc7d2ed
Fix SCSS linting issues ( #2207 )
...
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons
* Run stylelint --fix
* Avoid `@extend` directives with doodle modal CSS
* Drop use of `@extend` for notification cleanup buttons SCSS
* Run prettier on SCSS
2 years ago
481aed8061
New Crowdin updates ( #2202 )
...
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
2 years ago
2c894915dc
Rewrite VerifiedBadge component as function component ( #24892 )
2 years ago
f18f692f65
Fix compose textarea scroll behavior ( #24872 )
2 years ago
3ea6c679cf
Fix import data field type ( #24874 )
2 years ago
2a651be35a
Fix column back button error ( #24867 )
2 years ago
458f6d0afb
Make it possible to upload audio and video to Heroku app ( #24866 )
2 years ago
d65d954409
Extract StatusSafeReblogInsert concern from Status ( #24821 )
2 years ago
833076d6bf
Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml ( #24469 )
2 years ago
53e3a1b06d
Fix infinite loop in AccountsStatusesCleanupScheduler ( #24840 )
2 years ago
c366c93cfd
Fail ESLint for Warnings in CI ( #24836 )
2 years ago
1421a8efbd
Fix Back button going outside the app ( #24835 )
2 years ago
f6fd5e4ad0
Autofix Rubocop Style/ConcatArrayLiterals ( #23755 )
2 years ago
2f2c8f671b
Autofix Rubocop Style/HashSyntax ( #23754 )
2 years ago
54d59b8ee0
Autofix Rubocop Style/CaseLikeIf ( #23756 )
2 years ago
fded3a99ab
Spec coverage for settings/preferences/* controllers ( #24825 )
2 years ago
e8537a3a01
Fix Performance/CollectionLiteralInLoop cop ( #24819 )
2 years ago
90b45c5040
Fix various edge cases with local moves ( #24812 )
2 years ago
f89b5c08b6
Fix own posts not getting delivered to own lists ( #24810 )
2 years ago
e1985e14f6
Fixes build errors from some previous TS-related commits ( #24811 )
2 years ago
9ed91c444e
Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )
2 years ago
a4e3f98fc7
Change Move handler to also move list memberships ( #24808 )
2 years ago
7bc13c1ca3
Remove MastodonMap TS type ( #24807 )
2 years ago
S.H
Claire
Darius Kazemi
Jed Fox
Renaud Chaput
Christian Schmidt
Eugen Rochko
Matt Jankowski
jsgoldstein
Nick Schonning
alfe
dependabot[bot]
y.takahashi
fusagiko / takayamaki
たいち ひ
Daniel M Brasil
Emelia Smith
Frankie Roberto
Essem
Steven Munn
Plastikmensch
mogaminsk
zunda
Florin