treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
20,938 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

20938 Commits (c19787f3f4c42c35060705041a64905738acf597)

Author SHA1 Message Date
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
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
renovate[bot] 8fd8b30c24
Update dependency cssnano to v6.0.5 (#29385) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-26 12:41:34 +00:00
Claire 502e3f8c19
Merge pull request #2648 from TheEssem/fix/thread-typo 
Fix "threaded more" typo
 2024-02-26 12:07:02 +01:00
Roni Laukkarinen 1cb74eeec0
Fix search icon position on mobile (#29384) 2024-02-26 00:57:48 +00:00
Roni Laukkarinen bbf6cb66f6
Improve alt text form accessibility with long texts (#27095) 2024-02-26 00:57:13 +00:00
Essem fa2bbbfd9d
Fix "threaded more" typo 2024-02-25 17:10:25 -06:00
Claire 78c92c0a01
Merge pull request #2647 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to cfa71a4d16
 2024-02-24 17:51:00 +01:00
Claire 3ffb81e04f [Glitch] Add end-to-end test for OCR in media uploads 
Port ca8fbda5d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 16:13:13 +01:00
Claire ad0be125f5 [Glitch] Fix pixel alignment for some composer icons 
Port 25ffe0af45 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 15:53:42 +01:00
Claire 2dc244784c Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream 2024-02-24 15:43:15 +01:00
Claire 1ad91dece8 Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes applied to `app/javascript/core/admin.js` instead.
 2024-02-24 15:35:56 +01:00
Claire 7901dc9e24 Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream 
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
 2024-02-24 15:33:36 +01:00
Claire d2cfc6e5e2 Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream 2024-02-24 15:02:28 +01:00
Hinaloe ba67ea3d12 [Glitch] Fix `sensitive` flag not being removed when removing CW in new compose form 
Port c645490d55 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:53:49 +01:00
Eugen Rochko 200e11ae88 [Glitch] Change follow suggestions design in web UI 
Port 63f4ea055a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:53:09 +01:00
Claire 26924a0c7d [Glitch] Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string 
Port 7ee93b7431 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:52:44 +01:00
Nicolas Hoffmann e45f40d203 [Glitch] Fix modal container bounds 
Port 476a043fc5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:49:35 +01:00
Claire 9f0ff2bedf [Glitch] Clean up some unused CSS definitions 
Port 67ec192d7d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:49:03 +01:00