e6a7cfd12e
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 5eeb40bdbe
2023-05-25 21:43:19 +02:00
e8fc445e14
[Glitch] Enable ESLint react/no-deprecated
...
Port b878e3d8df
2023-05-25 21:07:38 +02:00
79c43b61a6
[Glitch] Disable RTK safety middlewares
...
Port 6f8db56a01
2023-05-25 20:57:42 +02:00
7d9b7f28b8
[Glitch] Add type annotation for DisplayName component
...
Port 349cae0b57
2023-05-25 20:57:07 +02:00
ea1f9b4223
[Glitch] Rename Image component to ServerHeroImage
...
Port ab7716cff4
2023-05-25 20:44:09 +02:00
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.
2023-05-25 20:43:25 +02:00
69903b5830
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2023-05-25 19:40:33 +02:00
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.
2023-05-25 19:14:51 +02:00
2f2f74efd8
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2023-05-25 19:14:37 +02:00
38c6216082
Rewrite actions/modal and reducers/modal with typescript ( #24833 )
2023-05-25 15:42:37 +02:00
4197b5e4c8
Fix export style of `<LoadGap />` based on `<Domain />` ( #25128 )
2023-05-25 13:03:37 +02:00
e58c36d308
Update inconsistent `defaultMessage` ( #25114 )
2023-05-24 12:38:50 +02:00
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>
2023-05-24 11:04:43 +02:00
40b948a1fb
Fix `null` signUp URL handling from #25014 ( #25108 )
2023-05-24 09:49:26 +02:00
7336f3648b
Rewrite `<LoadGap />` as FC and TS ( #25042 )
2023-05-24 09:20:39 +02:00
d27216dc46
Enforce import order with ESLint ( #25096 )
2023-05-23 17:15:17 +02:00
ca66e61b93
Add support for custom sign-up URLs ( #25014 )
2023-05-23 15:17:09 +02:00
100840c06e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2023-05-23 14:28:21 +02:00
5a16bd7bf4
Use JSX syntax for Fragments ( #25093 )
2023-05-23 11:47:36 +02:00
8f66126b10
Use the new JSX transform ( #25064 )
2023-05-23 10:52:27 +02:00
9a472efe7c
Rewrite `<TimelineHint />` as FC and TS ( #25091 )
2023-05-23 10:04:10 +02:00
8066118d1f
Rewrite `<Skeleton/>` as FC and TS ( #25055 )
2023-05-23 08:58:08 +02:00
711a037660
Allow scripts in post embed previews ( #25071 )
2023-05-22 21:18:21 +02:00
8d6aea3326
Upgrade to React 18 ( #24916 )
2023-05-22 15:48:01 +02:00
23a4ecf444
Remove duplicate JPG type ( #25054 )
2023-05-22 12:46:20 +02:00
99e2e9b81f
Fix minor typos in comments and spec names ( #21831 )
2023-05-19 17:13:29 +02:00
058898802a
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2023-05-17 23:24:27 +02:00
bec6a1cad4
Add hCaptcha support ( #25019 )
2023-05-16 23:27:35 +02:00
e60414792d
Add polling and automatic redirection to `/start` on email confirmation ( #25013 )
2023-05-16 18:03:52 +02:00
7b54e47d03
Fix being unable to load past a full page of filtered posts in Home timeline ( #24930 )
2023-05-16 15:36:25 +02:00
aa4c9730f6
Change composer highlight border size to be more noticeable ( #25010 )
2023-05-16 14:59:44 +02:00
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>
2023-05-15 22:42:07 +02:00
5241f7b2fd
Fix UI crash in moderation interface when opening the media modal ( #24816 )
2023-05-11 12:41:55 +02:00
b8a2430642
Fix Onboarding Errors ( #24883 )
2023-05-11 07:55:10 +02:00
3869e8c210
Change "Sign in" to "Login" ( #24942 )
2023-05-10 20:17:55 +02:00
0eed06073f
Fix videos being improperly positioned on safari ( #24943 )
2023-05-10 17:22:34 +02:00
5eeb40bdbe
Add stricter ESLint rules for Typescript files ( #24926 )
2023-05-10 12:59:29 +02:00
b878e3d8df
Enable ESLint react/no-deprecated ( #24471 )
2023-05-10 09:05:32 +02:00
2d5e257938
Rewrite `logo.tsx` as FC ( #24909 )
2023-05-10 08:58:21 +02:00
6f8db56a01
Disable RTK safety middlewares ( #24936 )
2023-05-10 08:38:02 +02:00
f371464639
Remove our copy of image.d.ts as tsconfig already uses upstream's
2023-05-10 00:00:28 +02:00
96e99e2170
Run prettier on Typescript files
...
Port 51b83ed195
2023-05-09 23:41:18 +02:00
facc7ab03c
Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream
2023-05-09 23:37:38 +02:00
5aa08826cf
[Glitch] Type Redux store and middleware
...
Port 6aeb162927
2023-05-09 23:28:40 +02:00
a56c71faba
[Glitch] Remove unused iOS agent sniffing function
...
Port 224d458f7e
2023-05-09 23:20:57 +02:00
526fe33e2f
[Glitch] Rework polyfills loading
...
Port a3a2414f0e
2023-05-09 23:20:24 +02:00
e22a88b512
[Glitch] Add more detailed type annotation for Account
...
Port 6579e3af7d
2023-05-09 23:16:23 +02:00
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.
2023-05-09 23:12:48 +02:00
349cae0b57
Add type annotation for DisplayName component ( #24752 )
2023-05-09 23:08:54 +02:00
ab7716cff4
Rename Image component to ServerHeroImage ( #24894 )
2023-05-09 23:08:28 +02:00
0fff2b67de
Disable broken onboarding code
2023-05-09 23:03:23 +02:00
5f2071d055
[Glitch] Enforce stricter rules for Typescript files
...
Port c8181eb0a4
2023-05-09 22:56:26 +02:00
b509b96504
[Glitch] Enforce React Rules of Hooks with eslint
...
Port d9b93bd15e
2023-05-09 22:28:53 +02:00
108720d7b0
[Glitch] Dont use CommonJS (`require`, `module.exports`) anywhere
...
Port 955179fc55
2023-05-09 22:28:53 +02:00
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.
2023-05-09 22:12:05 +02:00
887112a065
[Glitch] Add TypeScript support for `mastodon` alias and image imports
...
Port 7c1305b3a4
2023-05-09 21:50:48 +02:00
42bdc2add9
Copy hooks/useHovering.ts to glitch-soc
2023-05-09 21:30:10 +02:00
8e806b6e88
Fix IconButton prop types in glitch-soc
2023-05-09 21:11:23 +02:00
6415981056
[Glitch] Mark `wheel` events on scrollable list as passive
...
Port 89269e4b71
2023-05-09 20:42:07 +02:00
f94eb65cf9
[Glitch] Rewrite Domain component as function component
...
Port 9818f34273
2023-05-09 20:33:58 +02:00
468dfffd26
[Glitch] Use LayoutType from is_mobile in actions/app
...
Port 5bc8e2d1fd
2023-05-09 20:32:30 +02:00
87a704f70b
[Glitch] Rewrite RadioButton component as FC
...
Port 76264e3fe8
2023-05-09 20:25:31 +02:00
bd851d3b58
[Glitch] Rewrite Image component as function component
...
Port a65d2d1045
2023-05-09 20:24:49 +02:00
1edaf58fb9
[Glitch] Rewrite <NotSignedInIndicator /> as FC
...
Port 490ccbf40b
2023-05-09 20:24:01 +02:00
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.
2023-05-09 20:12:33 +02:00
51b83ed195
Use Prettier for ESLint formatting TypeScript ( #23631 )
2023-05-09 19:02:12 +02:00
6aeb162927
Type Redux store and middleware ( #24843 )
2023-05-09 16:56:26 +02:00
e1f466fbbe
Fix javascript on moderation interface ( #24933 )
2023-05-09 16:42:02 +02:00
224d458f7e
Remove unused iOS agent sniffing function ( #24931 )
2023-05-09 15:48:53 +02:00
a3a2414f0e
Rework polyfills loading ( #24907 )
2023-05-09 14:55:35 +02:00
6579e3af7d
Add more detailed type annotation for Account ( #24815 )
2023-05-09 12:09:32 +02:00
c8181eb0a4
Enforce stricter rules for Typescript files ( #24910 )
2023-05-09 03:11:56 +02:00
d9b93bd15e
Enforce React Rules of Hooks with eslint ( #24911 )
2023-05-09 03:09:11 +02:00
955179fc55
Dont use CommonJS (`require`, `module.exports`) anywhere ( #24913 )
2023-05-09 03:08:47 +02:00
89269e4b71
Mark `wheel` events on scrollable list as passive ( #24914 )
2023-05-09 03:07:13 +02:00
ea04f33f50
[Glitch] Fixes build errors from some previous TS-related commits
...
Port 45579a26cf
2023-05-08 22:15:00 +02:00
3d9e35375c
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 0999cb4601
2023-05-08 22:15:00 +02:00
a33d6c946a
[Glitch] Remove MastodonMap TS type
...
Port 9a52a7f7a0
2023-05-08 22:15:00 +02:00
e8243d5bbd
[Glitch] Add type annotation for some js files
...
Port e38b391940
2023-05-08 22:15:00 +02:00
5f0d2b6e3b
Copy Typescript type definitions to glitch-soc
2023-05-08 22:15:00 +02:00
f3af434c25
[Glitch] Fix incorrect import of redux store
...
Port 9c1929efad
2023-05-08 22:15:00 +02:00
f4e3e309b1
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 8227af8dcc
2023-05-08 22:15:00 +02:00
bbd0e9caa6
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port 8131a5b330
2023-05-08 22:15:00 +02:00
a8939e9098
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 598e63dad2
2023-05-08 22:15:00 +02:00
10f5329ddf
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port d37c0a1060
2023-05-08 21:09:49 +02:00
9ab89bb832
[Glitch] Add type annotation for Blurhash component
...
Port f50105779b
2023-05-08 21:09:49 +02:00
20f1f3aa7d
[Glitch] Add type annotation for IconButton component
...
Port 5a5975d7f7
2023-05-08 21:09:49 +02:00
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.
2023-05-08 19:28:21 +02:00
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.
2023-05-08 18:21:36 +02:00
aff2d55b80
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 15fd712464
2023-05-08 16:02:59 +02:00
a49707dacb
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 81f75b1e0e
2023-05-08 15:59:27 +02:00
7835f8fd22
[Glitch] Fix icons having an image role
...
Port 24b2c60beb
2023-05-08 15:57:35 +02:00
e9eab013e7
[Glitch] Fix audio player width in thread view
...
Port cf1bc4bb93
2023-05-08 15:50:05 +02:00
51479f5c28
[Glitch] Add eslint-plugin-jsdoc
...
Port f22b4e556c
2023-05-08 15:48:08 +02:00
09054f5485
[Glitch] Fix media description not being cleared
...
Port bfeccf6748
2023-05-08 15:41:17 +02:00
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.
2023-05-08 15:28:36 +02:00
5d18840ab9
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2023-05-08 15:16:55 +02:00
9818f34273
Rewrite Domain component as function component ( #24896 )
2023-05-08 15:12:12 +02:00
5bc8e2d1fd
Use LayoutType from is_mobile in actions/app ( #24863 )
2023-05-08 15:10:21 +02:00
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
2023-05-08 14:02:41 +02:00
7c1305b3a4
Add TypeScript support for `mastodon` alias and image imports ( #24895 )
2023-05-08 11:28:36 +02:00
76264e3fe8
Rewrite RadioButton component as FC ( #24897 )
2023-05-08 11:12:53 +02:00
a65d2d1045
Rewrite Image component as function component ( #24893 )
2023-05-08 11:12:44 +02:00
490ccbf40b
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2023-05-08 11:12:13 +02:00
6fdbee240c
Rewrite <Check /> as FC ( #24901 )
2023-05-08 08:26:02 +02:00
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
2023-05-07 21:43:25 +02:00
ed0a407888
Fix thread lines not being properly updated when new posts are received ( #2210 )
2023-05-07 20:06:10 +02:00
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>
2023-05-07 18:45:10 +02:00
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
2023-05-07 18:22:25 +02:00
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
2023-05-07 15:04:59 +02:00
a6207d243b
New Crowdin updates ( #2202 )
...
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
2023-05-07 13:37:47 +02:00
140aa6b054
Rewrite VerifiedBadge component as function component ( #24892 )
2023-05-07 09:10:58 +02:00
746979f75d
Fix compose textarea scroll behavior ( #24872 )
2023-05-05 18:58:58 +02:00
5811ccc611
Fix column back button error ( #24867 )
2023-05-05 15:13:28 +02:00
f95125bd04
Fail ESLint for Warnings in CI ( #24836 )
2023-05-04 09:48:50 +02:00
27bafabb64
Fix Back button going outside the app ( #24835 )
2023-05-04 08:14:04 +02:00
45579a26cf
Fixes build errors from some previous TS-related commits ( #24811 )
2023-05-03 16:28:14 +02:00
0999cb4601
Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )
2023-05-03 15:28:39 +02:00
9a52a7f7a0
Remove MastodonMap TS type ( #24807 )
2023-05-03 13:32:11 +02:00
e38b391940
Add type annotation for some js files ( #24787 )
2023-05-03 11:43:29 +02:00
9c1929efad
Fix incorrect import of redux store ( #24805 )
2023-05-03 10:29:45 +02:00
d37c0a1060
Fix incorrect box shadow on avatar in thread view ( #24800 )
2023-05-03 09:11:20 +02:00
8227af8dcc
use configureStore of redux-toolkit instead of createStore of redux ( #24790 )
2023-05-02 20:39:06 +02:00
8131a5b330
Add ALT badges to media that has alternative text in web UI ( #24782 )
2023-05-02 14:47:04 +02:00
598e63dad2
Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )
2023-05-02 13:58:48 +02:00
f50105779b
Add type annotation for Blurhash component ( #24750 )
2023-05-02 12:54:00 +02:00
5a5975d7f7
Add type annotation for IconButton component ( #24753 )
2023-05-02 12:53:32 +02:00
fc56eda94b
Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 ( #24755 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-05-01 18:23:57 +09:00
15fd712464
Add type annotation for RelativeTimestamp component ( #24749 )
2023-05-01 00:51:31 +02:00
81f75b1e0e
Rewrite Icon and IconWithBadge with typescript ( #24747 )
2023-05-01 00:51:00 +02:00
0a08e9d3d3
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-30 17:02:11 +09:00
678d836c7d
Fix pop-in player placeholder layout in thread view ( #24715 )
2023-04-30 06:42:43 +02:00
cf1bc4bb93
Fix audio player width in thread view ( #24713 )
2023-04-30 06:42:22 +02:00
f22b4e556c
Add eslint-plugin-jsdoc ( #24719 )
2023-04-30 02:29:54 +02:00
bfeccf6748
Fix media description not being cleared ( #24720 )
2023-04-30 02:29:24 +02:00
e79998a11a
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2023-04-29 19:38:08 +02:00
38eeed6cbf
[Glitch] Change logo version in header based on screen size in web UI
...
Port 6028d047b9
2023-04-29 18:54:13 +02:00
1033598416
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 2daa5a1549
2023-04-29 18:38:23 +02:00
edec08b970
Disable full-width media in thread view
2023-04-29 12:43:01 +02:00
cb97a92954
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 105f8687e4
2023-04-29 12:21:44 +02:00
103b6de8b2
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 1527b02c6d
2023-04-29 12:17:06 +02:00
7b01b7c3bf
[Glitch] Add lines to threads in web UI
...
Port 290e4aba31
2023-04-29 12:08:13 +02:00
8015297f9e
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port 7cf963eec2
2023-04-29 11:34:44 +02:00
374a109546
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port e1b4eeb636
2023-04-29 11:28:24 +02:00
0091b28ffe
[Glitch] Use CSS to trim long card descriptions
...
Port e713c545b8
2023-04-29 11:26:58 +02:00
11b34a903a
[Glitch] Fix infinite loop in emoji replacement code
...
Port fbb4de3dbc
2023-04-29 11:14:43 +02:00
0a813d96db
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 37886c28da
2023-04-29 11:12:35 +02:00
66bda4713e
[Glitch] Allow `==` when null checking
...
Port c1a7e38d2b
2023-04-29 11:09:46 +02:00
12b935fadf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
105f8687e4
Fix thread lines in right-to-left locales ( #24714 )
2023-04-28 13:12:35 +02:00
Renaud Chaput