monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,944 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

20944 Commits

Author SHA1 Message Date
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
Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
 2024-02-24 14:46:14 +01:00
Claire 3c36e1be68 [Glitch] Fix report reason selector in moderation interface not unselecting rules when changing category 
Port 9ce914cc89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:36:55 +01:00
y.takahashi 3894674200 [Glitch] Fix 'focus the compose textarea' shortcut is not working 
Port 3c315a68af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:35:52 +01:00
Eugen Rochko cce3f3d6da [Glitch] Change onboarding prompt to follow suggestions carousel in web UI 
Port 9cdc60ecc6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:35:08 +01:00
Claire ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
 2024-02-24 14:27:43 +01:00
Yamagishi Kazutoshi b4cca47f5f [Glitch] Remove unused l18n messages 
Port b3075a9993 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:19:26 +01:00
Claire 5b9ddfcfcc Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream 2024-02-24 14:18:16 +01:00
J H 4d6844eb2f [Glitch] Fixed the toggle emoji dropdown bug 
Port 1467f1e1e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:15:59 +01:00
Claire dfd74f0dae Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream 2024-02-24 14:15:49 +01:00
Claire 73de36318e Move `api/v1/timelines/direct` to request spec 2024-02-24 14:10:05 +01:00
Claire 9903e6beab Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/direct_controller_spec.rb`:
  `spec/controllers/api/v1/timelines` has been renamed, but we had an extra
  spec here for a glitch-soc-only endpoint.
  Kept glitch-soc's file unchanged (will port to a request spec later).
 2024-02-24 14:05:26 +01:00
Claire c297d999ba Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream 2024-02-24 14:02:01 +01:00
Claire 47b5105e5d Remove `max_toot_chars` from initial-state 
This is still in `/api/v1/instance` for compatibility with other clients
 2024-02-24 13:58:00 +01:00
Claire 6da69967d0 [Glitch] Change compose form to use server-provided post character limit 
Port 805dba7f8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 13:56:12 +01:00
Claire 20615a516d Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream 2024-02-24 13:53:59 +01:00
Claire 25ac55ecd8
Merge pull request #2644 from ClearlyClaire/glitch-soc/merge-dreaded-upstream-composer-change 
Merge and port upstream's composer change
 2024-02-24 13:46:26 +01:00
Paolo Melchiorre aca691726b
Fix #21492 Add missing WebP hint in avatar/header localizations (#22395) 2024-02-23 22:10:46 +00:00
Claire 6901930c8d Add back confirmation modal for missing media description 2024-02-23 23:04:32 +01:00
Claire 138286147f Fix emoji being inserted in incorrect places 2024-02-23 21:45:48 +01:00
Claire 6eede9d84b Add notification badge feature back 2024-02-23 21:05:34 +01:00
Claire 9ab030bb13 Add thread mode button 2024-02-23 21:05:34 +01:00
Claire e333453343 Use Warning icon for CWs in app settings 2024-02-23 21:05:34 +01:00
Claire e62cd93650 Fix composer offering to edit federation settings for an existing post 2024-02-23 21:05:34 +01:00
Claire 23dc650596 Restore preselect on reply option 2024-02-23 21:05:34 +01:00
Claire 84d05ca221 Reimplement glitchy elephant friend 2024-02-23 21:05:33 +01:00
Claire 3564a15553 Refactor composer dropdowns 2024-02-23 21:05:33 +01:00
Claire 0e77c45624 Add local-only option back as a federation setting dropdown 2024-02-23 21:05:33 +01:00
Claire 47deb680d5 Add Content-Type dropdown back 2024-02-23 21:05:33 +01:00
Claire 118bb5bc81 Add secondary post button back 2024-02-23 21:05:33 +01:00
Claire 61559a42a9 Restore glitch-soc's permalink behavior for reply indicator 2024-02-23 20:57:20 +01:00
Claire 179437ed0e Restore access to glitch-soc app settings 2024-02-23 20:57:20 +01:00
Claire 056f9bf3c2 Add back “spoilers always on” feature 2024-02-23 20:57:18 +01:00
Claire cfa71a4d16
Fix admin account created by `mastodon:setup` not being auto-approved (#29379) 2024-02-23 19:04:57 +00:00
Claire 25ffe0af45
Fix pixel alignment for some composer icons (#29372) 2024-02-23 15:32:13 +00:00
github-actions[bot] bba4118ddd
New Crowdin Translations (automated) (#29369) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-23 15:21:02 +00:00
Matt Jankowski b0064ddda7
Add basic coverage for `MoveService` class (#29301) 2024-02-23 09:59:29 +00:00
renovate[bot] baa23738a8
Update dependency webmock to v3.22.0 (#29313) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-23 09:57:26 +00:00
Claire 380f4fc95c Reimplement sensitive checkbox 2024-02-22 23:49:06 +01:00
Claire 5fd50756b4 Restore glitch-soc's support of custom poll limits 2024-02-22 23:06:12 +01:00
Eugen Rochko 9c10aaa4d5 [Glitch] Change design of compose form in web UI 
Port 6936e5aa69 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-22 23:06:12 +01:00
Matt Jankowski 45f71e3954
Update `@rails/ujs` to version 7.1.3-2 (#29359) 2024-02-22 21:35:14 +00:00
renovate[bot] 82e2370f5f
Update dependency cssnano to v6.0.4 (#29367) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-22 21:34:08 +00:00
Claire 9d8dfeb5fb
Fix processing of `Link` objects in `Image` objects (#29335) 2024-02-22 22:27:24 +01:00
Matt Jankowski a6ed148769
Use heredoc on the `HTML` blocks in verify link spec (#29365) 2024-02-22 21:26:48 +00:00