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
4306b15181
Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to adaa7a61e9
2023-05-27 11:28:10 +02:00
Claire
20e8b117e3
fixup! [Glitch] Upgrade to React 18
2023-05-26 18:44:18 +02:00
Claire
ab642ee227
Fix glitch-soc-only tests being broken because of test refactor
2023-05-26 00:10:57 +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
31fe0780bf
Change captcha to be presented even for invited users ( #2227 )
2023-05-25 20:13:18 +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
Renaud Chaput
7b5a274836
Enforce import order with ESLint ( #25096 )
2023-05-23 17:15:17 +02:00
Matt Jankowski
3e747f0863
Fix RSpec/PredicateMatcher cop ( #25102 )
2023-05-23 16:49:11 +02:00
Matt Jankowski
15e143106e
Fix RSpec/ExpectInHook cop ( #25100 )
2023-05-23 16:40:21 +02:00
Matt Jankowski
eada85f715
Move the mastodon/*_cli files to mastodon/cli/* ( #24139 )
2023-05-23 16:08:26 +02:00
Matt Jankowski
1361e4cb7a
Add request spec for backups download ( #25099 )
2023-05-23 15:44:11 +02:00
Claire
4d631fcfb7
Add support for custom sign-up URLs ( #25014 )
2023-05-23 15:17:09 +02:00
Claire
a5b52eb618
Change Identity to not destroy associated User on destroy ( #25098 )
2023-05-23 15:00:36 +02:00
Claire
cbcf32777e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2023-05-23 14:28:21 +02:00
Claire
4e8d882274
Remove dead code in Api::V1::FeaturedTagsController ( #25073 )
2023-05-23 14:27:37 +02:00
Claire
0b4d3bf363
Remove invalid X-Frame-Options: ALLOWALL ( #25070 )
2023-05-23 14:27:17 +02:00
Matt Jankowski
29ca815465
Fix Rails/Exit cop ( #24743 )
2023-05-23 13:26:10 +02:00
Renaud Chaput
abbc6dfcba
Use JSX syntax for Fragments ( #25093 )
2023-05-23 11:47:36 +02:00
Renaud Chaput
3b0c3e94e0
Use the new JSX transform ( #25064 )
2023-05-23 10:52:27 +02:00
Matt Jankowski
adaa7a61e9
Fix RSpec/RepeatedExample cop ( #24849 )
2023-05-23 10:49:23 +02:00
