S.H
a4d7a17089
[Glitch] Fix using Date.now() instead of intl.now()
...
Port b3f9a0da52
2023-06-10 15:21:04 +02:00
Claire
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
Claire
9af04d5a46
[Glitch] Add a confirmation screen when suspending a domain
...
Port e9385e93e9
2023-06-10 15:10:24 +02:00
Claire
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
Renaud Chaput
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
2023-06-10 14:48:41 +02:00
Christian Schmidt
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
2023-06-10 14:48:41 +02:00
Claire
93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' 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
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
2023-06-10 14:37:08 +02:00
Claire
85722a918d
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' 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
dependabot[bot]
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
2023-06-05 13:31:45 +02:00
Claire
5e876c2901
[Glitch] Fix null signUp URL in various places
...
Port 14bb6bb29a
2023-06-05 13:28:22 +02:00
y.takahashi
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
2023-06-05 13:28:02 +02:00
Claire
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
2023-06-05 13:25:22 +02:00
Claire
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
2023-06-04 22:05:45 +02:00
Claire
5fae2de454
Fix overflow behavior of account rows ( #25131 )
2023-06-01 14:47:55 +02:00
S.H
b3f9a0da52
Fix using Date.now() instead of intl.now() ( #25234 )
2023-06-01 13:46:19 +02:00
Claire
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
Renaud Chaput
675672feb6
Fix prev/next buttons color in media viewer ( #25231 )
2023-06-01 02:25:38 +02:00
Christian Schmidt
69057467cb
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
44cd88adc4
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
dependabot[bot]
89d6341c80
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
14bb6bb29a
Fix null signUp URL in various places ( #25190 )
2023-05-30 19:01:42 +02:00
y.takahashi
64b960b6b3
Handle Surrogate Pairs in truncate() ( #25148 )
2023-05-29 11:55:16 +02:00
Claire
5ed48e6878
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
fusagiko / takayamaki
382b2a506a
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port 38c6216082
2023-05-28 17:49:55 +02:00
たいち ひ
6a592083f1
[Glitch] Fix export style of <LoadGap /> based on <Domain />
...
Port 4197b5e4c8
2023-05-28 17:15:21 +02:00
Renaud Chaput
0009b4b574
[Glitch] Update inconsistent defaultMessage
...
Port e58c36d308
2023-05-28 17:14:31 +02:00
Claire
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
Eugen Rochko
e7dc375aab
[Glitch] Change share action from being in action bar to being in dropdown in web UI
...
Port 1caa5ff39e
2023-05-28 16:59:12 +02:00
Renaud Chaput
7bec63e6e2
[Glitch] Fix null signUp URL handling from #25014
...
Port 40b948a1fb
2023-05-28 16:52:16 +02:00
たいち ひ
017fbc7a74
[Glitch] Rewrite <LoadGap /> as FC and TS
...
Port 7336f3648b
2023-05-28 16:48:17 +02:00
Claire
0e7466717f
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' 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
7d7db8977b
Fix import order with ESLint
...
Port d27216dc46
2023-05-28 16:38:10 +02:00
Claire
1cd7f5ff17
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' 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
9e5278ea7b
[Glitch] Add support for custom sign-up URLs
...
Port ca66e61b93
2023-05-28 15:09:28 +02:00
Claire
8f380a33fc
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port 100840c06e
2023-05-28 15:06:29 +02:00
Claire
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
Claire
a0bc0619ca
[Glitch] Use JSX syntax for Fragments
...
Port 5a16bd7bf4
2023-05-28 14:56:24 +02:00
Claire
8278907ff7
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
2023-05-28 14:32:26 +02:00
Claire
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
2023-05-28 14:18:43 +02:00
Claire
9381f78166
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
2023-05-28 13:55:30 +02:00
Claire
1347ca6eb0
fixup! [Glitch] Upgrade to React 18
2023-05-26 18:44:18 +02:00
たいち ひ
60c7e559d8
[Glitch] Rewrite <TimelineHint /> as FC and TS
...
Port 9a472efe7c
2023-05-25 23:58:54 +02:00
たいち ひ
6746e5d430
[Glitch] Rewrite <Skeleton/> as FC and TS
...
Port 8066118d1f
2023-05-25 23:55:36 +02:00
Claire
892b3c16f5
[Glitch] Allow scripts in post embed previews
...
Port 711a037660
2023-05-25 23:52:04 +02:00
Claire
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
2023-05-25 23:47:28 +02:00
Renaud Chaput
3b375ee395
[Glitch] Upgrade to React 18
...
Port 8d6aea3326
2023-05-25 23:45:01 +02:00
Claire
45d7358100
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
2023-05-25 23:18:57 +02:00
Claire
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2023-05-25 22:59:30 +02:00
Claire
ad1098970b
Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' 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
