c2bfbf53a1
Fix various CSS issues
1 year ago
8d0c69529a
Change markers API to use a replica ( #25851 )
1 year ago
fdc3ff7c2d
Change notifications API to use a replica ( #25874 )
1 year ago
9ae60f8738
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
1 year ago
ec95f62cb4
[Glitch] Fix sounds not being loaded from assets host
...
Port 1392f31ed8
1 year ago
2aadebc769
Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
1 year ago
15f6fa8d47
[Glitch] fix buttons showing inconsistent styles
...
Port ea10febd25
1 year ago
c3af91ce48
[Glitch] Fix filters not applying to explore tab
...
Port af54bf52c8
1 year ago
c699dc0908
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`
...
Port c27b82a437
1 year ago
075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
1 year ago
71f8c45c18
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 338a0e70cc
1 year ago
dd0002e1fe
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
1 year ago
c250b37f0a
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port ceeb2b8c41
1 year ago
82eebd0482
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
1 year ago
9e311f95aa
[Glitch] simplify counters
...
Port e0d230fb37
1 year ago
5b9e43187c
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port 20e85c0e83
1 year ago
55ea79165a
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 4534498a8e
1 year ago
0bfa4a990f
[Glitch] Fix translate button position
...
Port 9f078e238d
1 year ago
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
1 year ago
67055b0343
Fix import order inconsistencies ( #2289 )
1 year ago
1ef014802b
Refactor `Trends::Query` to avoid brakeman sql injection warnings ( #25881 )
1 year ago
ecd8e0d612
Update Stylelint ( #25819 )
1 year ago
2e1391fdd2
Fix `Naming/MemoizedInstanceVariableName` cop ( #25928 )
1 year ago
5134fc65e2
Fix `Naming/AccessorMethodName` cop ( #25924 )
1 year ago
b8b2470cf8
Fix `Style/SlicingWithRange` cop ( #25923 )
1 year ago
1d557305d2
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
1 year ago
1392f31ed8
Fix sounds not being loaded from assets host ( #25931 )
1 year ago
ca955ada0b
Use invariant colors on notification toasts ( #25919 )
1 year ago
ea10febd25
fix buttons showing inconsistent styles ( #25903 )
1 year ago
99be47f8b9
Change searching with # to include account index ( #25638 )
1 year ago
af54bf52c8
Fix filters not applying to explore tab ( #25887 )
1 year ago
999c343946
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
1 year ago
c27b82a437
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
1 year ago
f3fca78756
Refactor `NotificationMailer` to use parameterization ( #25718 )
1 year ago
a1f5188c8c
Change feed merge, unmerge and regeneration workers to use a replica ( #25849 )
1 year ago
610cf6c371
Fix trend calculation working on too many items at a time ( #25835 )
1 year ago
338a0e70cc
Change label and design of sensitive and unavailable media in web UI ( #25712 )
1 year ago
cf33028f35
Admin mailer parameterization ( #25759 )
1 year ago
41a505513f
Remove unused `missed_update` state ( #25832 )
1 year ago
a7ca33ad96
Add toast with option to open post after publishing in web UI ( #25564 )
1 year ago
a8edbcf963
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
1 year ago
ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
1 year ago
93e8a15415
Add forwarding of reported replies to servers being replied to ( #25341 )
1 year ago
e4cfe4b3db
First pass at multi-database for read replica using Rails native adapter ( #25693 )
...
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
1 year ago
4534498a8e
Convert `<DismissableBanner>` to Typescript ( #25582 )
1 year ago
20e85c0e83
Rewrite `<ShortNumber />` as FC and TS ( #25492 )
1 year ago
e0d230fb37
simplify counters ( #25541 )
1 year ago
9f078e238d
Fix translate button position ( #25807 )
1 year ago
b9aa228c54
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
1 year ago
b6d173b459
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
1 year ago
94fbac77e7
Fix processing of media files with unusual names ( #25788 )
1 year ago
513078de7a
Fix incorrect secondary button size ( #2276 )
1 year ago
ff7aae3037
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
610731b03d
Merge pull request from GHSA-55j9-c3mp-6fcq
1 year ago
c5929798bf
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
dc8f1fbd97
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
6d8e0fae3e
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
c0fa85b8dd
[Glitch] Fix regression of icon button colors in web UI
...
Port 69e124e2ed
1 year ago
4719d88117
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 54cb679c19
1 year ago
a117c953d0
[Glitch] Add button to see results for polls in web UI
...
Port b7910bc751
1 year ago
b3f209370b
[Glitch] Add canonical link tags in web UI
...
Port 000b835803
1 year ago
c6246807f5
[Glitch] Fix local live feeds does not expand
...
Port 6268188543
1 year ago
ac74374311
[Glitch] Add at-symbol prepended to mention span title
...
Port d9a5c1acfa
1 year ago
0a5271629c
[Glitch] Change labels of live feeds tabs in web UI
...
Port 54a10523e2
1 year ago
5de49e74d4
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
000b835803
Add canonical link tags in web UI ( #25715 )
1 year ago
b7910bc751
Add button to see results for polls in web UI ( #25726 )
1 year ago
eb2417ce99
Fix OAuth apps page crashing when listing apps with certain admin API scopes ( #25713 )
1 year ago
4658263b4a
Fix re-activated accounts being deleted by AccountDeletionWorker ( #25711 )
1 year ago
182fd93a07
fix read more button overlapping thread line bug ( #25706 )
1 year ago
6268188543
Fix local live feeds does not expand ( #25694 )
1 year ago
d9a5c1acfa
Add at-symbol prepended to mention span title ( #25684 )
...
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
1 year ago
54a10523e2
Change labels of live feeds tabs in web UI ( #25683 )
1 year ago
383c00819c
Fix `/api/v2/search` not working with following query param ( #25681 )
1 year ago
69e124e2ed
Fix regression of icon button colors in web UI ( #25679 )
1 year ago
ed15893eed
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
54cb679c19
Change button colors to increase hover/focus contrast and consistency ( #25677 )
1 year ago
b422b5eebd
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
9f3c3f5209
Show local-only posts in “All” by default, and add back option to toggle it
1 year ago
e6a8faae81
Add users index on unconfirmed_email ( #25672 )
1 year ago
180f0e6715
Fix inefficient query when requesting a new confirmation email from a logged-in account ( #25669 )
1 year ago
587ddc2c7f
[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI
...
Port 5b46345459
1 year ago
c49e339c89
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI
...
Port 0512537eb6
1 year ago
7cc2c1be29
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port cea9db5a0b
1 year ago
eb1cb8224a
[Glitch] Use an Immutable Record as the root state
...
Port 78ba12f0bf
1 year ago
2ba4773ebe
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 9934949fc4
1 year ago
b75aa6b819
[Glitch] Remove the search button from UI header when logged out
...
Port 285a691936
1 year ago
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
ba06a2f104
Revert "Rails 7 update" ( #25667 )
1 year ago
5b46345459
Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )
1 year ago
0512537eb6
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
1 year ago
50c2a03695
Rails 7 update ( #24241 )
1 year ago
4fe2d7cb59
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
1 year ago
cea9db5a0b
Change local and federated timelines to be in a single firehose column ( #25641 )
1 year ago
155fc459e3
Fixing an issue with a missing argument ( #2261 )
...
undefined
1 year ago
683ba5ecb1
Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )
1 year ago
78ba12f0bf
Use an Immutable Record as the root state ( #25584 )
1 year ago
9934949fc4
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
1 year ago
a209d1e683
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
1 year ago
4581a528f7
Change account search to match by text when opted-in ( #25599 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
285a691936
Remove the search button from UI header when logged out ( #25631 )
1 year ago
c43cfd2406
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ae30a60b1f
1 year ago
4faa4eb3c4
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 65aa04647a
1 year ago
2f996375e5
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 2b78c07ef1
1 year ago
80a5c16ae1
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
c7c6f02ae6
Fix suspending an already-limited domain ( #25603 )
1 year ago
0ccf6c0eb7
Fix batch attachment deletion leaving empty directories ( #25587 )
1 year ago
7a25af64dd
Remove media attachment only when file was exist ( #25586 )
1 year ago
bb4756c823
Change files to be deleted in batches instead of one-by-one ( #23302 )
1 year ago
ae30a60b1f
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
ed96e28c9e
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
1 year ago
7b024baf50
Change header backgrounds to use fewer different colors in web UI ( #25577 )
1 year ago
65aa04647a
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
1 year ago
2b78c07ef1
Fix search not being easily findable on smaller screens in web UI ( #25576 )
1 year ago
5def74a436
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 0842a68532
1 year ago
6fb34258a4
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port 00ec43914a
1 year ago
7d160d2272
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port a8c1c8bd37
1 year ago
222713a768
[Glitch] Fix custom signup URL may not loaded
...
Port 8d2c26834f
1 year ago
6fe345c383
[Glitch] Change emoji picker icon
...
Port 69db507924
1 year ago
c71fc42f4e
[Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS
...
Port 804488d38e
1 year ago
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' 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
55e7c08a83
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
1 year ago
a985d587e1
Change labels and styles on the onboarding screen in web UI ( #25559 )
1 year ago
0842a68532
Remove unique accounts condition from Home onboarding prompt ( #25556 )
1 year ago
00ec43914a
Add onboarding prompt when home feed too slow in web UI ( #25267 )
1 year ago
1d622c8033
Add POST /api/v1/conversations/:id/unread ( #25509 )
1 year ago
a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists ( #25554 )
1 year ago
a5b6f6da80
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
1 year ago
602c458ab6
Add finer permission requirements for managing webhooks ( #25463 )
1 year ago
8d2c26834f
Fix custom signup URL may not loaded ( #25531 )
1 year ago
69db507924
Change emoji picker icon ( #25479 )
1 year ago
ebfeaebedb
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
1 year ago
ec91ea4457
Fix missing validation on `default_privacy` setting ( #25513 )
1 year ago
fd23f50243
Fix wrong view being displayed when a webhook fails validation ( #25464 )
1 year ago
c78280a8ce
Add translate="no" to outgoing mentions and links ( #25524 )
1 year ago
3a91603b15
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
1 year ago
dd07393e75
Fix user settings not getting validated ( #25508 )
1 year ago
804488d38e
Rewrite `<AutosuggestHashtag />` as FC and TS ( #25481 )
1 year ago
e1c9d52e91
Reduce `sleep` time in request pool spec ( #25470 )
1 year ago
155ec185b2
Remove unused `picture_hint` helper method ( #25485 )
1 year ago
b9bc9d0bda
Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )
1 year ago
dc68306b8e
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
64f7a11658
Fix cross-origin loading of locales ( #25498 )
1 year ago
3b04e39534
[Glitch] Fix non-interactive upload container being given a `button` role and tabIndex
...
Port c9d06d10d4
1 year ago
6c99479ef4
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' 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
d795c2c70c
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
...
Port 39110d1d0a
1 year ago
b1b95ddd1f
[Glitch] Rewrite `emoji_mart_data_light` as TS
...
Port 3b5e302f7f
1 year ago
9bf63257fb
[Glitch] Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
...
Port a86886b1fd
1 year ago
0a212cfa7f
[Glitch] Add missing report category translation
...
Port 1cb4514d0e
1 year ago
cdec45eca9
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port dfaf59d99a
1 year ago
f815bd5fd9
[Glitch] Change "bot" label to "automated"
...
Port 432a5d2d4b
1 year ago
65cbcce997
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
1 year ago
c9d06d10d4
Fix non-interactive upload container being given a `button` role and tabIndex ( #25462 )
1 year ago
d9c6f70cc6
Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` ( #25386 )
1 year ago
f20698000f
Fix always redirecting to onboarding in web UI ( #25396 )
1 year ago
ec59166844
Fix ArgumentError when loading newer Private Mentions ( #25399 )
1 year ago
bca649ba79
Change edit profile page ( #25413 )
1 year ago
39110d1d0a
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
1 year ago
3b5e302f7f
Rewrite `emoji_mart_data_light` as TS ( #25138 )
1 year ago
a86886b1fd
Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
1 year ago
1cb4514d0e
Add missing report category translation ( #25400 )
1 year ago
6637ef7852
Add unsubscribe link to e-mails ( #25378 )
1 year ago
fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 68a192e718
1 year ago
dfaf59d99a
Rewrite <LoadPending /> as FC and TS ( #25363 )
1 year ago
432a5d2d4b
Change "bot" label to "automated" ( #25356 )
1 year ago
20718a8b59
Fix some translation strings inconsistencies
1 year ago
42a0898f16
Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' 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
34efd1a24c
Switch to using a `common` runtime chunk rather than `locales`
1 year ago
8c26d49cbd
Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' 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
fb0d2de8fe
[Glitch] Change design of dropdowns in web UI
...
Port e4fd9503ec
1 year ago
83ae40e192
[Glitch] Rewrite `<LoadMore />` as FC and TS
...
Port fb5bf5cbf8
1 year ago
c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' 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
88c5ad3136
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 1483a3ddfe
1 year ago
5a961f84cf
[Glitch] Fix not shown announcements in hometimeline.
...
Port a6c898f501
1 year ago
475185a2ee
[Glitch] Fix design issues with recent react-intl upgrade
...
Port c2c396157f
1 year ago
a8a30f1298
[Glitch] Add exclusive lists
...
Port bacb674921
1 year ago
bf23afa059
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from 0766c9a631
1 year ago
753385d3e0
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port acc419b81b
1 year ago
d8b0a732aa
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' 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
9e66c07be7
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port b0780cfeed
1 year ago
734e186717
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' 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
a4d7a17089
[Glitch] Fix using Date.now() instead of intl.now()
...
Port b3f9a0da52
1 year ago
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
1 year ago
9af04d5a46
[Glitch] Add a confirmation screen when suspending a domain
...
Port e9385e93e9
1 year ago
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
1 year ago
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
1 year ago
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
1 year ago
93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' 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
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
1 year ago
85722a918d
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' 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
4c9406bdb0
Add time zone preference ( #25342 )
1 year ago
75e299f440
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
1 year ago
18f092d927
Fix translations for changing theme ( #25340 )
1 year ago
67d17ce194
Add `legal` as report category ( #23941 )
1 year ago
e4fd9503ec
Change design of dropdowns in web UI ( #25107 )
1 year ago
c66250abf1
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
fb5bf5cbf8
Rewrite `<LoadMore />` as FC and TS ( #25259 )
1 year ago
6833732852
Fix autocomplete suggestions being cut off in compose form ( #25275 )
1 year ago
4eda233e09
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
0ddc895282
Change follow button in account row to be more obvious in web UI ( #24956 )
1 year ago
af135bddd0
Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )
1 year ago
1483a3ddfe
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
1 year ago
3b21c13dcc
Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )
1 year ago
a6c898f501
Fix not shown announcements in hometimeline. ( #25251 )
1 year ago
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
1 year ago
5e876c2901
[Glitch] Fix `null` signUp URL in various places
...
Port 14bb6bb29a
1 year ago
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
1 year ago
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
c2c396157f
Fix design issues with recent react-intl upgrade ( #25272 )
1 year ago
bacb674921
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
0daf78f903
Add `allow_other_host: true` to backups controller ( #25266 )
1 year ago
4a5464f360
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
1 year ago
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
1 year ago
768b00c4d0
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
1 year ago
0766c9a631
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
1 year ago
94329f28e1
Change wording of “Content cache retention period” setting to highlight destructive implications ( #23261 )
1 year ago
acc419b81b
Fix spacing of middle dots in the detailed status meta section ( #25247 )
1 year ago
b0780cfeed
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
5fae2de454
Fix overflow behavior of account rows ( #25131 )
1 year ago
8884d1ece0
Add support for importing lists ( #25203 )
1 year ago
b3f9a0da52
Fix using Date.now() instead of intl.now() ( #25234 )
1 year ago
f84037ae2b
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
1 year ago
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
b922ad7a1b
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
1 year ago
2b45fecde1
Fix multiple N+1s in ConversationsController ( #25134 )
1 year ago
675672feb6
Fix prev/next buttons color in media viewer ( #25231 )
1 year ago
69057467cb
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
44cd88adc4
Upgrade react-intl ( #24906 )
1 year ago
00c222377d
Remove unused Settings::Extend module ( #25214 )
1 year ago
b7d995cb00
Disable some metrics cops ( #25215 )
1 year ago
b6519ab3f5
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
1 year ago
89d6341c80
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
14bb6bb29a
Fix `null` signUp URL in various places ( #25190 )
1 year ago
8c183a9831
Align argument type to keyword argument for private process method in FetchResourceService ( #25189 )
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
Claire
Eugen Rochko
Stanislas Signoud
Trevor Wolf
fusagiko / takayamaki
alfe
Renaud Chaput
Matt Jankowski
Nick Schonning
jsgoldstein
Kurtis Rainbolt-Greene
mogaminsk
forsamori
Daniel M Brasil
Plastikmensch
Vivianne
S.H
Ian
たいち ひ
Emelia Smith
alfe
Darius Kazemi
Jed Fox
Christian Schmidt
dependabot[bot]
y.takahashi