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

20955 Commits (9242c536d28446c52109c9bd842f61ed0d4bf470)

Author SHA1 Message Date
Essem 9242c536d2
Use openURL function from upstream 2024-02-28 23:41:18 -06:00
Claire 0d55610f96
Merge pull request #2653 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7f84bbfd92
 2024-02-28 21:15:34 +01:00
Jeong Arm 4004801ee8 [Glitch] Show comments in the admin/instances page 
Port deffb8ecb6 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-28 20:38:17 +01:00
Roni Laukkarinen c844817c78 [Glitch] Fix the regression with the search icon position 
Port edfc53856f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-28 20:37:48 +01:00
Claire ccdf56085d Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream 2024-02-28 20:37:38 +01:00
renovate[bot] 9324fbe984 [Glitch] Update devDependencies (non-major) 
Port dc4427dc9b to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-28 20:30:58 +01:00
Claire 21e7a53ca5 Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one
  were changed, but otherwise no real conflict.
  Ported upstream's changes and kept glitch-soc's `i18n:extract`.
- `tsconfig.json`:
  Upstream's dependencies changed the code style rules for json formatting, and
  we had local changes.
  Kept our changes, but with upstream's formatting/
- `yarn.lock`:
  A dependency textually adjacent to a glitch-soc-only one got changed.
  Applied upstream's change, keeping the glitch-soc-only dependency.
 2024-02-28 20:27:28 +01:00
Renaud Chaput 0ff9800989 [Glitch] Use modern ES syntax rather than `.call` 
Port 899eac1a92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-28 20:11:26 +01:00
Claire c2f0ea415e Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.
 2024-02-28 20:10:01 +01:00
github-actions[bot] 7f84bbfd92
New Crowdin Translations (automated) (#29430) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-28 12:14:42 +00:00
Jeong Arm deffb8ecb6
Show comments in the admin/instances page (#29240) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-28 12:07:06 +00:00
Roni Laukkarinen edfc53856f
Fix the regression with the search icon position (#29417) 2024-02-28 12:01:18 +00:00
Claire c19787f3f4
Add doodle feature back (#2652) 2024-02-27 21:27:51 +01:00
Claire a25c900a08
Merge pull request #2650 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 6f7615ba86
 2024-02-27 20:36:13 +01:00
Claire e8155319c7 Take advantage of upstream's refactor and reduce code duplication 2024-02-27 19:28:13 +01:00
Claire 916d78373d [Glitch] Change behavior of privacy dropdown to only change value on validation 
Port 90573c3abb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-27 19:24:34 +01:00
Evan Paterakis 1b219e709b [Glitch] Fix filters title and keywords overflow 
Port 213c87ae59 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-27 19:24:03 +01:00
Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Not a real conflict, upstream fixed a bug in a line adjacent to code
  modified by glitch-soc.
  Ported upstream's change.
 2024-02-27 19:20:57 +01:00
Matt Jankowski 8f3c91fc3c
Add `change` block expectation to `admin/invites#deactivate_all` spec (#29412) 2024-02-27 16:25:58 +00:00
Matt Jankowski ea8e7f3e9d
Align `TagServersMeasure` query style with other classes (#29414) 2024-02-27 16:25:12 +00:00
Renaud Chaput 3b31447408
Rework Prettier invocation (#28851) 2024-02-27 16:09:27 +00:00
renovate[bot] dc4427dc9b
Update devDependencies (non-major) (#29089) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-02-27 16:07:43 +00:00
Renaud Chaput 899eac1a92
Use modern ES syntax rather than `.call` (#29368) 2024-02-27 15:42:05 +00:00
Claire 6f7615ba86
Add basic end-to-end test for admin moderation interface (#29424) 2024-02-27 15:18:06 +00:00
Renaud Chaput 036f5a05e3
Convert the streaming server to ESM (#29389) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-27 14:59:20 +00:00
github-actions[bot] bc4c5ed918
New Crowdin Translations (automated) (#29423) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-27 14:53:53 +00:00
Matt Jankowski 76d256138e
Wrap media attachment size calculation in `COALESCE` (#29415) 2024-02-27 11:52:37 +00:00
Matt Jankowski 9e78129e6e
Use "cacheable response" shared example in more places (#29419) 2024-02-27 11:50:21 +00:00
renovate[bot] 54e3a82f1d
Update dependency thor to v1.3.1 (#29421) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-27 11:48:42 +00:00
Claire 90573c3abb
Change behavior of privacy dropdown to only change value on validation (#29406) 2024-02-27 11:41:19 +00:00
Matt Jankowski 9fa7338b6e
Use `github` reporter on `haml-lint` runs on CI (#29375) 2024-02-27 10:48:38 +00:00
Evan Paterakis 213c87ae59
Fix filters title and keywords overflow (#29396) 2024-02-27 10:46:58 +00:00
zunda a30cdfd4d4
Specify 410 for code when responding as json while self-destruction (#29420) 2024-02-26 22:43:07 +00:00
Claire e1cb7c9b23
Merge pull request #2649 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8156113d58
 2024-02-26 20:23:28 +01:00
Matt Jankowski 8a80ad7fc4 [Glitch] Remove unused `media-spoiler-*` JS/CSS 
Port c7555271a6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-26 17:54:58 +01:00
Roni Laukkarinen 20bc633b0c [Glitch] Change new explore compass icon CSS class to explore 
Port 10fdd88288 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-26 17:54:58 +01:00
Roni Laukkarinen 3fc4859279 [Glitch] Fix search icon position on mobile 
Port 1cb74eeec0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-26 17:54:58 +01:00
Roni Laukkarinen 658911c268 [Glitch] Improve alt text form accessibility with long texts 
Port bbf6cb66f6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-26 17:54:58 +01:00
Eugen Rochko f6903d9ab0 [Glitch] Change explore icon from hashtag to compass in web UI 
Port b8b2f20b16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-26 17:54:58 +01:00
Claire 67ca8bb56a Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Change applied to `app/javascript/core/admin.js` instead.
 2024-02-26 17:43:16 +01:00
Matt Jankowski 8156113d58
Use `response_vary_headers` method in requests/cache_spec (#29411) 2024-02-26 16:27:07 +00:00
Damien Mathieu 1540f42522
Better tests for auth/registrations#update (#29303) 2024-02-26 16:09:56 +00:00
Wolfgang Fournès d51c3ac087
Add a missing spec to `SessionsController#webauthn_options` (#29277) 2024-02-26 16:09:40 +00:00
Matt Jankowski c7555271a6
Remove unused `media-spoiler-*` JS/CSS (#29407) 2024-02-26 15:30:58 +00:00
Roni Laukkarinen 10fdd88288
Change new explore compass icon CSS class to explore (#29395) 2024-02-26 15:28:38 +00:00
Matt Jankowski 8429d07454
Add `RankedTrend` concern for trends classes (#29388) 2024-02-26 13:45:39 +00:00
github-actions[bot] 98e3dc2578
New Crowdin Translations (automated) (#29382) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-26 13:03:06 +00:00
renovate[bot] b829d261ba
Update DefinitelyTyped types (non-major) (#29404) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-26 12:52:03 +00:00
renovate[bot] e57d321097
Update dependency httplog to v1.6.3 (#29399) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-26 12:51:37 +00:00
Jason Punyon 1ad3cffaea
Missed a .to_date (#29390) 2024-02-26 12:42:09 +00:00