mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,529 Commits
69 Branches
20 Tags
358 MiB
Commit Graph

20529 Commits (adde80365638dd65a54a09eb6c7586ced471fe53)

Author SHA1 Message Date
Matt Jankowski b4c332104a
Use top-level `warn` in JS errors check (#28745) 2024-01-15 21:26:11 +00:00
Claire 01df34b9db Remove bypass and use use glitch-soc's theming system for inert.css 2024-01-15 22:16:26 +01:00
Claire 34c9f77b3e Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Used glitch-soc's path for the mailer pack.
 2024-01-15 21:30:00 +01:00
Claire 6e4d5b4736 Fix some icon-related styling issues 2024-01-15 21:05:54 +01:00
Claire 4fcb372776 Fix Ruby linting issue 2024-01-15 20:57:55 +01:00
Claire 278597c161 Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream 2024-01-15 20:53:16 +01:00
Claire a1920425ca [Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons 
Port 6bbcd9348e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-15 20:53:08 +01:00
Claire 2f521bc84a Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 2024-01-15 20:27:41 +01:00
Renaud Chaput 8cad0a4d6b [Glitch] Change icon SVG imports to use a default import 
Port 608f66f978 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-15 20:20:38 +01:00
Claire 464051c2d2 Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 2024-01-15 20:06:31 +01:00
Claire 60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.
 2024-01-15 20:01:36 +01:00
Claire 1323dfac80 Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream 2024-01-15 19:19:04 +01:00
HTeuMeuLeu 7f471e70c0
Update new email templates (#28416) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2024-01-15 18:18:59 +00:00
Claire 98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` (#28735) 2024-01-15 18:04:58 +00:00
Claire e621c1c44c
Fix registrations not checking MX records for email domain blocks requiring approval (#28608) 2024-01-15 17:10:57 +00:00
Matt Jankowski a2f02a0775
Disable `Rails/SkipsModelValidations` cop (#28712) 2024-01-15 13:46:47 +00:00
Claire 82d28ac956
Merge pull request #2567 from ClearlyClaire/glitch-soc/ports/convert-utils-hashtags-typescript 
Convert utils and hashtags to Typescript
 2024-01-15 12:41:22 +01:00
renovate[bot] b5afbe0a61
Update dependency bootsnap to v1.17.1 (#28713) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-15 11:17:25 +00:00
Claire 50188ad211
[Glitch] Use helpers to check environment in frontend (#2571) 
Port 277e6968f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-01-15 12:16:05 +01:00
renovate[bot] 367be82a29
Update libretranslate/libretranslate Docker tag to v1.5.4 (#28727) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-15 11:09:28 +00:00
Claire 8cb4825c8b
Fix sign-up restrictions based on email addresses not being enforced (#28732) 2024-01-15 11:06:48 +00:00
renovate[bot] 8013d6c56d
Update dependency faker to v3.2.3 (#28720) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-15 11:06:28 +00:00
github-actions[bot] 1012ffac9e
New Crowdin Translations (automated) (#28721) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-15 11:06:25 +00:00
Claire e81c5c0a51
Ignore the devise-two-factor advisory as we have rate limits in place (#28733) 2024-01-15 10:45:48 +00:00
Emelia Smith 58830be943
Streaming: Rework websocket server initialisation & authentication code (#28631) 2024-01-15 10:36:30 +00:00
Matt Jankowski e72676e83a
Improve `api/v1/markers#create` performance against simultaneous requests (#28718) 2024-01-15 09:47:25 +00:00
Josh Goldberg ✨ f8941c41a5 [Glitch] Converted hashtag.jsx to TypeScript 
Port 3a7f10c3f1 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 19:22:39 +01:00
Josh Goldberg ✨ 695dcc6ca8 [Glitch] Converted app/javascript/flavours/glitch/utils/ folder to TypeScript 
Port 1142f4c79e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 19:22:39 +01:00
Claire 52c023a305 Convert `Permalink` to Typescript 2024-01-14 19:22:39 +01:00
Claire 16499bc097 Rewrite `Permalink` as functional component 2024-01-14 19:22:39 +01:00
Claire 545c0041a0
Merge pull request #2570 from ClearlyClaire/glitch-soc/ports/onboarding-profile-setup 
Add profile setup to onboarding in web UI
 2024-01-14 19:21:39 +01:00
Claire 0213ae6b37 Extract glitch-soc-only i18n string 2024-01-14 16:32:08 +01:00
Eugen Rochko 6772bf611e [Glitch] Fix wrong color on active icons with counters in web UI 
Port 728eb6a153 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 16:32:08 +01:00
Eugen Rochko cc363629be [Glitch] Fix focus and hover styles in web UI 
Port cfd50f30bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 16:32:08 +01:00
Trevor Wolf 7565a328d0 [Glitch] change column link to add a better keyboard focus indicator 
Port 6308dca76a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 16:32:08 +01:00
Trevor Wolf c1e28c8913 [Glitch] change focus ui for keyboard only input 
Port 59478a1b46 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 16:32:08 +01:00
Eugen Rochko a7bad8f45c [Glitch] Fix profile setup showing default avatar in web UI 
Port 01f0a6ca4f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 16:32:08 +01:00
Eugen Rochko b534532eaf [Glitch] Change to single opt-in during profile setup in onboarding in web UI 
Port 0e9801443f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 16:32:08 +01:00
Eugen Rochko bacb9134cc [Glitch] Add profile setup to onboarding in web UI 
Port d67bd44ca1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 16:32:08 +01:00
Claire 3425b99a9a
Merge pull request #2569 from ClearlyClaire/glitch-soc/ports/column-changes 
Port upstream's column refactor of column and column header code
 2024-01-14 16:31:46 +01:00
Renaud Chaput 2653651bfa [Glitch] Simplify column headers 
Port 13d310e64d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 14:31:49 +01:00
Renaud Chaput ca17c2d35a [Glitch] Use a context to propagate column-related Props, and remove `forceUpdate` usage 
Port 537442853f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-14 14:31:49 +01:00
Claire 04f786abd0
Merge pull request #2568 from ClearlyClaire/glitch-soc/ports/dreaded-icon-change-please-save-me 
Port upstream's icon changes
 2024-01-14 14:31:16 +01:00
Claire e2c7c370dc Fix size of glitch-soc status info icons 2024-01-14 00:09:28 +01:00
Claire e2ba5f6e35 Fix glitch-soc high color privacy icons 2024-01-14 00:04:09 +01:00
Claire e227e959f7 Fix glitch-soc textarea icons 2024-01-13 23:53:23 +01:00
Claire 6333900006 Fix glitch-soc CW media icons 2024-01-13 23:48:37 +01:00
Claire 46128f25b6 Fix glitch-soc status media icons 2024-01-13 23:35:53 +01:00
Santiago Kozak 731f01adb1 [Glitch] Fix reply icon display in picture-in-picture footer 
Port 1cba91d6d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-13 23:19:01 +01:00
Renaud Chaput dd56900fac [Glitch] Fixes dropdown target without a `buttonRef` (edit history) 
Port 7b1d390734 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-13 23:19:01 +01:00