cec7f0ed72
Remove unused `#error_explanation` id from error partials ( #27536 )
2023-10-25 07:12:32 +00:00
cb92cdf9af
Fix `<ColumnBackButtonSlim>` ( #27540 )
2023-10-24 20:43:55 +00:00
f08ca3f042
Fix missing icon props ( #27539 )
2023-10-24 20:43:06 +00:00
bc3afb6311
Update `rails/ujs` delegate method usage ( #27538 )
2023-10-24 20:38:19 +00:00
b19d4eb43d
Fix HAML linting issues
2023-10-24 20:53:58 +02:00
8123e86623
[Glitch] Fix double scroll bars in some columns in advanced interface
...
Port 37bbd3c106
2023-10-24 20:46:11 +02:00
b73e4b59fc
[Glitch] Fix history handling not properly handling states after update to react-router v5
...
Port 15182d1e5e
2023-10-24 20:34:30 +02:00
c6f990997d
[Glitch] Rewrite `emoji_unicode_mapping_light` to TS
...
Port 9482810703
2023-10-24 20:33:55 +02:00
4ef66d6538
Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
glitch-soc had extra ignores.
Removed them.
2023-10-24 20:31:20 +02:00
8a131fb7bc
Fix `@rails/ujs` imports
2023-10-24 20:23:31 +02:00
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
134de736dc
Change icons in web UI ( #27385 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-10-24 17:45:08 +00:00
e25cc4deb7
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
2023-10-24 19:31:14 +02:00
69ea596e55
[Glitch] Fix explore page reloading when you navigate back to it in web UI
...
Port d9503a1965
2023-10-24 19:22:39 +02:00
e6c3d3c744
Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream
2023-10-24 19:21:01 +02:00
57c0de949b
Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream changed how asset host CSP directives are used, and glitch-soc has
a pretty different CSP file.
It may be worth reconsidering the differences between upstream and glitch-soc
but for now, just port the change.
2023-10-24 19:17:20 +02:00
787d5ad386
Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Caused by a glitch-soc-only dependency (`exif-js`).
Kept it.
2023-10-24 19:05:18 +02:00
5323f0eeca
[Glitch] Fix incorrect proptypes from react-router-v5 update
...
Port 0ad66175bf
2023-10-24 19:03:16 +02:00
9325cb5759
[Glitch] Convert `<Button>` to Typescript
...
Port 9d45a444f9
2023-10-24 19:03:16 +02:00
1138d44c7d
[Glitch] Fix missing background behind dismissable banner in web UI
...
Port 33bd8eccd5
2023-10-24 18:46:08 +02:00
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
2023-10-24 18:41:20 +02:00
15182d1e5e
Fix history handling not properly handling states after update to react-router v5 ( #27526 )
2023-10-24 13:24:57 +00:00
714e3ae5b5
Use Rails 7.1 `normalizes` feature ( #27521 )
2023-10-24 10:06:10 +00:00
50b7ea810e
New Crowdin Translations (automated) ( #27523 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-24 09:51:34 +00:00
e923bb9ec9
Use `ENV.fetch` in views, fixes rubocop haml-lint issue ( #27527 )
2023-10-24 09:30:14 +00:00
9482810703
Rewrite `emoji_unicode_mapping_light` to TS ( #25444 )
...
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
2023-10-24 08:06:14 +00:00
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background ( #26439 )
2023-10-23 15:46:21 +00:00
d9503a1965
Fix explore page reloading when you navigate back to it in web UI ( #27489 )
2023-10-23 17:07:13 +02:00
8b770ce811
Add warnings to report action logs ( #27425 )
2023-10-23 14:30:46 +02:00
99f2534cee
Add support for displaying unknown servers on /admin/instances/:domain ( #27150 )
2023-10-23 14:27:57 +02:00
bcae744275
Fix some link anchors being recognized as hashtags ( #27271 )
2023-10-23 14:19:38 +02:00
0ad66175bf
Fix incorrect proptypes from react-router-v5 update ( #27507 )
2023-10-23 11:39:53 +02:00
70fd819935
New Crowdin Translations (automated) ( #27490 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-23 10:04:54 +02:00
b0213472df
Validate allowed schemes on preview card URLs ( #27485 )
2023-10-23 09:50:02 +02:00
9d45a444f9
Convert `<Button>` to Typescript ( #27492 )
2023-10-23 09:43:00 +02:00
d6eacb79c6
[Glitch] Upgrade to react-router v5
...
Port 1b70d7ed7c
2023-10-21 22:14:24 +02:00
245513d630
Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream
2023-10-21 14:33:33 +02:00
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
2023-10-20 15:32:16 +02:00
13688539bc
Fix processing LDSigned activities from actors with unknown public keys ( #27474 )
2023-10-20 10:45:46 +02:00
284c719f64
New Crowdin Translations (automated) ( #27480 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-20 10:11:40 +02:00
33bd8eccd5
Fix missing background behind dismissable banner in web UI ( #27479 )
2023-10-20 04:08:13 +02:00
5d9df170cf
[Glitch] Do not display the navigation banner in the logo container
...
Port 126cd7705d
2023-10-19 20:50:44 +02:00
cc000c8859
Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream
2023-10-19 20:48:22 +02:00
1a3248dc90
[Glitch] Consider shown and pending status in explore prompt calculation
...
Port f76e5111f0
2023-10-19 20:23:08 +02:00
41f58e945c
[Glitch] The `class` props should be `className`
...
Port 10df97c542
2023-10-19 20:23:08 +02:00
1b70d7ed7c
Upgrade to react-router v5 ( #25047 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-19 19:44:55 +02:00
126cd7705d
Do not display the navigation banner in the logo container ( #27476 )
2023-10-19 19:36:08 +02:00
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
68401fc426
[Glitch] Support "in:public" search filter
...
Port ad44d832b8
2023-10-19 18:56:18 +02:00
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
2023-10-19 17:25:54 +02:00
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
2023-10-19 16:55:06 +02:00
1ffd5a98a9
New Crowdin Translations (automated) ( #27465 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-19 14:31:25 +02:00
f76e5111f0
Consider shown and pending status in explore prompt calculation ( #27466 )
...
Co-authored-by: Brian Campbell <brcampbell@beta.team>
2023-10-19 14:25:57 +02:00
10df97c542
The `class` props should be `className` ( #27462 )
2023-10-19 13:22:44 +02:00
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
2023-10-18 14:10:07 +02:00
4612576c68
New Crowdin Translations (automated) ( #27454 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-18 11:08:10 +02:00
63a2a4b074
Fix `Performance/DeletePrefix` cop ( #27448 )
2023-10-18 10:32:09 +02:00
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
8bbbd012d4
[Glitch] Fix missing redirections to make sure /home redirect to the advanced UI
...
Port 935d54124e
2023-10-17 21:48:36 +02:00
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
2023-10-17 21:35:07 +02:00
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
2023-10-17 20:59:18 +02:00
ad44d832b8
Support "in:public" search filter ( #26976 )
2023-10-17 16:12:03 +02:00
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
2023-10-17 14:59:07 +02:00
19900f647e
Add coverage for `UnreservedUsernameValidator` ( #25590 )
2023-10-17 13:05:28 +02:00
33b073f77d
Extract partials from `admin/reports/show` view ( #27427 )
2023-10-16 18:07:17 +02:00
8d0f12f776
Extract partials from `admin/accounts/show` view ( #27428 )
2023-10-16 18:02:15 +02:00
08a376cbcb
Fix `Style/CombinableLoops` cop ( #27429 )
2023-10-16 16:36:28 +02:00
c91c0175db
Extract `card` partial from `disputes/strikes/show` view ( #27426 )
2023-10-16 16:04:29 +02:00
f5bc1f20e2
Add coverage for `ExistingUsernameValidator` ( #25592 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-16 15:41:23 +02:00
299aa71c8f
Fix handling of `inLanguage` attribute in preview card processing ( #27423 )
2023-10-16 15:24:14 +02:00
13456efd7b
New Crowdin Translations (automated) ( #27410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-16 11:31:52 +02:00
45bdd60f3c
Fix when unfollow a tag, my post also disappears from the home timeline ( #27391 )
2023-10-13 11:15:47 +02:00
773d25e8df
New Crowdin Translations (automated) ( #27388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-13 11:01:40 +02:00
c86ad45660
Change PWA start URL from `/home` to `/` ( #27377 )
2023-10-12 16:47:18 +02:00
c348b904a5
New Crowdin Translations (automated) ( #27376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-12 10:07:40 +02:00
d4c2dca874
Fix haml-lint `InstanceVariables` rule for auth/sessions/two_factor/o… ( #27372 )
2023-10-12 09:44:20 +02:00
d7a8f6b658
Fix haml-lint `InstanceVariables` rule for relationships/account ( #27342 )
2023-10-11 17:06:26 +02:00
f1ae72ba46
New Crowdin Translations (automated) ( #27364 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-11 16:37:01 +02:00
f9abe700e7
Fix haml-lint `InstanceVariables` rule for auth/registrations/status ( #27341 )
2023-10-11 16:20:26 +02:00
66becf9a1e
Fix haml-lint `InstanceVariables` rule for admin/reports/actions ( #27339 )
2023-10-11 15:58:33 +02:00
7d2cd7195b
Add variable delay before link verification of remote account links ( #27351 )
2023-10-11 15:14:18 +02:00
99c72830bc
[Glitch] Fix scroll position in thread view reseting when closing a modal
...
Port 9d1c3d0678
2023-10-10 19:53:59 +02:00
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
2023-10-10 19:53:41 +02:00
27e84c0691
Fix duplicate reports being sent when reporting some remote posts ( #27355 )
2023-10-10 16:00:50 +02:00
9d1c3d0678
Fix scroll position in thread view reseting when closing a modal ( #27350 )
2023-10-10 11:35:32 +02:00
1a2a4c389f
New Crowdin Translations (automated) ( #27347 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-10 10:06:37 +02:00
05159d2f94
[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread
...
Port 4c2aca777f
2023-10-09 21:15:59 +02:00
8ef1a95b1c
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
2023-10-09 21:14:57 +02:00
7b325aa81b
[Glitch] Autofix missing comma and indentation in JS files
...
Port 774e1189d2
2023-10-09 21:14:25 +02:00
4a9cdfb928
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
2023-10-09 21:12:28 +02:00
b63d526590
[Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread
...
Port c310374a2f
2023-10-09 21:11:44 +02:00
3da7afdeed
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
2023-10-09 21:10:47 +02:00
4c2aca777f
Fix clicking on already-loaded thread scrolling to the top of the thread ( #27338 )
2023-10-09 16:46:09 +02:00
774e1189d2
Change `eslint` config to autofix missing comma and indentation in JS files ( #26711 )
2023-10-09 13:38:29 +02:00
c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread ( #27331 )
2023-10-09 12:21:02 +02:00
89b48681cf
New Crowdin Translations (automated) ( #27321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-09 10:32:06 +02:00
967bd543bb
[Glitch] Fix auto-loading-more when not scrolled
...
Port 2b98e2ecd6
2023-10-08 17:34:10 +02:00
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02:00
Matt Jankowski