tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,048 Commits 10 Branches 0 Tags
8278907ff7658b778a76ca56e90c5bf6809db16c
Commit Graph

18048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
8278907ff7 Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream 2023-05-28 14:32:26 +02:00
Claire
6001f5ff36 [Glitch] Use the new JSX transform everywhere 
Port 8f66126b10 to glitch-soc
 2023-05-28 14:18:43 +02:00
Claire
9381f78166 Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream 2023-05-28 13:55:30 +02:00
Claire
0222df6047 Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to e387175fc9
 2023-05-27 11:28:10 +02:00
Claire
1347ca6eb0 fixup! [Glitch] Upgrade to React 18 2023-05-26 18:44:18 +02:00
Claire
61f6cd45e3 Fix glitch-soc-only tests being broken because of test refactor 2023-05-26 00:10:57 +02:00
たいち ひ
60c7e559d8 [Glitch] Rewrite <TimelineHint /> as FC and TS 
Port 9a472efe7c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 23:58:54 +02:00
たいち ひ
6746e5d430 [Glitch] Rewrite <Skeleton/> as FC and TS 
Port 8066118d1f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 23:55:36 +02:00
Claire
892b3c16f5 [Glitch] Allow scripts in post embed previews 
Port 711a037660 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 23:52:04 +02:00
Claire
e2ab9d4dad Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream 2023-05-25 23:47:28 +02:00
Renaud Chaput
3b375ee395 [Glitch] Upgrade to React 18 
Port 8d6aea3326 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 23:45:01 +02:00
Claire
45d7358100 Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream 2023-05-25 23:18:57 +02:00
Claire
2e02d03524 Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream 2023-05-25 22:59:30 +02:00
Claire
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.
 2023-05-25 22:49:18 +02:00
Claire
ba73f0ea3a [Glitch] Add polling and automatic redirection to /start on email confirmation 
Port e60414792d to glitch-soc
 2023-05-25 22:37:14 +02:00
Claire
f959f6cdbb Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream 2023-05-25 22:18:55 +02:00
Claire
b0ec3bfcf9 [Glitch] Fix being unable to load past a full page of filtered posts in Home timeline 
Port 7b54e47d03 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 22:00:07 +02:00
Christian Schmidt
4a1f4cb6a2 [Glitch] Fix UI crash in moderation interface when opening the media modal 
Port 5241f7b2fd to glitch-soc

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

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

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

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

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-25 20:44:09 +02:00
Claire
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.
 2023-05-25 20:43:25 +02:00
Claire
646cde71d1 Change captcha to be presented even for invited users (#2227) 2023-05-25 20:13:18 +02:00
Claire
69903b5830 Fix margins around small avatars (reply indicators, autocompletion suggestion) (#2231) 
Fix regression from #2156
 2023-05-25 19:40:33 +02:00
Claire
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.
 2023-05-25 19:14:51 +02:00
Claire
2f2f74efd8 [Glitch] Update style of captcha confirmation page to match sign-up form (#2226) 2023-05-25 19:14:37 +02:00
Renaud Chaput
5a16bd7bf4 Use JSX syntax for Fragments (#25093) 2023-05-23 11:47:36 +02:00
Renaud Chaput
8f66126b10 Use the new JSX transform (#25064) 2023-05-23 10:52:27 +02:00
Matt Jankowski
e387175fc9 Fix RSpec/RepeatedExample cop (#24849) 2023-05-23 10:49:23 +02:00
Matt Jankowski
9f5deb310b Fix Performance/MapCompact cop (#24797) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-23 10:49:12 +02:00
Matt Jankowski
0664704cd9 Fix Performance/StartWith cop (#24818) 2023-05-23 10:16:50 +02:00
たいち ひ
9a472efe7c Rewrite <TimelineHint /> as FC and TS (#25091) 2023-05-23 10:04:10 +02:00
Matt Jankowski
2877c80dbc Add specs for admin/announcements CRUD actions (#25077) 2023-05-23 10:03:51 +02:00
dependabot[bot]
753e6df04a Bump rubocop from 1.50.2 to 1.51.0 (#24995) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:52:54 +02:00
dependabot[bot]
5b332112fc Bump stylelint from 15.6.1 to 15.6.2 (#25078) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:47:59 +02:00
dependabot[bot]
c37ecbcd10 Bump aws-sdk-s3 from 1.121.0 to 1.122.0 (#24923) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:44:47 +02:00
dependabot[bot]
c2cbe90a89 Bump rimraf from 5.0.0 to 5.0.1 (#25082) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:44:14 +02:00
dependabot[bot]
9e59186f78 Bump glob from 10.2.2 to 10.2.6 (#25083) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:34:31 +02:00
dependabot[bot]
c7cbded282 Bump webpack-merge from 5.8.0 to 5.9.0 (#25084) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:27:55 +02:00
dependabot[bot]
d7fd2c5763 Bump rqrcode from 2.1.2 to 2.2.0 (#25086) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:25:43 +02:00
dependabot[bot]
4ea24537cf Bump rubocop-performance from 1.17.1 to 1.18.0 (#25089) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:25:32 +02:00
dependabot[bot]
7cfa6424f1 Bump @typescript-eslint/eslint-plugin from 5.59.6 to 5.59.7 (#25085) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:25:20 +02:00
dependabot[bot]
16d3e76a71 Bump @typescript-eslint/parser from 5.59.6 to 5.59.7 (#25080) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:15:43 +02:00
dependabot[bot]
9628d949ef Bump connection_pool from 2.4.0 to 2.4.1 (#25088) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:07:01 +02:00
dependabot[bot]
a5fa30a2d2 Bump rspec-rails from 6.0.1 to 6.0.2 (#25092) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-05-23 09:06:43 +02:00
Daniel M Brasil
b473df9a14 Improve test coverage for /api/v1/featured_tags (#25076) 2023-05-23 09:01:11 +02:00