d7ed682130
Merge pull request from GHSA-9pxv-6qvf-pjwc
...
* Fix timeout handling of outbound HTTP requests
* Use CLOCK_MONOTONIC instead of Time.now
1 year ago
3445bdfa45
Merge pull request from GHSA-9928-3cp5-93fm
...
* Fix attachments getting processed despite failing content-type validation
* Add a restrictive ImageMagick security policy tailored for Mastodon
* Fix misdetection of MP3 files with large cover art
* Reject unprocessable audio/video files instead of keeping them unchanged
1 year ago
96dcfa9745
Merge pull request from GHSA-ccm4-vgcc-73hp
...
* Tighten allowed HTML in oEmbed-based preview cards
* Sanitize preview cards at render time
* Add `sandbox` attribute to preview card iframes
1 year ago
3676bc46da
[Glitch] Fix regression of icon button colors in web UI
...
Port 12c6337c96
1 year ago
fa02ad3b8c
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 5f31104e1f
1 year ago
c66faebe43
[Glitch] Add button to see results for polls in web UI
...
Port 5b05451744
1 year ago
7747947353
[Glitch] Add canonical link tags in web UI
...
Port 90911f4396
1 year ago
0003a22bc1
[Glitch] Fix local live feeds does not expand
...
Port f3ca8aede9
1 year ago
136ed77764
[Glitch] Add at-symbol prepended to mention span title
...
Port 7731fbbba7
1 year ago
5b328d07e6
[Glitch] Change labels of live feeds tabs in web UI
...
Port 80fee1403f
1 year ago
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
90911f4396
Add canonical link tags in web UI ( #25715 )
1 year ago
5b05451744
Add button to see results for polls in web UI ( #25726 )
1 year ago
cac4f7fdd7
Fix OAuth apps page crashing when listing apps with certain admin API scopes ( #25713 )
1 year ago
1aa9197efd
Fix re-activated accounts being deleted by AccountDeletionWorker ( #25711 )
1 year ago
b34a0ff011
fix read more button overlapping thread line bug ( #25706 )
1 year ago
f3ca8aede9
Fix local live feeds does not expand ( #25694 )
1 year ago
7731fbbba7
Add at-symbol prepended to mention span title ( #25684 )
...
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
1 year ago
80fee1403f
Change labels of live feeds tabs in web UI ( #25683 )
1 year ago
2b877ad937
Fix `/api/v2/search` not working with following query param ( #25681 )
1 year ago
12c6337c96
Fix regression of icon button colors in web UI ( #25679 )
1 year ago
bd0986e5d7
Add regex filter back to firehose ( #2266 )
...
* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
5f31104e1f
Change button colors to increase hover/focus contrast and consistency ( #25677 )
1 year ago
cd902b7fd4
Fix showing local only toots in "All" ( #2265 )
...
* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
c33c8bc048
Show local-only posts in “All” by default, and add back option to toggle it
1 year ago
4885232358
Add users index on unconfirmed_email ( #25672 )
1 year ago
fe1735f409
Fix inefficient query when requesting a new confirmation email from a logged-in account ( #25669 )
1 year ago
db90f2b456
[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI
...
Port ee22b32aef
1 year ago
f3140305f9
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI
...
Port f504aded26
1 year ago
95da88be87
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port 6ca66c8cad
1 year ago
bb5fddd588
[Glitch] Use an Immutable Record as the root state
...
Port 2751a6d716
1 year ago
f6ede7b089
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 1408b62211
1 year ago
34dd555a1c
[Glitch] Remove the search button from UI header when logged out
...
Port 7a47a52cd3
1 year ago
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
edb6aab974
Revert "Rails 7 update" ( #25667 )
1 year ago
ee22b32aef
Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )
1 year ago
f504aded26
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
1 year ago
5cadbaa296
Rails 7 update ( #24241 )
1 year ago
2f17abc686
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
1 year ago
6ca66c8cad
Change local and federated timelines to be in a single firehose column ( #25641 )
1 year ago
6c6857f7ad
Fixing an issue with a missing argument ( #2261 )
...
undefined
1 year ago
843448c7d9
Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )
1 year ago
2751a6d716
Use an Immutable Record as the root state ( #25584 )
1 year ago
1408b62211
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
1 year ago
85dc0869a5
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
1 year ago
5d75bf9846
Change account search to match by text when opted-in ( #25599 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
7a47a52cd3
Remove the search button from UI header when logged out ( #25631 )
1 year ago
bbe08e28cd
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ff9ed824db
1 year ago
5e3d6a3433
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 66c513511c
1 year ago
fa093eef89
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 1924660c5b
1 year ago
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
92fbaae7b6
Fix suspending an already-limited domain ( #25603 )
1 year ago
1569b36e28
Fix batch attachment deletion leaving empty directories ( #25587 )
1 year ago
2c6f88ad71
Remove media attachment only when file was exist ( #25586 )
1 year ago
bcee25e36c
Change files to be deleted in batches instead of one-by-one ( #23302 )
1 year ago
ff9ed824db
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
1164011bad
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
1 year ago
65b5808421
Change header backgrounds to use fewer different colors in web UI ( #25577 )
1 year ago
66c513511c
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
1 year ago
1924660c5b
Fix search not being easily findable on smaller screens in web UI ( #25576 )
1 year ago
a4e2d81804
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 7acdf21c77
1 year ago
5660204731
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port ad92c48d71
1 year ago
7cd1b2d753
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port 9a27d4ec36
1 year ago
34310c3924
[Glitch] Fix custom signup URL may not loaded
...
Port e87a2c676c
1 year ago
e7905c8b32
[Glitch] Change emoji picker icon
...
Port a56475866f
1 year ago
f0999de66f
[Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS
...
Port 6c4a6bd115
1 year ago
b7af3115a7
Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
1 year ago
3d50947e62
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
1 year ago
1caf3a3933
Change labels and styles on the onboarding screen in web UI ( #25559 )
1 year ago
7acdf21c77
Remove unique accounts condition from Home onboarding prompt ( #25556 )
1 year ago
ad92c48d71
Add onboarding prompt when home feed too slow in web UI ( #25267 )
1 year ago
3406cb0427
Add POST /api/v1/conversations/:id/unread ( #25509 )
1 year ago
9a27d4ec36
Fix j/k keyboard shortcuts on some status lists ( #25554 )
1 year ago
d0144d2be3
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
1 year ago
c1c87fe7b9
Add finer permission requirements for managing webhooks ( #25463 )
1 year ago
e87a2c676c
Fix custom signup URL may not loaded ( #25531 )
1 year ago
a56475866f
Change emoji picker icon ( #25479 )
1 year ago
5e5af7a0fe
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
1 year ago
ba5c12974a
Fix missing validation on `default_privacy` setting ( #25513 )
1 year ago
923dde8e6c
Fix wrong view being displayed when a webhook fails validation ( #25464 )
1 year ago
4e861795a4
Add translate="no" to outgoing mentions and links ( #25524 )
1 year ago
71d3100038
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
1 year ago
ecf17008e8
Fix user settings not getting validated ( #25508 )
1 year ago
6c4a6bd115
Rewrite `<AutosuggestHashtag />` as FC and TS ( #25481 )
1 year ago
d05a68a12e
Reduce `sleep` time in request pool spec ( #25470 )
1 year ago
eb10ac2b3e
Remove unused `picture_hint` helper method ( #25485 )
1 year ago
498e3231b6
Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )
1 year ago
4e889e478f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
1 year ago
85f74ed0a7
Fix cross-origin loading of locales ( #25498 )
1 year ago
d5a295f8c0
[Glitch] Fix non-interactive upload container being given a `button` role and tabIndex
...
Port 7c70237d7e
1 year ago
7066e3d5ce
Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
1 year ago
85041b74fb
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
...
Port 239ee4f5d1
1 year ago
5a38d538a0
[Glitch] Rewrite `emoji_mart_data_light` as TS
...
Port 6e0c48cbe8
1 year ago
7e24689b7d
[Glitch] Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
...
Port 293cf44626
1 year ago
0e43f4d4fc
[Glitch] Add missing report category translation
...
Port b51a10a066
1 year ago
8cbdffe2c7
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port 569ff79fb8
1 year ago
1ce44ec36e
[Glitch] Change "bot" label to "automated"
...
Port 272e099bce
1 year ago
f101b67a45
Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream
1 year ago
7c70237d7e
Fix non-interactive upload container being given a `button` role and tabIndex ( #25462 )
1 year ago
4a994e5b50
Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` ( #25386 )
1 year ago
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
1 year ago
a424076226
Fix ArgumentError when loading newer Private Mentions ( #25399 )
1 year ago
989a8758e3
Change edit profile page ( #25413 )
1 year ago
239ee4f5d1
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
1 year ago
6e0c48cbe8
Rewrite `emoji_mart_data_light` as TS ( #25138 )
1 year ago
293cf44626
Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
1 year ago
b51a10a066
Add missing report category translation ( #25400 )
1 year ago
94ef94c5ea
Add unsubscribe link to e-mails ( #25378 )
1 year ago
a804371e21
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 868d478b1b
1 year ago
569ff79fb8
Rewrite <LoadPending /> as FC and TS ( #25363 )
1 year ago
272e099bce
Change "bot" label to "automated" ( #25356 )
1 year ago
f49b12e06d
Fix some translation strings inconsistencies
1 year ago
1c25f35ddf
Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
1 year ago
14788cf0ce
Switch to using a `common` runtime chunk rather than `locales`
1 year ago
c51e8de4ad
Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
1 year ago
b5872b0686
[Glitch] Change design of dropdowns in web UI
...
Port 7abfddd8a5
1 year ago
ee6682e48d
[Glitch] Rewrite `<LoadMore />` as FC and TS
...
Port f9c819e8db
1 year ago
ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
1 year ago
29e63ef4d5
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 21f904b344
1 year ago
00307189bc
[Glitch] Fix not shown announcements in hometimeline.
...
Port 94f9888d57
1 year ago
3dd186bbf1
[Glitch] Fix design issues with recent react-intl upgrade
...
Port 4c2503d36c
1 year ago
46b4268007
[Glitch] Add exclusive lists
...
Port 6debddcf89
1 year ago
60762fb8ba
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from c7a8838bd7
1 year ago
2877b12754
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port 2d2750c6a9
1 year ago
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
1 year ago
333c28ce6d
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port 29851c83bd
1 year ago
3b87fe21fa
Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
1 year ago
7ccf99b652
[Glitch] Fix using Date.now() instead of intl.now()
...
Port 4e28b89f51
1 year ago
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
1 year ago
fd0b9c9881
[Glitch] Add a confirmation screen when suspending a domain
...
Port 8ee98cfd2b
1 year ago
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
1 year ago
5715cd6b8a
[Glitch] Fix prev/next buttons color in media viewer
...
Port 40e756f291
1 year ago
8b958c0858
[Glitch] Translate CW, poll options and media descriptions
...
Port 971eafc709
1 year ago
447b44a5d6
Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
1 year ago
b428d82286
[Glitch] Upgrade react-intl
...
Port 76960f128a
1 year ago
c22b032483
Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
1 year ago
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
Claire
Eugen Rochko
Trevor Wolf
mogaminsk
forsamori
Daniel M Brasil
Plastikmensch
Renaud Chaput
Matt Jankowski
Vivianne
jsgoldstein
S.H
Ian
たいち ひ
Emelia Smith
alfe
alfe
Darius Kazemi
Jed Fox
Christian Schmidt
Nick Schonning