075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
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
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
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
1 year ago
67055b0343
Fix import order inconsistencies ( #2289 )
1 year ago
ea10febd25
fix buttons showing inconsistent styles ( #25903 )
1 year ago
af54bf52c8
Fix filters not applying to explore tab ( #25887 )
1 year ago
c27b82a437
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
1 year ago
338a0e70cc
Change label and design of sensitive and unavailable media in web UI ( #25712 )
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
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
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
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
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
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
cea9db5a0b
Change local and federated timelines to be in a single firehose column ( #25641 )
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
285a691936
Remove the search button from UI header when logged out ( #25631 )
1 year ago
80a5c16ae1
Merge branch 'main' into glitch-soc/merge-upstream
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
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
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
a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists ( #25554 )
1 year ago
8d2c26834f
Fix custom signup URL may not loaded ( #25531 )
1 year ago
69db507924
Change emoji picker icon ( #25479 )
1 year ago
804488d38e
Rewrite `<AutosuggestHashtag />` as FC and TS ( #25481 )
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
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
f20698000f
Fix always redirecting to onboarding in web UI ( #25396 )
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
Claire
Trevor Wolf
Eugen Rochko
Renaud Chaput
alfe
fusagiko / takayamaki
mogaminsk
forsamori
Ian
たいち ひ