me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18461 commits 2 branches 0 tags 429 MiB
Commit graph

18461 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 to glitch-soc
 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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:57:19 +02:00
Eugen Rochko
12c177a34e [Glitch] Change "Sign in" to "Login" 
Port d05ff56746 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:52:37 +02:00
Claire
0042d5a246 [Glitch] Fix videos being improperly positioned on safari 
Port de95d0ca8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:47:48 +02:00
Renaud Chaput
e11d884c53 [Glitch] Add stricter ESLint rules for Typescript files 
Port 6a3211876c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:43:19 +02:00
Nick Schonning
dc9dcd0fa9 [Glitch] Enable ESLint react/no-deprecated 
Port b0dd260a7a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 21:07:38 +02:00
Renaud Chaput
afde99dc29 [Glitch] Disable RTK safety middlewares 
Port c9dfc55b22 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 20:57:42 +02:00
fusagiko / takayamaki
a3c2519ba0 [Glitch] Add type annotation for DisplayName component 
Port a150bb4f2e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 20:57:07 +02:00
fusagiko / takayamaki
b3e018ce58 [Glitch] Rename Image component to ServerHeroImage 
Port cbca954632 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 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
fusagiko / takayamaki
a19c1671af Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
たいち ひ
ae0341c203 Fix export style of <LoadGap /> based on <Domain /> (#25128) 2023-05-25 13:03:37 +02:00
Claire
245a4eac89 Improve various queries against account domains (#25126) 2023-05-25 09:27:16 +02:00
Renaud Chaput
169f141c4c Update inconsistent defaultMessage (#25114) 2023-05-24 12:38:50 +02:00
dependabot[bot]
b6c687abc2 Bump eslint from 8.40.0 to 8.41.0 (#25081) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-24 12:38:08 +02:00
Matt Jankowski
f97a429d20 Add CLI Base class for command line code (#25106) 2023-05-24 11:55:40 +02:00
Matt Jankowski
bc1dae0bc4 Fix RSpec/ExpectChange cop (#25101) 2023-05-24 11:23:40 +02:00
Eugen Rochko
97235baa4f Change share action from being in action bar to being in dropdown in web UI (#25105) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-24 11:04:43 +02:00
dependabot[bot]
912d478495 Bump capistrano from 3.17.2 to 3.17.3 (#25113) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-24 10:52:10 +02:00
dependabot[bot]
0ce5706b48 Bump eslint-plugin-jsdoc from 44.2.4 to 44.2.5 (#25112) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-24 10:47:50 +02:00
dependabot[bot]
1ee4865dc5 Bump fastimage from 2.2.6 to 2.2.7 (#25111) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-24 10:46:10 +02:00
Renaud Chaput
432a937a9d Update react-redux (#25110) 2023-05-24 10:23:17 +02:00
Renaud Chaput
9be9f4f5e2 Fix null signUp URL handling from #25014 (#25108) 2023-05-24 09:49:26 +02:00
たいち ひ
6077f3e24c Rewrite <LoadGap /> as FC and TS (#25042) 2023-05-24 09:20:39 +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
Matt Jankowski
9e8323fdb9 Fix Performance/MapCompact cop (#24797) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-23 10:49:12 +02:00
Matt Jankowski
d64a2c7aa8 Fix Performance/StartWith cop (#24818) 2023-05-23 10:16:50 +02:00
たいち ひ
9cfab99590 Rewrite <TimelineHint /> as FC and TS (#25091) 2023-05-23 10:04:10 +02:00
Matt Jankowski
0087959e0b Add specs for admin/announcements CRUD actions (#25077) 2023-05-23 10:03:51 +02:00