14bb6bb29a
Fix `null` signUp URL in various places ( #25190 )
1 year ago
64b960b6b3
Handle Surrogate Pairs in truncate() ( #25148 )
1 year ago
5ed48e6878
Fix extraneous newlines
1 year ago
382b2a506a
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port 38c6216082
1 year ago
6a592083f1
[Glitch] Fix export style of `<LoadGap />` based on `<Domain />`
...
Port 4197b5e4c8
1 year ago
0009b4b574
[Glitch] Update inconsistent `defaultMessage`
...
Port e58c36d308
1 year ago
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
e7dc375aab
[Glitch] Change share action from being in action bar to being in dropdown in web UI
...
Port 1caa5ff39e
1 year ago
7bec63e6e2
[Glitch] Fix `null` signUp URL handling from #25014
...
Port 40b948a1fb
1 year ago
017fbc7a74
[Glitch] Rewrite `<LoadGap />` as FC and TS
...
Port 7336f3648b
1 year ago
0e7466717f
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
1 year ago
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
1 year ago
1cd7f5ff17
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' 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
9e5278ea7b
[Glitch] Add support for custom sign-up URLs
...
Port ca66e61b93
1 year ago
8f380a33fc
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port 100840c06e
1 year ago
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
1 year ago
a0bc0619ca
[Glitch] Use JSX syntax for Fragments
...
Port 5a16bd7bf4
1 year ago
8278907ff7
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
1 year ago
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
1 year ago
9381f78166
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
1 year ago
1347ca6eb0
fixup! [Glitch] Upgrade to React 18
1 year ago
60c7e559d8
[Glitch] Rewrite `<TimelineHint />` as FC and TS
...
Port 9a472efe7c
2 years ago
6746e5d430
[Glitch] Rewrite `<Skeleton/>` as FC and TS
...
Port 8066118d1f
2 years ago
892b3c16f5
[Glitch] Allow scripts in post embed previews
...
Port 711a037660
2 years ago
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
2 years ago
3b375ee395
[Glitch] Upgrade to React 18
...
Port 8d6aea3326
2 years ago
45d7358100
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
2 years ago
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2 years ago
ad1098970b
Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' 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
ba73f0ea3a
[Glitch] Add polling and automatic redirection to `/start` on email confirmation
...
Port e60414792d
2 years ago
f959f6cdbb
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
2 years ago
b0ec3bfcf9
[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline
...
Port 7b54e47d03
2 years ago
4a1f4cb6a2
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 5241f7b2fd
2 years ago
d728222121
[Glitch] Change "Sign in" to "Login"
...
Port 3869e8c210
2 years ago
602ae7f2f6
[Glitch] Fix videos being improperly positioned on safari
...
Port 0eed06073f
2 years ago
e6a7cfd12e
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 5eeb40bdbe
2 years ago
e8fc445e14
[Glitch] Enable ESLint react/no-deprecated
...
Port b878e3d8df
2 years ago
79c43b61a6
[Glitch] Disable RTK safety middlewares
...
Port 6f8db56a01
2 years ago
7d9b7f28b8
[Glitch] Add type annotation for DisplayName component
...
Port 349cae0b57
2 years ago
ea1f9b4223
[Glitch] Rename Image component to ServerHeroImage
...
Port ab7716cff4
2 years ago
b735954971
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' 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
69903b5830
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2 years ago
cb6f445b90
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
2f2f74efd8
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2 years ago
38c6216082
Rewrite actions/modal and reducers/modal with typescript ( #24833 )
2 years ago
4197b5e4c8
Fix export style of `<LoadGap />` based on `<Domain />` ( #25128 )
2 years ago
e58c36d308
Update inconsistent `defaultMessage` ( #25114 )
2 years ago
1caa5ff39e
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
40b948a1fb
Fix `null` signUp URL handling from #25014 ( #25108 )
2 years ago
7336f3648b
Rewrite `<LoadGap />` as FC and TS ( #25042 )
2 years ago
d27216dc46
Enforce import order with ESLint ( #25096 )
2 years ago
ca66e61b93
Add support for custom sign-up URLs ( #25014 )
2 years ago
100840c06e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2 years ago
5a16bd7bf4
Use JSX syntax for Fragments ( #25093 )
2 years ago
8f66126b10
Use the new JSX transform ( #25064 )
2 years ago
9a472efe7c
Rewrite `<TimelineHint />` as FC and TS ( #25091 )
2 years ago
8066118d1f
Rewrite `<Skeleton/>` as FC and TS ( #25055 )
2 years ago
711a037660
Allow scripts in post embed previews ( #25071 )
2 years ago
8d6aea3326
Upgrade to React 18 ( #24916 )
2 years ago
23a4ecf444
Remove duplicate JPG type ( #25054 )
2 years ago
99e2e9b81f
Fix minor typos in comments and spec names ( #21831 )
2 years ago
058898802a
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2 years ago
bec6a1cad4
Add hCaptcha support ( #25019 )
2 years ago
e60414792d
Add polling and automatic redirection to `/start` on email confirmation ( #25013 )
2 years ago
7b54e47d03
Fix being unable to load past a full page of filtered posts in Home timeline ( #24930 )
2 years ago
aa4c9730f6
Change composer highlight border size to be more noticeable ( #25010 )
2 years ago
52d36f0f98
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
5241f7b2fd
Fix UI crash in moderation interface when opening the media modal ( #24816 )
2 years ago
b8a2430642
Fix Onboarding Errors ( #24883 )
2 years ago
3869e8c210
Change "Sign in" to "Login" ( #24942 )
2 years ago
0eed06073f
Fix videos being improperly positioned on safari ( #24943 )
2 years ago
5eeb40bdbe
Add stricter ESLint rules for Typescript files ( #24926 )
2 years ago
b878e3d8df
Enable ESLint react/no-deprecated ( #24471 )
2 years ago
2d5e257938
Rewrite `logo.tsx` as FC ( #24909 )
2 years ago
6f8db56a01
Disable RTK safety middlewares ( #24936 )
2 years ago
f371464639
Remove our copy of image.d.ts as tsconfig already uses upstream's
2 years ago
96e99e2170
Run prettier on Typescript files
...
Port 51b83ed195
2 years ago
facc7ab03c
Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream
2 years ago
5aa08826cf
[Glitch] Type Redux store and middleware
...
Port 6aeb162927
2 years ago
a56c71faba
[Glitch] Remove unused iOS agent sniffing function
...
Port 224d458f7e
2 years ago
526fe33e2f
[Glitch] Rework polyfills loading
...
Port a3a2414f0e
2 years ago
e22a88b512
[Glitch] Add more detailed type annotation for Account
...
Port 6579e3af7d
2 years ago
1a664560cc
Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' 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
349cae0b57
Add type annotation for DisplayName component ( #24752 )
2 years ago
ab7716cff4
Rename Image component to ServerHeroImage ( #24894 )
2 years ago
0fff2b67de
Disable broken onboarding code
2 years ago
5f2071d055
[Glitch] Enforce stricter rules for Typescript files
...
Port c8181eb0a4
2 years ago
b509b96504
[Glitch] Enforce React Rules of Hooks with eslint
...
Port d9b93bd15e
2 years ago
108720d7b0
[Glitch] Dont use CommonJS (`require`, `module.exports`) anywhere
...
Port 955179fc55
2 years ago
c81d1b0d38
Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' 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
887112a065
[Glitch] Add TypeScript support for `mastodon` alias and image imports
...
Port 7c1305b3a4
2 years ago
42bdc2add9
Copy hooks/useHovering.ts to glitch-soc
2 years ago
8e806b6e88
Fix IconButton prop types in glitch-soc
2 years ago
6415981056
[Glitch] Mark `wheel` events on scrollable list as passive
...
Port 89269e4b71
2 years ago
f94eb65cf9
[Glitch] Rewrite Domain component as function component
...
Port 9818f34273
2 years ago
468dfffd26
[Glitch] Use LayoutType from is_mobile in actions/app
...
Port 5bc8e2d1fd
2 years ago
87a704f70b
[Glitch] Rewrite RadioButton component as FC
...
Port 76264e3fe8
2 years ago
bd851d3b58
[Glitch] Rewrite Image component as function component
...
Port a65d2d1045
2 years ago
1edaf58fb9
[Glitch] Rewrite <NotSignedInIndicator /> as FC
...
Port 490ccbf40b
2 years ago
8b568755ad
Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' 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
51b83ed195
Use Prettier for ESLint formatting TypeScript ( #23631 )
2 years ago
6aeb162927
Type Redux store and middleware ( #24843 )
2 years ago
e1f466fbbe
Fix javascript on moderation interface ( #24933 )
2 years ago
224d458f7e
Remove unused iOS agent sniffing function ( #24931 )
2 years ago
a3a2414f0e
Rework polyfills loading ( #24907 )
2 years ago
6579e3af7d
Add more detailed type annotation for Account ( #24815 )
2 years ago
c8181eb0a4
Enforce stricter rules for Typescript files ( #24910 )
2 years ago
d9b93bd15e
Enforce React Rules of Hooks with eslint ( #24911 )
2 years ago
955179fc55
Dont use CommonJS (`require`, `module.exports`) anywhere ( #24913 )
2 years ago
89269e4b71
Mark `wheel` events on scrollable list as passive ( #24914 )
2 years ago
ea04f33f50
[Glitch] Fixes build errors from some previous TS-related commits
...
Port 45579a26cf
2 years ago
3d9e35375c
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 0999cb4601
2 years ago
a33d6c946a
[Glitch] Remove MastodonMap TS type
...
Port 9a52a7f7a0
2 years ago
e8243d5bbd
[Glitch] Add type annotation for some js files
...
Port e38b391940
2 years ago
5f0d2b6e3b
Copy Typescript type definitions to glitch-soc
2 years ago
f3af434c25
[Glitch] Fix incorrect import of redux store
...
Port 9c1929efad
2 years ago
f4e3e309b1
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 8227af8dcc
2 years ago
bbd0e9caa6
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port 8131a5b330
2 years ago
a8939e9098
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 598e63dad2
2 years ago
10f5329ddf
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port d37c0a1060
2 years ago
9ab89bb832
[Glitch] Add type annotation for Blurhash component
...
Port f50105779b
2 years ago
20f1f3aa7d
[Glitch] Add type annotation for IconButton component
...
Port 5a5975d7f7
2 years ago
d77fbbed73
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' 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
f89f3a8566
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
aff2d55b80
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 15fd712464
2 years ago
a49707dacb
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 81f75b1e0e
2 years ago
7835f8fd22
[Glitch] Fix icons having an image role
...
Port 24b2c60beb
2 years ago
e9eab013e7
[Glitch] Fix audio player width in thread view
...
Port cf1bc4bb93
2 years ago
51479f5c28
[Glitch] Add eslint-plugin-jsdoc
...
Port f22b4e556c
2 years ago
09054f5485
[Glitch] Fix media description not being cleared
...
Port bfeccf6748
2 years ago
2d029dedd9
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' 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
5d18840ab9
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2 years ago
9818f34273
Rewrite Domain component as function component ( #24896 )
2 years ago
5bc8e2d1fd
Use LayoutType from is_mobile in actions/app ( #24863 )
2 years ago
16c5354b8c
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
7c1305b3a4
Add TypeScript support for `mastodon` alias and image imports ( #24895 )
2 years ago
76264e3fe8
Rewrite RadioButton component as FC ( #24897 )
2 years ago
a65d2d1045
Rewrite Image component as function component ( #24893 )
2 years ago
490ccbf40b
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2 years ago
6fdbee240c
Rewrite <Check /> as FC ( #24901 )
2 years ago
de74acbe0c
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
ed0a407888
Fix thread lines not being properly updated when new posts are received ( #2210 )
2 years ago
179e38cf15
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
3fb7fe14c6
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
6f64c79ca4
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
a6207d243b
New Crowdin updates ( #2202 )
...
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
2 years ago
140aa6b054
Rewrite VerifiedBadge component as function component ( #24892 )
2 years ago
746979f75d
Fix compose textarea scroll behavior ( #24872 )
2 years ago
5811ccc611
Fix column back button error ( #24867 )
2 years ago
f95125bd04
Fail ESLint for Warnings in CI ( #24836 )
2 years ago
Claire
y.takahashi
fusagiko / takayamaki
たいち ひ
Renaud Chaput
Eugen Rochko
Christian Schmidt
Nick Schonning
Steven Munn
Emelia Smith
Plastikmensch
S.H