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
e87a2c676c
Fix custom signup URL may not loaded ( #25531 )
1 year ago
a56475866f
Change emoji picker icon ( #25479 )
1 year ago
6c4a6bd115
Rewrite `<AutosuggestHashtag />` as FC and TS ( #25481 )
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
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
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
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
569ff79fb8
Rewrite <LoadPending /> as FC and TS ( #25363 )
1 year ago
272e099bce
Change "bot" label to "automated" ( #25356 )
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
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
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
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
1 year ago
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
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
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
66a5173629
Add `legal` as report category ( #23941 )
1 year ago
7abfddd8a5
Change design of dropdowns in web UI ( #25107 )
1 year ago
f9c819e8db
Rewrite `<LoadMore />` as FC and TS ( #25259 )
1 year ago
8f34072fc0
Change follow button in account row to be more obvious in web UI ( #24956 )
1 year ago
21f904b344
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
1 year ago
94f9888d57
Fix not shown announcements in hometimeline. ( #25251 )
1 year ago
bda5be1406
Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
4c2503d36c
Fix design issues with recent react-intl upgrade ( #25272 )
1 year ago
6debddcf89
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
c4426198c3
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
1 year ago
2d2750c6a9
Fix spacing of middle dots in the detailed status meta section ( #25247 )
1 year ago
29851c83bd
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
a82f036309
Fix overflow behavior of account rows ( #25131 )
1 year ago
4e28b89f51
Fix using Date.now() instead of intl.now() ( #25234 )
1 year ago
8ee98cfd2b
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
971eafc709
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
76960f128a
Upgrade react-intl ( #24906 )
1 year ago
9ba1135000
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
75ebb60ef6
Fix `null` signUp URL in various places ( #25190 )
1 year ago
5c744a5d7d
Handle Surrogate Pairs in truncate() ( #25148 )
1 year ago
53b8a15ee9
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
973743ff50
Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
1 year ago
fa16de4a4e
Merge commit '7b5a2748360753a903108a6e57caaee3194a5750' 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
006bc485e4
Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream
1 year ago
31c4b3183b
Merge commit 'abbc6dfcbaa105faee402694061c408d37320b75' into glitch-soc/merge-upstream
1 year ago
03a3ff1f02
Merge commit '3b0c3e94e0831edcf4298bf9940799a2e94c5583' into glitch-soc/merge-upstream
1 year ago
569302e5ce
Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream
2 years ago
3413fc7002
Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream
2 years ago
ee6f9d2c92
Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream
2 years ago
11368da545
Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
2 years ago
a19c1671af
Rewrite actions/modal and reducers/modal with typescript ( #24833 )
2 years ago
ae0341c203
Fix export style of `<LoadGap />` based on `<Domain />` ( #25128 )
2 years ago
169f141c4c
Update inconsistent `defaultMessage` ( #25114 )
2 years ago
97235baa4f
Change share action from being in action bar to being in dropdown in web UI ( #25105 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
9be9f4f5e2
Fix `null` signUp URL handling from #25014 ( #25108 )
2 years ago
6077f3e24c
Rewrite `<LoadGap />` as FC and TS ( #25042 )
2 years ago
7b5a274836
Enforce import order with ESLint ( #25096 )
2 years ago
4d631fcfb7
Add support for custom sign-up URLs ( #25014 )
2 years ago
cbcf32777e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2 years ago
abbc6dfcba
Use JSX syntax for Fragments ( #25093 )
2 years ago
3b0c3e94e0
Use the new JSX transform ( #25064 )
2 years ago
9cfab99590
Rewrite `<TimelineHint />` as FC and TS ( #25091 )
2 years ago
0b87919abf
Rewrite `<Skeleton/>` as FC and TS ( #25055 )
2 years ago
18361ae0c5
Allow scripts in post embed previews ( #25071 )
2 years ago
ab029328cf
Upgrade to React 18 ( #24916 )
2 years ago
c4f2b1e86a
Fix minor typos in comments and spec names ( #21831 )
2 years ago
Claire
Eugen Rochko
Renaud Chaput
alfe
fusagiko / takayamaki
mogaminsk
forsamori
Ian
たいち ひ
alfe
S.H
Darius Kazemi
Jed Fox
Christian Schmidt
dependabot[bot]
y.takahashi
Nick Schonning