Claire
c752e939d5
Change AccessTokensVacuum to also delete expired tokens ( #24868 )
2023-05-11 04:40:03 +02:00
Eugen Rochko
d05ff56746
Change "Sign in" to "Login" ( #24942 )
2023-05-10 20:17:55 +02:00
Claire
de95d0ca8f
Fix videos being improperly positioned on safari ( #24943 )
2023-05-10 17:22:34 +02:00
Renaud Chaput
6a3211876c
Add stricter ESLint rules for Typescript files ( #24926 )
2023-05-10 12:59:29 +02:00
Nick Schonning
b0dd260a7a
Enable ESLint react/no-deprecated ( #24471 )
2023-05-10 09:05:32 +02:00
たいち ひ
2f09bbdfe0
Rewrite logo.tsx as FC ( #24909 )
2023-05-10 08:58:21 +02:00
Renaud Chaput
c9dfc55b22
Disable RTK safety middlewares ( #24936 )
2023-05-10 08:38:02 +02:00
Claire
abb99eca95
Remove our copy of image.d.ts as tsconfig already uses upstream's
2023-05-10 00:00:28 +02:00
Claire
e63a08bafd
Run prettier on Typescript files
...
Port 0886856bd2
2023-05-09 23:41:18 +02:00
Claire
710151baf4
Merge commit '0886856bd2adecedcad6fad9dcb86ed8069c46c0' into glitch-soc/merge-upstream
2023-05-09 23:37:38 +02:00
Renaud Chaput
487715a3e3
[Glitch] Type Redux store and middleware
...
Port d67de22458
2023-05-09 23:28:40 +02:00
Renaud Chaput
b21d2eaeb6
[Glitch] Remove unused iOS agent sniffing function
...
Port d57be2731c
2023-05-09 23:20:57 +02:00
Renaud Chaput
e8415aa727
[Glitch] Rework polyfills loading
...
Port b640f89777
2023-05-09 23:20:24 +02:00
fusagiko / takayamaki
c5fb52eb23
[Glitch] Add more detailed type annotation for Account
...
Port a2e9b9d87d
2023-05-09 23:16:23 +02:00
Claire
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.
2023-05-09 23:12:48 +02:00
fusagiko / takayamaki
a150bb4f2e
Add type annotation for DisplayName component ( #24752 )
2023-05-09 23:08:54 +02:00
fusagiko / takayamaki
cbca954632
Rename Image component to ServerHeroImage ( #24894 )
2023-05-09 23:08:28 +02:00
Claire
81b01c961b
Disable broken onboarding code
2023-05-09 23:03:23 +02:00
Renaud Chaput
d0545c950c
[Glitch] Enforce stricter rules for Typescript files
...
Port 85b3823e66
2023-05-09 22:56:26 +02:00
Renaud Chaput
a7d51b92f3
[Glitch] Enforce React Rules of Hooks with eslint
...
Port b785500809
2023-05-09 22:28:53 +02:00
Renaud Chaput
4e88d37759
[Glitch] Dont use CommonJS (require, module.exports) anywhere
...
Port 45146e3f3b
2023-05-09 22:28:53 +02:00
Claire
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.
2023-05-09 22:12:05 +02:00
たいち ひ
8a2bb3fb99
[Glitch] Add TypeScript support for mastodon alias and image imports
...
Port 5f709b1601
2023-05-09 21:50:48 +02:00
Claire
43b38dc9e6
Copy hooks/useHovering.ts to glitch-soc
2023-05-09 21:30:10 +02:00
Claire
a0047223a5
Fix IconButton prop types in glitch-soc
2023-05-09 21:11:23 +02:00
Renaud Chaput
d8cae2752c
[Glitch] Mark wheel events on scrollable list as passive
...
Port b8d44c55fd
2023-05-09 20:42:07 +02:00
fusagiko / takayamaki
fe8412bcf4
[Glitch] Rewrite Domain component as function component
...
Port 4ab18dee50
2023-05-09 20:33:58 +02:00
fusagiko / takayamaki
7630b904ee
[Glitch] Use LayoutType from is_mobile in actions/app
...
Port 01caf92d80
2023-05-09 20:32:30 +02:00
たいち ひ
bf45760e0b
[Glitch] Rewrite RadioButton component as FC
...
Port 13a16f3054
2023-05-09 20:25:31 +02:00
たいち ひ
3c62d50502
[Glitch] Rewrite Image component as function component
...
Port c1ccb55a59
2023-05-09 20:24:49 +02:00
たいち ひ
77edfc33ba
[Glitch] Rewrite <NotSignedInIndicator /> as FC
...
Port 23a97effdb
2023-05-09 20:24:01 +02:00
Claire
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.
2023-05-09 20:12:33 +02:00
Nick Schonning
0886856bd2
Use Prettier for ESLint formatting TypeScript ( #23631 )
2023-05-09 19:02:12 +02:00
Renaud Chaput
d67de22458
Type Redux store and middleware ( #24843 )
2023-05-09 16:56:26 +02:00
Claire
da803512c9
Fix javascript on moderation interface ( #24933 )
2023-05-09 16:42:02 +02:00
Renaud Chaput
d57be2731c
Remove unused iOS agent sniffing function ( #24931 )
2023-05-09 15:48:53 +02:00
Renaud Chaput
b640f89777
Rework polyfills loading ( #24907 )
2023-05-09 14:55:35 +02:00
fusagiko / takayamaki
a2e9b9d87d
Add more detailed type annotation for Account ( #24815 )
2023-05-09 12:09:32 +02:00
Renaud Chaput
85b3823e66
Enforce stricter rules for Typescript files ( #24910 )
2023-05-09 03:11:56 +02:00
Renaud Chaput
b785500809
Enforce React Rules of Hooks with eslint ( #24911 )
2023-05-09 03:09:11 +02:00
Renaud Chaput
45146e3f3b
Dont use CommonJS (require, module.exports) anywhere ( #24913 )
2023-05-09 03:08:47 +02:00
Renaud Chaput
b8d44c55fd
Mark wheel events on scrollable list as passive ( #24914 )
2023-05-09 03:07:13 +02:00
Renaud Chaput
2354041cb7
[Glitch] Fixes build errors from some previous TS-related commits
...
Port e1985e14f6
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
31e4da41ee
[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction
...
Port 9ed91c444e
2023-05-08 22:15:00 +02:00
Renaud Chaput
2c5141e5ed
[Glitch] Remove MastodonMap TS type
...
Port 7bc13c1ca3
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
ac97d77cb3
[Glitch] Add type annotation for some js files
...
Port 6fa4054a5d
2023-05-08 22:15:00 +02:00
Claire
902b2175df
Copy Typescript type definitions to glitch-soc
2023-05-08 22:15:00 +02:00
Claire
9775d02a15
[Glitch] Fix incorrect import of redux store
...
Port d76495d080
2023-05-08 22:15:00 +02:00
fusagiko / takayamaki
5af7007906
[Glitch] use configureStore of redux-toolkit instead of createStore of redux
...
Port 69bd3a86f3
2023-05-08 22:15:00 +02:00
Eugen Rochko
c10a2036bc
[Glitch] Add ALT badges to media that has alternative text in web UI
...
Port d6808a561e
2023-05-08 22:15:00 +02:00
Claire
62f5d29c25
[Glitch] Change media elements to use aspect-ratio rather than compute height themselves
...
Port 8c43856691
2023-05-08 22:15:00 +02:00
Claire
319ff9bd71
[Glitch] Fix incorrect box shadow on avatar in thread view
...
Port 52ed627d9e
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
e225a49255
[Glitch] Add type annotation for Blurhash component
...
Port fc4bb5ed66
2023-05-08 21:09:49 +02:00
fusagiko / takayamaki
cccf0bdace
[Glitch] Add type annotation for IconButton component
...
Port bee49de3db
2023-05-08 21:09:49 +02:00
Claire
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.
2023-05-08 19:28:21 +02:00
Claire
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.
2023-05-08 18:21:36 +02:00
fusagiko / takayamaki
dd098625f0
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 90e4ab9f8f
2023-05-08 16:02:59 +02:00
fusagiko / takayamaki
c17c65aa57
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 27a750cc04
2023-05-08 15:59:27 +02:00
Eugen Rochko
5bfff5807a
[Glitch] Fix icons having an image role
...
Port c7924acf16
2023-05-08 15:57:35 +02:00
Claire
acc7cdc664
[Glitch] Fix audio player width in thread view
...
Port 9cf043f63a
2023-05-08 15:50:05 +02:00
Nick Schonning
55561098c4
[Glitch] Add eslint-plugin-jsdoc
...
Port 0224c3c0d9
2023-05-08 15:48:08 +02:00
Christian Schmidt
a9089a2458
[Glitch] Fix media description not being cleared
...
Port 6ccea199ca
2023-05-08 15:41:17 +02:00
Claire
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.
2023-05-08 15:28:36 +02:00
Claire
c90f09d36f
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
fusagiko / takayamaki
4ab18dee50
Rewrite Domain component as function component ( #24896 )
2023-05-08 15:12:12 +02:00
fusagiko / takayamaki
01caf92d80
Use LayoutType from is_mobile in actions/app ( #24863 )
2023-05-08 15:10:21 +02:00
Claire
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
2023-05-08 14:02:41 +02:00
たいち ひ
5f709b1601
Add TypeScript support for mastodon alias and image imports ( #24895 )
2023-05-08 11:28:36 +02:00
たいち ひ
13a16f3054
Rewrite RadioButton component as FC ( #24897 )
2023-05-08 11:12:53 +02:00
たいち ひ
c1ccb55a59
Rewrite Image component as function component ( #24893 )
2023-05-08 11:12:44 +02:00
たいち ひ
23a97effdb
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2023-05-08 11:12:13 +02:00
たいち ひ
daecca565e
Rewrite <Check /> as FC ( #24901 )
2023-05-08 08:26:02 +02:00
Claire
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
2023-05-07 21:43:25 +02:00
Claire
43c40b5df8
Fix thread lines not being properly updated when new posts are received ( #2210 )
2023-05-07 20:06:10 +02:00
Plastikmensch
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>
2023-05-07 18:45:10 +02:00
Claire
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
2023-05-07 18:22:25 +02:00
Claire
6dbd28c763
Fix rubocop warnings ( #2206 )
2023-05-07 15:06:15 +02:00
Claire
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
2023-05-07 15:04:59 +02:00
Claire
481aed8061
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
fusagiko / takayamaki
2c894915dc
Rewrite VerifiedBadge component as function component ( #24892 )
2023-05-07 09:10:58 +02:00
Claire
f18f692f65
Fix compose textarea scroll behavior ( #24872 )
2023-05-05 18:58:58 +02:00
mogaminsk
3ea6c679cf
Fix import data field type ( #24874 )
2023-05-05 18:10:10 +02:00
S.H
2a651be35a
Fix column back button error ( #24867 )
2023-05-05 15:13:28 +02:00
zunda
458f6d0afb
Make it possible to upload audio and video to Heroku app ( #24866 )
2023-05-05 14:41:07 +02:00
Matt Jankowski
d65d954409
Extract StatusSafeReblogInsert concern from Status ( #24821 )
2023-05-04 14:06:20 +02:00
Nick Schonning
833076d6bf
Bump rubocop-rails 2.19.1 with update .rubocop_todo.yml ( #24469 )
2023-05-04 11:56:24 +02:00
Claire
53e3a1b06d
Fix infinite loop in AccountsStatusesCleanupScheduler ( #24840 )
2023-05-04 10:13:00 +02:00
Nick Schonning
c366c93cfd
Fail ESLint for Warnings in CI ( #24836 )
2023-05-04 09:48:50 +02:00
Florin
1421a8efbd
Fix Back button going outside the app ( #24835 )
2023-05-04 08:14:04 +02:00
Nick Schonning
f6fd5e4ad0
Autofix Rubocop Style/ConcatArrayLiterals ( #23755 )
2023-05-04 05:57:40 +02:00
Nick Schonning
2f2c8f671b
Autofix Rubocop Style/HashSyntax ( #23754 )
2023-05-04 05:54:26 +02:00
Nick Schonning
54d59b8ee0
Autofix Rubocop Style/CaseLikeIf ( #23756 )
2023-05-04 05:51:18 +02:00
Matt Jankowski
fded3a99ab
Spec coverage for settings/preferences/* controllers ( #24825 )
2023-05-04 05:44:27 +02:00
Matt Jankowski
e8537a3a01
Fix Performance/CollectionLiteralInLoop cop ( #24819 )
2023-05-04 05:33:55 +02:00
Claire
90b45c5040
Fix various edge cases with local moves ( #24812 )
2023-05-03 19:19:25 +02:00
Claire
f89b5c08b6
Fix own posts not getting delivered to own lists ( #24810 )
2023-05-03 19:17:40 +02:00
Renaud Chaput
e1985e14f6
Fixes build errors from some previous TS-related commits ( #24811 )
2023-05-03 16:28:14 +02:00
fusagiko / takayamaki
9ed91c444e
Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )
2023-05-03 15:28:39 +02:00
Claire
a4e3f98fc7
Change Move handler to also move list memberships ( #24808 )
2023-05-03 14:03:38 +02:00
Renaud Chaput
7bc13c1ca3
Remove MastodonMap TS type ( #24807 )
2023-05-03 13:32:11 +02:00
fusagiko / takayamaki
6fa4054a5d
Add type annotation for some js files ( #24787 )
2023-05-03 11:43:29 +02:00
Claire
ca3003835d
Improve automatic post cleanup worker performances ( #24785 )
2023-05-03 10:31:40 +02:00
Matt Jankowski
b7e49e1a70
Fix Performance/MethodObjectAsBlock cop ( #24798 )
2023-05-03 10:30:54 +02:00
Claire
d76495d080
Fix incorrect import of redux store ( #24805 )
2023-05-03 10:29:45 +02:00
Claire
52ed627d9e
Fix incorrect box shadow on avatar in thread view ( #24800 )
2023-05-03 09:11:20 +02:00
Matt Jankowski
53682a7b4f
Fix Performance/DeletePrefix cop ( #24796 )
2023-05-02 21:07:45 +02:00
fusagiko / takayamaki
69bd3a86f3
use configureStore of redux-toolkit instead of createStore of redux ( #24790 )
2023-05-02 20:39:06 +02:00
Matt Jankowski
ec265b7d8a
Fix Rails/ActiveRecordCallbacksOrder cop ( #24689 )
2023-05-02 18:23:35 +02:00
Matt Jankowski
7a843ed550
Extract AccountSearch concern from Account ( #24716 )
2023-05-02 18:21:36 +02:00
Matt Jankowski
4d1f9d4278
Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method ( #24741 )
2023-05-02 18:16:07 +02:00
Matt Jankowski
c50acc4d2c
ApplicationHelper spec coverage, unused removal, tiny refactor ( #24762 )
2023-05-02 18:10:39 +02:00
Matt Jankowski
276a0f7ff9
Fix Performance/Count cop ( #24793 )
2023-05-02 18:06:43 +02:00
Claire
7da78595fc
Add fallback redirection when getting a webfinger query LOCAL_DOMAIN@LOCAL_DOMAIN ( #23600 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-05-02 17:42:42 +02:00
Matt Jankowski
621e53f8fc
Fix Performance/Sum cop ( #24788 )
2023-05-02 16:10:40 +02:00
Claire
dc06dd260f
Check domain suspensions before trying to fetch resources ( #24535 )
2023-05-02 15:22:19 +02:00
Claire
e964406ec3
Optimize archive export service and export zip files instead of gzipped tar files ( #23360 )
2023-05-02 15:09:43 +02:00
Eugen Rochko
d6808a561e
Add ALT badges to media that has alternative text in web UI ( #24782 )
2023-05-02 14:47:04 +02:00
Claire
a247f77162
Change lists to be able to include accounts with pending follow requests ( #19727 )
2023-05-02 14:40:36 +02:00
Claire
8c43856691
Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )
2023-05-02 13:58:48 +02:00
Matt Jankowski
182bb4595f
Fix Lint/DuplicateBranch cop ( #24766 )
2023-05-02 12:57:11 +02:00
fusagiko / takayamaki
fc4bb5ed66
Add type annotation for Blurhash component ( #24750 )
2023-05-02 12:54:00 +02:00
fusagiko / takayamaki
bee49de3db
Add type annotation for IconButton component ( #24753 )
2023-05-02 12:53:32 +02:00
Claire
abce7cf2b9
Rewrite import feature ( #21054 )
2023-05-02 12:08:48 +02:00
Nick Schonning
7a13eb370f
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
fusagiko / takayamaki
90e4ab9f8f
Add type annotation for RelativeTimestamp component ( #24749 )
2023-05-01 00:51:31 +02:00
fusagiko / takayamaki
27a750cc04
Rewrite Icon and IconWithBadge with typescript ( #24747 )
2023-05-01 00:51:00 +02:00
Matt Jankowski
bdbc9d0036
Fix Rails/CompactBlank cop ( #24690 )
2023-04-30 14:07:21 +02:00
Matt Jankowski
e9e394fe57
Fix Rails/InverseOf cop ( #24732 )
2023-04-30 14:06:53 +02:00
Eugen Rochko
b9f44a797a
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-30 17:02:11 +09:00
dependabot[bot]
c943082b1b
Bump connection_pool from 2.3.0 to 2.4.0 ( #24290 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-04-30 15:45:02 +09:00
Matt Jankowski
ba0a49b7f6
Fix Rails/ContentTag cop ( #24691 )
2023-04-30 06:47:15 +02:00
Matt Jankowski
390aa577e7
Fix Rails/ActionOrder cop ( #24692 )
2023-04-30 06:46:39 +02:00
Claire
9dfb594a45
Fix pop-in player placeholder layout in thread view ( #24715 )
2023-04-30 06:42:43 +02:00
Claire
9cf043f63a
Fix audio player width in thread view ( #24713 )
2023-04-30 06:42:22 +02:00
Nick Schonning
0224c3c0d9
Add eslint-plugin-jsdoc ( #24719 )
2023-04-30 02:29:54 +02:00
Christian Schmidt
6ccea199ca
Fix media description not being cleared ( #24720 )
2023-04-30 02:29:24 +02:00
Claire
eb3911d9bf
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2023-04-29 19:38:08 +02:00
Eugen Rochko
ffb5a3d4f3
[Glitch] Change logo version in header based on screen size in web UI
...
Port 4e6e4bcc4d
2023-04-29 18:54:13 +02:00
Nick Schonning
c4e35a3f68
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 86d0a0b7d8
2023-04-29 18:38:23 +02:00
Claire
a1a60257c5
Disable full-width media in thread view
2023-04-29 12:43:01 +02:00
Claire
a6a1587450
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 4e7a3a2faf
2023-04-29 12:21:44 +02:00
Claire
c82f3a67c1
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 3141130720
2023-04-29 12:17:06 +02:00
Eugen Rochko
a2a800c212
[Glitch] Add lines to threads in web UI
...
Port 4141f9228c
2023-04-29 12:08:13 +02:00
Eugen Rochko
bf04ff4601
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port a6c7401225
2023-04-29 11:34:44 +02:00
Chike Nwaenie
1b1a7e5a51
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port 84adcaa474
2023-04-29 11:28:24 +02:00
Christian Schmidt
ab2df6fb69
[Glitch] Use CSS to trim long card descriptions
...
Port 4613dfe97b
2023-04-29 11:26:58 +02:00
Claire
5c4f034e9b
[Glitch] Fix infinite loop in emoji replacement code
...
Port a55f461b4b
2023-04-29 11:14:43 +02:00
Claire
53e8b2dc7e
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 2473078db7
2023-04-29 11:12:35 +02:00
fusagiko / takayamaki
e45bb3f893
[Glitch] Allow == when null checking
...
Port f14395c2cf
2023-04-29 11:09:46 +02:00
Claire
498de92bc8
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
