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
fb2bf621eb
[Glitch] Use the new JSX transform everywhere
...
Port 3b0c3e94e0
2023-05-28 14:18:43 +02:00
03a3ff1f02
Merge commit '3b0c3e94e0831edcf4298bf9940799a2e94c5583' into glitch-soc/merge-upstream
2023-05-28 13:55:30 +02:00
20e8b117e3
fixup! [Glitch] Upgrade to React 18
2023-05-26 18:44:18 +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
758a0ae1e9
[Glitch] Allow scripts in post embed previews
...
Port 18361ae0c5
2023-05-25 23:52:04 +02:00
569302e5ce
Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream
2023-05-25 23:47:28 +02:00
056dd39631
[Glitch] Upgrade to React 18
...
Port ab029328cf
2023-05-25 23:45:01 +02:00
3413fc7002
Merge commit 'ab029328cf94940dce7ed26d005af3d96a857a59' into glitch-soc/merge-upstream
2023-05-25 23:18:57 +02:00
ee6f9d2c92
Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream
2023-05-25 22:59:30 +02:00
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
b55d56387b
[Glitch] Add polling and automatic redirection to `/start` on email confirmation
...
Port 86961b5b7b
2023-05-25 22:37:14 +02:00
560f605dc2
Merge commit '86961b5b7b459fd778a9b697bbdfbda03512babb' into glitch-soc/merge-upstream
2023-05-25 22:18:55 +02:00
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
6cde4718c0
[Glitch] Fix UI crash in moderation interface when opening the media modal
...
Port 778fd4d29b
2023-05-25 21:57:19 +02:00
12c177a34e
[Glitch] Change "Sign in" to "Login"
...
Port d05ff56746
2023-05-25 21:52:37 +02:00
0042d5a246
[Glitch] Fix videos being improperly positioned on safari
...
Port de95d0ca8f
2023-05-25 21:47:48 +02:00
e11d884c53
[Glitch] Add stricter ESLint rules for Typescript files
...
Port 6a3211876c
2023-05-25 21:43:19 +02:00
dc9dcd0fa9
[Glitch] Enable ESLint react/no-deprecated
...
Port b0dd260a7a
2023-05-25 21:07:38 +02:00
afde99dc29
[Glitch] Disable RTK safety middlewares
...
Port c9dfc55b22
2023-05-25 20:57:42 +02:00
a3c2519ba0
[Glitch] Add type annotation for DisplayName component
...
Port a150bb4f2e
2023-05-25 20:57:07 +02:00
b3e018ce58
[Glitch] Rename Image component to ServerHeroImage
...
Port cbca954632
2023-05-25 20:44:09 +02:00
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
5a99be78e4
Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )
...
Fix regression from #2156
2023-05-25 19:40:33 +02:00
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
56ac8eb6ea
[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )
2023-05-25 19:14:37 +02:00
7b5a274836
Enforce import order with ESLint ( #25096 )
2023-05-23 17:15:17 +02:00
4d631fcfb7
Add support for custom sign-up URLs ( #25014 )
2023-05-23 15:17:09 +02:00
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
abbc6dfcba
Use JSX syntax for Fragments ( #25093 )
2023-05-23 11:47:36 +02:00
3b0c3e94e0
Use the new JSX transform ( #25064 )
2023-05-23 10:52:27 +02:00
9cfab99590
Rewrite `<TimelineHint />` as FC and TS ( #25091 )
2023-05-23 10:04:10 +02:00
0b87919abf
Rewrite `<Skeleton/>` as FC and TS ( #25055 )
2023-05-23 08:58:08 +02:00
18361ae0c5
Allow scripts in post embed previews ( #25071 )
2023-05-22 21:18:21 +02:00
ab029328cf
Upgrade to React 18 ( #24916 )
2023-05-22 15:48:01 +02:00
26cdb19dc6
Remove duplicate JPG type ( #25054 )
2023-05-22 12:46:20 +02:00
c4f2b1e86a
Fix minor typos in comments and spec names ( #21831 )
2023-05-19 17:13:29 +02:00
0206081e40
Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )
2023-05-17 23:24:27 +02:00
844d8e101e
Add hCaptcha support ( #25019 )
2023-05-16 23:27:35 +02:00
86961b5b7b
Add polling and automatic redirection to `/start` on email confirmation ( #25013 )
2023-05-16 18:03:52 +02:00
d2eef78d1c
Fix being unable to load past a full page of filtered posts in Home timeline ( #24930 )
2023-05-16 15:36:25 +02:00
74ff0cd2d5
Change composer highlight border size to be more noticeable ( #25010 )
2023-05-16 14:59:44 +02:00
da2d3cc795
Fix spelling of "Lets" on the onboarding page after clicking the confirmation email ( #24959 )
...
Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-15 22:42:07 +02:00
778fd4d29b
Fix UI crash in moderation interface when opening the media modal ( #24816 )
2023-05-11 12:41:55 +02:00
Claire