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.
1 year ago
9e5278ea7b
[Glitch] Add support for custom sign-up URLs
...
Port ca66e61b93
1 year ago
8f380a33fc
[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe
...
Port 100840c06e
1 year ago
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
1 year ago
a0bc0619ca
[Glitch] Use JSX syntax for Fragments
...
Port 5a16bd7bf4
1 year ago
8278907ff7
Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream
1 year ago
6001f5ff36
[Glitch] Use the new JSX transform everywhere
...
Port 8f66126b10
1 year ago
9381f78166
Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream
1 year ago
0222df6047
Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to e387175fc9
1 year ago
1347ca6eb0
fixup! [Glitch] Upgrade to React 18
1 year ago
61f6cd45e3
Fix glitch-soc-only tests being broken because of test refactor
1 year ago
60c7e559d8
[Glitch] Rewrite `<TimelineHint />` as FC and TS
...
Port 9a472efe7c
1 year ago
6746e5d430
[Glitch] Rewrite `<Skeleton/>` as FC and TS
...
Port 8066118d1f
1 year ago
892b3c16f5
[Glitch] Allow scripts in post embed previews
...
Port 711a037660
1 year ago
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
1 year ago
3b375ee395
[Glitch] Upgrade to React 18
...
Port 8d6aea3326
1 year ago
45d7358100
Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream
1 year ago
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
1 year ago
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.
1 year ago
ba73f0ea3a
[Glitch] Add polling and automatic redirection to `/start` on email confirmation
...
Port e60414792d
1 year ago
f959f6cdbb
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
1 year ago
b0ec3bfcf9
[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline
...
Port 7b54e47d03
1 year ago
4a1f4cb6a2
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 5241f7b2fd
1 year ago
d728222121
[Glitch] Change "Sign in" to "Login"
...
Port 3869e8c210
1 year ago
602ae7f2f6
[Glitch] Fix videos being improperly positioned on safari
...
Port 0eed06073f
1 year ago
e6a7cfd12e
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 5eeb40bdbe
1 year ago
e8fc445e14
[Glitch] Enable ESLint react/no-deprecated
...
Port b878e3d8df
1 year ago
79c43b61a6
[Glitch] Disable RTK safety middlewares
...
Port 6f8db56a01
1 year ago
7d9b7f28b8
[Glitch] Add type annotation for DisplayName component
...
Port 349cae0b57
1 year ago
ea1f9b4223
[Glitch] Rename Image component to ServerHeroImage
...
Port ab7716cff4
1 year ago
b735954971
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' 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.
1 year ago
646cde71d1
Change captcha to be presented even for invited users ( #2227 )
1 year ago
69903b5830
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
1 year ago
cb6f445b90
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.
1 year ago
2f2f74efd8
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
1 year ago
d27216dc46
Enforce import order with ESLint ( #25096 )
2 years ago
b896b16cb3
Fix RSpec/PredicateMatcher cop ( #25102 )
2 years ago
778e4a7bf7
Fix RSpec/ExpectInHook cop ( #25100 )
2 years ago
b6b4ea4ca5
Move the mastodon/*_cli files to mastodon/cli/* ( #24139 )
2 years ago
c9f980b268
Add request spec for backups download ( #25099 )
2 years ago
ca66e61b93
Add support for custom sign-up URLs ( #25014 )
2 years ago
dfa5889fc0
Change Identity to not destroy associated User on destroy ( #25098 )
2 years ago
100840c06e
Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )
2 years ago
9017df7178
Remove dead code in Api::V1::FeaturedTagsController ( #25073 )
2 years ago
fea0830614
Remove invalid X-Frame-Options: ALLOWALL ( #25070 )
2 years ago
541f64b2bb
Fix Rails/Exit cop ( #24743 )
2 years ago
5a16bd7bf4
Use JSX syntax for Fragments ( #25093 )
2 years ago
8f66126b10
Use the new JSX transform ( #25064 )
2 years ago
e387175fc9
Fix RSpec/RepeatedExample cop ( #24849 )
2 years ago
9f5deb310b
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
たいち ひ
Renaud Chaput
Christian Schmidt
Eugen Rochko
Nick Schonning
fusagiko / takayamaki
Matt Jankowski