Eugen Rochko
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
Eugen Rochko
239ee4f5d1
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
2023-06-13 22:30:40 +02:00
たいち ひ
6e0c48cbe8
Rewrite emoji_mart_data_light as TS ( #25138 )
2023-06-13 19:28:31 +02:00
alfe
293cf44626
Rewrite <LoadingIndicator/> as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00
Renaud Chaput
b51a10a066
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
Plastikmensch
a804371e21
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 868d478b1b
2023-06-11 13:33:45 +02:00
alfe
569ff79fb8
Rewrite <LoadPending /> as FC and TS ( #25363 )
2023-06-11 04:47:18 +02:00
Eugen Rochko
272e099bce
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
Claire
f49b12e06d
Fix some translation strings inconsistencies
2023-06-10 19:21:44 +02:00
Claire
14788cf0ce
Switch to using a common runtime chunk rather than locales
2023-06-10 17:43:13 +02:00
Eugen Rochko
b5872b0686
[Glitch] Change design of dropdowns in web UI
...
Port 7abfddd8a5
2023-06-10 17:10:06 +02:00
alfe
ee6682e48d
[Glitch] Rewrite <LoadMore /> as FC and TS
...
Port f9c819e8db
2023-06-10 16:59:25 +02:00
Claire
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.
2023-06-10 16:48:01 +02:00
Claire
29e63ef4d5
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 21f904b344
2023-06-10 16:38:03 +02:00
S.H
00307189bc
[Glitch] Fix not shown announcements in hometimeline.
...
Port 94f9888d57
2023-06-10 16:37:20 +02:00
Claire
3dd186bbf1
[Glitch] Fix design issues with recent react-intl upgrade
...
Port 4c2503d36c
2023-06-10 16:36:54 +02:00
Darius Kazemi
46b4268007
[Glitch] Add exclusive lists
...
Port 6debddcf89
2023-06-10 16:36:15 +02:00
Claire
60762fb8ba
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from c7a8838bd7
2023-06-10 16:30:36 +02:00
Jed Fox
2877b12754
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port 2d2750c6a9
2023-06-10 16:29:48 +02:00
Claire
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.
2023-06-10 16:22:14 +02:00
Renaud Chaput
333c28ce6d
[Glitch] Fix /share and cleanup and reorganize frontend locale loading
...
Port 29851c83bd
2023-06-10 16:18:01 +02:00
Claire
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.
2023-06-10 15:32:29 +02:00
S.H
7ccf99b652
[Glitch] Fix using Date.now() instead of intl.now()
...
Port 4e28b89f51
2023-06-10 15:21:04 +02:00
Claire
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
Claire
fd0b9c9881
[Glitch] Add a confirmation screen when suspending a domain
...
Port 8ee98cfd2b
2023-06-10 15:10:24 +02:00
Claire
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
Renaud Chaput
5715cd6b8a
[Glitch] Fix prev/next buttons color in media viewer
...
Port 40e756f291
2023-06-10 14:48:41 +02:00
Christian Schmidt
8b958c0858
[Glitch] Translate CW, poll options and media descriptions
...
Port 971eafc709
2023-06-10 14:48:41 +02:00
Claire
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`.
2023-06-10 14:38:04 +02:00
Renaud Chaput
b428d82286
[Glitch] Upgrade react-intl
...
Port 76960f128a
2023-06-10 14:37:08 +02:00
Claire
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.
2023-06-10 12:38:33 +02:00
Eugen Rochko
66a5173629
Add legal as report category ( #23941 )
2023-06-06 23:41:59 +02:00
Eugen Rochko
7abfddd8a5
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
alfe
f9c819e8db
Rewrite <LoadMore /> as FC and TS ( #25259 )
2023-06-06 11:28:50 +02:00
Claire
51046cb4db
Fix autocomplete suggestions being cut off in compose form ( #25275 )
2023-06-06 11:05:25 +02:00
Eugen Rochko
8f34072fc0
Change follow button in account row to be more obvious in web UI ( #24956 )
2023-06-06 04:14:28 +02:00
Claire
21f904b344
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
2023-06-05 17:32:24 +02:00
S.H
94f9888d57
Fix not shown announcements in hometimeline. ( #25251 )
2023-06-05 14:49:51 +02:00
dependabot[bot]
d6feba366b
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 9ba1135000
2023-06-05 13:31:45 +02:00
Claire
cd107b054d
[Glitch] Fix null signUp URL in various places
...
Port 75ebb60ef6
2023-06-05 13:28:22 +02:00
y.takahashi
e7cb0dc83b
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 5c744a5d7d
2023-06-05 13:28:02 +02:00
Claire
bda5be1406
Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
2023-06-05 13:25:22 +02:00
Claire
4c2503d36c
Fix design issues with recent react-intl upgrade ( #25272 )
2023-06-05 09:52:36 +02:00
Darius Kazemi
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>
2023-06-05 09:37:02 +02:00
Eugen Rochko
c4426198c3
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
2023-06-05 01:42:17 +02:00
Claire
85e0bd73cf
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 62f386d44e
2023-06-04 22:05:45 +02:00
Claire
c7a8838bd7
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
2023-06-02 18:35:37 +02:00
Jed Fox
2d2750c6a9
Fix spacing of middle dots in the detailed status meta section ( #25247 )
2023-06-02 15:40:23 +02:00
Renaud Chaput
29851c83bd
Fix /share and cleanup and reorganize frontend locale loading ( #25240 )
2023-06-02 15:00:27 +02:00
Claire
a82f036309
Fix overflow behavior of account rows ( #25131 )
2023-06-01 14:47:55 +02:00
S.H
4e28b89f51
Fix using Date.now() instead of intl.now() ( #25234 )
2023-06-01 13:46:19 +02:00
Claire
8ee98cfd2b
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
Renaud Chaput
40e756f291
Fix prev/next buttons color in media viewer ( #25231 )
2023-06-01 02:25:38 +02:00
Christian Schmidt
971eafc709
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-01 00:10:21 +02:00
Renaud Chaput
76960f128a
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
dependabot[bot]
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>
2023-05-31 09:27:21 +02:00
Claire
75ebb60ef6
Fix null signUp URL in various places ( #25190 )
2023-05-30 19:01:42 +02:00
y.takahashi
5c744a5d7d
Handle Surrogate Pairs in truncate() ( #25148 )
2023-05-29 11:55:16 +02:00
Claire
615a7d5795
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
fusagiko / takayamaki
62f386d44e
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port a19c1671af
2023-05-28 17:49:55 +02:00
たいち ひ
cd0ff98425
[Glitch] Fix export style of <LoadGap /> based on <Domain />
...
Port ae0341c203
2023-05-28 17:15:21 +02:00
Renaud Chaput
f58504f2c7
[Glitch] Update inconsistent defaultMessage
...
Port 169f141c4c
2023-05-28 17:14:31 +02:00
Claire
53b8a15ee9
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
Eugen Rochko
2592015ce6
[Glitch] Change share action from being in action bar to being in dropdown in web UI
...
Port 97235baa4f
2023-05-28 16:59:12 +02:00
Renaud Chaput
b17b1827e7
[Glitch] Fix null signUp URL handling from #25014
...
Port 9be9f4f5e2
2023-05-28 16:52:16 +02:00
たいち ひ
8134d62112
[Glitch] Rewrite <LoadGap /> as FC and TS
...
Port 6077f3e24c
2023-05-28 16:48:17 +02:00
Claire
973743ff50
Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
2023-05-28 16:41:14 +02:00
Claire
a7e6f3df20
Fix import order with ESLint
...
Port 7b5a274836
2023-05-28 16:38:10 +02:00
Claire
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.
2023-05-28 15:54:31 +02:00
Claire
214f04f04b
[Glitch] Add support for custom sign-up URLs
...
Port 4d631fcfb7
2023-05-28 15:09:28 +02:00
Claire
ffc7a57f8b
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port cbcf32777e
2023-05-28 15:06:29 +02:00
Claire
006bc485e4
Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
Claire
8793625bf3
[Glitch] Use JSX syntax for Fragments
...
Port abbc6dfcba
2023-05-28 14:56:24 +02:00
Claire
31c4b3183b
Merge commit 'abbc6dfcbaa105faee402694061c408d37320b75' into glitch-soc/merge-upstream
2023-05-28 14:32:26 +02:00
Claire
fb2bf621eb
[Glitch] Use the new JSX transform everywhere
...
Port 3b0c3e94e0
2023-05-28 14:18:43 +02:00
Claire
03a3ff1f02
Merge commit '3b0c3e94e0831edcf4298bf9940799a2e94c5583' into glitch-soc/merge-upstream
2023-05-28 13:55:30 +02:00
Claire
20e8b117e3
fixup! [Glitch] Upgrade to React 18
2023-05-26 18:44:18 +02:00
たいち ひ
114ad2d4d1
[Glitch] Rewrite <TimelineHint /> as FC and TS
...
Port 9cfab99590
2023-05-25 23:58:54 +02:00
たいち ひ
76e9386332
[Glitch] Rewrite <Skeleton/> as FC and TS
...
Port 0b87919abf
2023-05-25 23:55:36 +02:00
Claire
758a0ae1e9
[Glitch] Allow scripts in post embed previews
...
Port 18361ae0c5
2023-05-25 23:52:04 +02:00
Claire
569302e5ce
Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream
2023-05-25 23:47:28 +02:00
Renaud Chaput
056dd39631
[Glitch] Upgrade to React 18
...
Port ab029328cf
2023-05-25 23:45:01 +02:00
Claire
3413fc7002
Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream
2023-05-25 23:18:57 +02:00
Claire
ee6f9d2c92
Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream
2023-05-25 22:59:30 +02:00
Claire
9e224add8a
Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
Upstream merged our captcha code, but there are some
conflicts due to glitch-soc's theming system.
Additional changes:
- `Gemfile`:
Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
Upstream added the `captcha_enabled` setting in another place in the file.
2023-05-25 22:49:18 +02:00
Claire
b55d56387b
[Glitch] Add polling and automatic redirection to /start on email confirmation
...
Port 86961b5b7b
2023-05-25 22:37:14 +02:00
Claire
560f605dc2
Merge commit '86961b5b7b459fd778a9b697bbdfbda03512babb' into glitch-soc/merge-upstream
2023-05-25 22:18:55 +02:00
Claire
c3cca0eff4
[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline
...
Port d2eef78d1c
2023-05-25 22:00:07 +02:00
Christian Schmidt
6cde4718c0
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 778fd4d29b
2023-05-25 21:57:19 +02:00
Eugen Rochko
12c177a34e
[Glitch] Change "Sign in" to "Login"
...
Port d05ff56746
2023-05-25 21:52:37 +02:00
Claire
0042d5a246
[Glitch] Fix videos being improperly positioned on safari
...
Port de95d0ca8f
2023-05-25 21:47:48 +02:00
Renaud Chaput
e11d884c53
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 6a3211876c
2023-05-25 21:43:19 +02:00
Nick Schonning
dc9dcd0fa9
[Glitch] Enable ESLint react/no-deprecated
...
Port b0dd260a7a
2023-05-25 21:07:38 +02:00
Renaud Chaput
afde99dc29
[Glitch] Disable RTK safety middlewares
...
Port c9dfc55b22
2023-05-25 20:57:42 +02:00
fusagiko / takayamaki
a3c2519ba0
[Glitch] Add type annotation for DisplayName component
...
Port a150bb4f2e
2023-05-25 20:57:07 +02:00
fusagiko / takayamaki
b3e018ce58
[Glitch] Rename Image component to ServerHeroImage
...
Port cbca954632
2023-05-25 20:44:09 +02:00
Claire
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.
2023-05-25 20:43:25 +02:00
Claire
5a99be78e4
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2023-05-25 19:40:33 +02:00
Claire
b13b71d1f5
Greatly simplify history management code ( #2230 )
...
Fixes #2220
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream.
2023-05-25 19:14:51 +02:00
Claire
56ac8eb6ea
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2023-05-25 19:14:37 +02:00
