3c714ea3d2
Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream
1 year ago
0e07aadfda
[Glitch] Convert Home timeline components to Typescript
...
Port f8302ec345
1 year ago
794ee87771
Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream
1 year ago
268e955aef
Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
1 year ago
a09ed92a77
Upgrade to `typescript-eslint` v6 ( #25904 )
1 year ago
f8302ec345
Convert Home timeline components to Typescript ( #25583 )
1 year ago
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
1 year ago
9af6f6db1a
Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' 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
2189682f8f
Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream
1 year ago
54b6b035a7
Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' 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
63ca7222d6
Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' 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
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
1 year ago
a64181f28b
Fix import order inconsistencies ( #2289 )
1 year ago
01b9ee2b81
Fix sounds not being loaded from assets host ( #25931 )
1 year ago
29c29410d2
fix buttons showing inconsistent styles ( #25903 )
1 year ago
047d44611b
Fix filters not applying to explore tab ( #25887 )
1 year ago
66693177ff
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
1 year ago
7496c1b655
Change label and design of sensitive and unavailable media in web UI ( #25712 )
1 year ago
e75e734ac2
Remove unused `missed_update` state ( #25832 )
1 year ago
703ff75549
Add toast with option to open post after publishing in web UI ( #25564 )
1 year ago
3df957104a
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
1 year ago
9f5eab728b
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
1 year ago
9203ab410c
Convert `<DismissableBanner>` to Typescript ( #25582 )
1 year ago
b5c5e2bf36
Rewrite `<ShortNumber />` as FC and TS ( #25492 )
1 year ago
4106a801a0
simplify counters ( #25541 )
1 year ago
7ff696d848
Fix translate button position ( #25807 )
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
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
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
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
6ca66c8cad
Change local and federated timelines to be in a single firehose column ( #25641 )
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
7a47a52cd3
Remove the search button from UI header when logged out ( #25631 )
1 year ago
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
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
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
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
9a27d4ec36
Fix j/k keyboard shortcuts on some status lists ( #25554 )
1 year ago
Claire
Renaud Chaput
Stanislas Signoud
Trevor Wolf
Eugen Rochko
alfe
fusagiko / takayamaki
mogaminsk
forsamori