tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,624 Commits 5 Branches 0 Tags
d19d7a283e2e309e9dc5490d758136537b3be13c
Commit Graph
1983 Commits
Author SHA1 Message Date
Claire f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
Claire 6ae1fcd059 Fix list of follow requests not having a back button (#32797) 2024-11-07 11:45:46 +00:00
Eugen Rochko d6349c0e9a Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
 2024-11-03 20:51:58 +01:00
Renato "Lond" Cerqueira 01e25af2e3 Fix 'unknown' media attachment rendering in detailed view (#32713) 2024-10-31 09:37:31 +00:00
Emelia Smith dc0b1948be Feat: Implement interaction modal for Polls (#32609) 2024-10-28 13:27:37 +00:00
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 2024-10-26 13:38:07 +02:00
renovate[bot]andRenaud Chaput 11a63b2db6 Update eslint (non-major) (#32279) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-10-21 08:03:44 +00:00
Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
 2024-10-19 19:13:32 +02:00
hota 0f37b7d6ac Fix column-settings spacing in local timeline in advanced view (#32567) 2024-10-18 07:40:08 +00:00
Emelia Smith bc2e642272 Fix: Reword 'pick one' to 'single choice' for polls (#32397) 2024-10-16 10:40:40 +00:00
Renaud Chaput 6c87c76e18 Add ability to group follow notifications in WebUI (#32520) 2024-10-16 08:33:11 +00:00
Renaud Chaput 7a7a7cc448 Add back a 6 hours mute duration option (#32522) 2024-10-16 07:27:44 +00:00
Jeong Arm 5afdb81b36 Fix reblog icons on account media view (#32506) 2024-10-15 10:01:21 +00:00
Claire 5e4cc1a39c Fix follow recommendation carrousel scrolling on RTL layouts, for real (#32505) 2024-10-15 09:38:04 +00:00
Claire 4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Claire 7c10b0fb7a Fix follow recommendation carrousel scrolling on RTL layouts (#32462) 2024-10-14 15:25:32 +00:00
Claire a5a3733c97 Fix “Mention” appearing for otherwise filtered posts (#32356) 2024-10-10 11:04:38 +00:00
Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
Christian Schmidt c40ab43dc7 Remove redundant title attribute (#32258) 2024-10-04 16:23:05 +00:00
Claire 7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Eugen Rochko 11a12e56b3 Change media reordering design in the compose form in web UI (#32093) 2024-09-27 15:09:39 +00:00
Eugen Rochko a04433f995 Add ability to view alt text by clicking the ALT badge in web UI (#32058) 2024-09-26 13:26:49 +00:00
Claire 7a62d57427 Add fallback to domain block confirmation modal (#32105) 2024-09-26 12:47:56 +00:00
Eugen Rochko 89df27a06c Change design of media tab on profiles in web UI (#31967) 2024-09-26 12:31:32 +00:00
Eugen Rochko 3426ea2912 Add preview of followers removed in domain block modal in web UI (#32032) 2024-09-25 18:13:36 +00:00
Eugen Rochko 28c4eca0af Change responsive break points on navigation panel in web UI (#32034) 2024-09-25 16:36:19 +00:00
Claire 633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput 3dc4ddc663 Fix search params being dropped when redirected to non-deck path (#31984) 2024-09-25 13:35:37 +00:00
Claire c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
Claire 0a6b75b71e Fix multiple bugs in notification requests and notification policies (#32062) 2024-09-24 15:03:38 +00:00
Claire c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Claire b5bdc69f7b Change mobile breakpoint back to old version and allow main column to shrink (#32033) 2024-09-23 12:53:35 +00:00
Claire 221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
Eugen Rochko e7fd0985c9 Change zoom icon in web UI (#29683) 2024-09-20 09:42:02 +00:00
Renaud Chaput ae03e4ffc6 Update directory page options to use URL params (#31977) 2024-09-19 15:34:08 +00:00
Eugen Rochko ef4d6ab988 Fix browser glitch caused by two overlapping scroll animations in web UI (#31960) 2024-09-19 10:52:46 +00:00
Claire 6de18bb475 Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream 2024-09-17 17:54:00 +02:00
Claire d2f9075078 Increase no-gap-breakpoint by 32px to fix overflow (#31889) 2024-09-17 03:19:42 +00:00
Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
 2024-09-16 21:08:58 +02:00
Claire 6c76a7a907 Fix cancel follow request button sometimes saying “Follow back” (#31934) 2024-09-16 13:20:44 +00:00
Claire c620452fd7 Enable grouped notifications unconditionally (#31929) 2024-09-16 13:12:10 +00:00
Claire c0eda832f3 Convert notification requests actions and reducers to Typescript (#31866) 2024-09-16 09:54:03 +00:00
Claire 83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
 2024-09-12 20:05:08 +02:00
Claire caaa412e6e Merge commit 'f2a92c2d22345568ca7f47ee1d1d70de53eb547d' into glitch-soc/merge-upstream 2024-09-12 17:34:16 +02:00
Claire 90d7a4bac4 Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream 2024-09-12 17:22:06 +02:00
Claire 5f782f9629 Autofocus primary button in modals (#31883) 2024-09-12 13:15:05 +00:00
Eugen Rochko 24ef8255b3 Change design of embed modal in web UI (#31801) 2024-09-12 12:54:16 +00:00
Eugen RochkoandClaire 3d46f47817 Change embedded posts to use web UI (#31766) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 09:41:19 +00:00