f101b67a45
Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
7c70237d7e
Fix non-interactive upload container being given a `button` role and tabIndex ( #25462 )
2023-06-16 12:03:06 +02:00
4a994e5b50
Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` ( #25386 )
2023-06-14 15:21:36 +02:00
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
a424076226
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2023-06-14 08:54:52 +02:00
989a8758e3
Change edit profile page ( #25413 )
2023-06-14 04:38:07 +02:00
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
293cf44626
Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00
b51a10a066
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
94ef94c5ea
Add unsubscribe link to e-mails ( #25378 )
2023-06-12 14:22:46 +02:00
a804371e21
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 868d478b1b
2023-06-11 13:33:45 +02:00
569ff79fb8
Rewrite <LoadPending /> as FC and TS ( #25363 )
2023-06-11 04:47:18 +02:00
272e099bce
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
f49b12e06d
Fix some translation strings inconsistencies
2023-06-10 19:21:44 +02:00
1c25f35ddf
Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
2023-06-10 18:42:29 +02:00
14788cf0ce
Switch to using a `common` runtime chunk rather than `locales`
2023-06-10 17:43:13 +02:00
c51e8de4ad
Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
2023-06-10 17:18:36 +02:00
b5872b0686
[Glitch] Change design of dropdowns in web UI
...
Port 7abfddd8a5
2023-06-10 17:10:06 +02:00
ee6682e48d
[Glitch] Rewrite `<LoadMore />` as FC and TS
...
Port f9c819e8db
2023-06-10 16:59:25 +02:00
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
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
00307189bc
[Glitch] Fix not shown announcements in hometimeline.
...
Port 94f9888d57
2023-06-10 16:37:20 +02:00
3dd186bbf1
[Glitch] Fix design issues with recent react-intl upgrade
...
Port 4c2503d36c
2023-06-10 16:36:54 +02:00
46b4268007
[Glitch] Add exclusive lists
...
Port 6debddcf89
2023-06-10 16:36:15 +02:00
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
2877b12754
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port 2d2750c6a9
2023-06-10 16:29:48 +02:00
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
333c28ce6d
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port 29851c83bd
2023-06-10 16:18:01 +02:00
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
7ccf99b652
[Glitch] Fix using Date.now() instead of intl.now()
...
Port 4e28b89f51
2023-06-10 15:21:04 +02:00
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
fd0b9c9881
[Glitch] Add a confirmation screen when suspending a domain
...
Port 8ee98cfd2b
2023-06-10 15:10:24 +02:00
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
5715cd6b8a
[Glitch] Fix prev/next buttons color in media viewer
...
Port 40e756f291
2023-06-10 14:48:41 +02:00
8b958c0858
[Glitch] Translate CW, poll options and media descriptions
...
Port 971eafc709
2023-06-10 14:48:41 +02:00
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
b428d82286
[Glitch] Upgrade react-intl
...
Port 76960f128a
2023-06-10 14:37:08 +02:00
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
1dd243cc09
Add time zone preference ( #25342 )
2023-06-10 03:29:37 +02:00
8b5680fd9a
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
2023-06-09 14:03:35 +02:00
975914e0a6
Fix translations for changing theme ( #25340 )
2023-06-08 17:12:41 +02:00
66a5173629
Add `legal` as report category ( #23941 )
2023-06-06 23:41:59 +02:00
7abfddd8a5
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
ef344388c5
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
f9c819e8db
Rewrite `<LoadMore />` as FC and TS ( #25259 )
2023-06-06 11:28:50 +02:00
51046cb4db
Fix autocomplete suggestions being cut off in compose form ( #25275 )
2023-06-06 11:05:25 +02:00
2252e4d8bb
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 10:42:47 +02:00
8f34072fc0
Change follow button in account row to be more obvious in web UI ( #24956 )
2023-06-06 04:14:28 +02:00
14dc8a6a5f
Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )
2023-06-05 20:46:04 +02:00
21f904b344
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
2023-06-05 17:32:24 +02:00
c74040abfa
Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )
2023-06-05 16:52:33 +02:00
94f9888d57
Fix not shown announcements in hometimeline. ( #25251 )
2023-06-05 14:49:51 +02:00
d6feba366b
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 9ba1135000
2023-06-05 13:31:45 +02:00
cd107b054d
[Glitch] Fix `null` signUp URL in various places
...
Port 75ebb60ef6
2023-06-05 13:28:22 +02:00
e7cb0dc83b
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 5c744a5d7d
2023-06-05 13:28:02 +02:00
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
4c2503d36c
Fix design issues with recent react-intl upgrade ( #25272 )
2023-06-05 09:52:36 +02:00
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
a04157e69f
Add `allow_other_host: true` to backups controller ( #25266 )
2023-06-05 08:22:03 +02:00
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
85e0bd73cf
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 62f386d44e
2023-06-04 22:05:45 +02:00
e24a587f84
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
2023-06-02 19:58:18 +02:00
c7a8838bd7
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
2023-06-02 18:35:37 +02:00
1c298d97c5
Change wording of “Content cache retention period” setting to highlight destructive implications ( #23261 )
2023-06-02 18:09:08 +02:00
2d2750c6a9
Fix spacing of middle dots in the detailed status meta section ( #25247 )
2023-06-02 15:40:23 +02:00
29851c83bd
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
2023-06-02 15:00:27 +02:00
a82f036309
Fix overflow behavior of account rows ( #25131 )
2023-06-01 14:47:55 +02:00
572086c8ad
Add support for importing lists ( #25203 )
2023-06-01 14:47:31 +02:00
4e28b89f51
Fix using Date.now() instead of intl.now() ( #25234 )
2023-06-01 13:46:19 +02:00
a6f0456756
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
2023-06-01 09:47:05 +02:00
8ee98cfd2b
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
52b4e33d7f
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
2023-06-01 09:23:28 +02:00
3d550b5712
Fix multiple N+1s in ConversationsController ( #25134 )
2023-06-01 02:41:51 +02:00
40e756f291
Fix prev/next buttons color in media viewer ( #25231 )
2023-06-01 02:25:38 +02:00
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
76960f128a
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
68296cfb32
Remove unused Settings::Extend module ( #25214 )
2023-05-31 23:34:48 +02:00
8bd9ce4d09
Disable some metrics cops ( #25215 )
2023-05-31 23:33:10 +02:00
654f5c9cdc
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
2023-05-31 09:57:24 +02:00
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
75ebb60ef6
Fix `null` signUp URL in various places ( #25190 )
2023-05-30 19:01:42 +02:00
f145662c05
Align argument type to keyword argument for private process method in FetchResourceService ( #25189 )
2023-05-30 09:28:01 +02:00
5c744a5d7d
Handle Surrogate Pairs in truncate() ( #25148 )
2023-05-29 11:55:16 +02:00
615a7d5795
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
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
f58504f2c7
[Glitch] Update inconsistent `defaultMessage`
...
Port 169f141c4c
2023-05-28 17:14:31 +02:00
53b8a15ee9
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
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
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
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
a7e6f3df20
Fix import order with ESLint
...
Port 7b5a274836
2023-05-28 16:38:10 +02:00
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
214f04f04b
[Glitch] Add support for custom sign-up URLs
...
Port 4d631fcfb7
2023-05-28 15:09:28 +02:00
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
006bc485e4
Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
8793625bf3
[Glitch] Use JSX syntax for Fragments
...
Port abbc6dfcba
2023-05-28 14:56:24 +02:00
31c4b3183b
Merge commit 'abbc6dfcbaa105faee402694061c408d37320b75' into glitch-soc/merge-upstream
2023-05-28 14:32:26 +02:00
Claire