~cytrogen/masto-fe

374a1095 — Chike Nwaenie 3 years ago
[Glitch] Change styling of the recommended accounts to allow bio to be more visible

Port e1b4eeb6367e0f4af64ed739ba20c9762dce43f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
0091b28f — Christian Schmidt 3 years ago
[Glitch] Use CSS to trim long card descriptions

Port e713c545b89ec86742161775b834c7f56d4377c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
11b34a90 — Claire 3 years ago
[Glitch] Fix infinite loop in emoji replacement code

Port fbb4de3dbc39e3874a257b37c5c5104e1f887c86 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
0a813d96 — Claire 3 years ago
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)

Port 37886c28da55c0e62cc9dbb24fb14c02b3789d0c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
66bda471 — fusagiko / takayamaki 3 years ago
[Glitch] Allow `==` when null checking

Port c1a7e38d2b9504fe06716a56a1f6193686026c16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
612a1ee6 — Claire 3 years ago
Fix `body_classes` test for glitch-soc
12b935fa — Claire 3 years ago
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
105f8687 — Claire 3 years ago
Fix thread lines in right-to-left locales (#24714)

2a3a110f — Claire 3 years ago
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS (#24711)

faa336e3 — Claire 3 years ago
Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)

8979b709 — Eugen Rochko 3 years ago
Add default post text to onboarding flow in web UI (#24705)

1c61869e — Claire 3 years ago
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed (#24665)

6028d047 — Eugen Rochko 3 years ago
Change logo version in header based on screen size in web UI (#24707)

2b0f1f36 — Eugen Rochko 3 years ago
Remove display name input from sign-up form (#24704)

7cf963ee — Eugen Rochko 3 years ago
Change label from "For you" to "People" on explore screen in web UI (#24706)

a5bc4ea5 — Claire 3 years ago
Fix refering to unused `preview-card` CSS class instead of `status-card` (#24696)

ece38b93 — Matt Jankowski 3 years ago
Remove duplicate react helper method definitions (#24700)

8e514b19 — Nick Schonning 3 years ago
Unignore stuck Dependabot updates (#24670)

d9e95798 — dependabot[bot] 3 years ago
Bump tesseract.js from 2.1.1 to 2.1.5 (#19084)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1d9969fa — Daniel M Brasil 3 years ago
Fix `tootctl accounts create --reattach --force` not working with confirmed accounts (#24680)

Next