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
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
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
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
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
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
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
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
14788cf0ce
Switch to using a `common` runtime chunk rather than `locales`
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
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
51046cb4db
Fix autocomplete suggestions being cut off in compose form ( #25275 )
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
d6feba366b
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 9ba1135000
1 year ago
cd107b054d
[Glitch] Fix `null` signUp URL in various places
...
Port 75ebb60ef6
1 year ago
e7cb0dc83b
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 5c744a5d7d
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
85e0bd73cf
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 62f386d44e
1 year ago
c7a8838bd7
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
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
40e756f291
Fix prev/next buttons color in media viewer ( #25231 )
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
615a7d5795
Fix extraneous newlines
1 year ago
Claire
mogaminsk
Eugen Rochko
Renaud Chaput
Ian
たいち ひ
alfe
Plastikmensch
alfe
S.H
Darius Kazemi
Jed Fox
Christian Schmidt
dependabot[bot]
y.takahashi