tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,816 Commits 5 Branches 0 Tags
83ea9b94de798a93ca06ea0629e4920e3421c4e5
Commit Graph
2748 Commits
Author SHA1 Message Date
Eugen RochkoandClaire 2c70c28bbb Refactor <DomainBlocks> to TypeScript (#34347) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-02 12:31:39 +00:00
Claire e0406fcf02 Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream 
Conflicts:
- `.eslintrc.js`:
  Upstream moved it to `eslint.config.mjs`.
  Ported the glitch-soc changes there.
- `yarn.lock`:
  Upstream updated dependencies close to glitch-soc-only dependencies.
  Ported upstream's changes.
 2025-04-01 20:59:34 +02:00
EchoandNick Schonning e8270e2807 Upgrade to ESLint v9 flat config (#34324) 
Co-authored-by: Nick Schonning <nschonni@gmail.com>
 2025-04-01 16:30:18 +00:00
Echo 65c553ab59 Fix bugs with upload progress (#34325) 2025-03-31 21:05:09 +00:00
Claire aebb6c8ab7 Merge commit 'b4e56822c72db54ba338940e2517a4e25e2159a6' into glitch-soc/merge-upstream 2025-03-31 17:12:44 +02:00
Eugen Rochko 70e14c1ed0 Fix being unable to hide controls in full screen video in web UI (#34308) 2025-03-31 08:17:57 +00:00
Claire 19346fd5f8 Fix extra space under left-indented vertical videos (#34313) 2025-03-31 08:17:39 +00:00
Claire 8efc381063 Merge commit '04a9252a93fe18aa514957765a35e0abe2596864' into glitch-soc/merge-upstream 2025-03-29 19:19:58 +01:00
Claire 04a9252a93 Fix incorrect locked account warning in composer (#34312) 2025-03-29 18:06:46 +00:00
Claire f8b0f38636 Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream 2025-03-29 17:02:39 +01:00
Claire c06527cf5d Merge commit 'e5fd61a84eb3a919c1e53f688e424df9d0f20924' into glitch-soc/merge-upstream 2025-03-28 20:48:53 +01:00
Echo 902aab1245 Remove react-motion library (#34293) 2025-03-28 12:34:51 +00:00
Eugen Rochko e5fd61a84e Refactor <Video> to TypeScript (#34284) 2025-03-28 12:15:43 +00:00
Claire 166514d252 Merge commit 'aa575341c2da1e84d349ca0b42211b0da30a2254' into glitch-soc/merge-upstream 2025-03-27 19:40:04 +01:00
Claire 9c5c86c947 Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream 2025-03-26 18:18:07 +01:00
scarf e9fe01e2a6 feat: use <time> tag (#34131) 2025-03-26 16:14:08 +00:00
Claire c93b2c6809 Add new filter action to blur media (#34256) 2025-03-26 07:31:05 +00:00
Claire 4ace929129 Merge commit '94d71c992e0fd88fc3a3fc92b598f139c874ab3f' into glitch-soc/merge-upstream 2025-03-25 21:12:37 +01:00
Claire 745c445e7e Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream 2025-03-25 19:59:59 +01:00
Eugen Rochko 94d71c992e Refactor alerts to TypeScript, remove react-notification dependency (#34239) 2025-03-25 18:25:07 +00:00
Claire 2eb6d815d6 Fix bookmarks and favourites not being filtered (#34260) 2025-03-25 15:20:36 +00:00
Claire 8c3eeb4d29 Fix filters not applying in detailed view (#34259) 2025-03-25 13:11:49 +00:00
Claire e7498887a7 Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Upstream removed some code that somehow had been modified in glitch-soc.
  Removed it as upstream did.
 2025-03-24 20:06:25 +01:00
Eugen RochkoandChaosExAnima 2e9b2df570 Add double tap to zoom and swipe to dismiss to media modal in web UI (#34210) 
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-03-24 17:25:30 +00:00
Claire 958953a687 Refactor spoiler button logic into separate SpoilerButton component (#34257) 2025-03-24 13:58:37 +00:00
Claire f1fa6b3cd0 Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream 2025-03-22 15:41:48 +01:00
Eugen Rochko 1960aac90b Fix display of failed-to-load image attachments in web UI (#34217) 2025-03-21 10:23:49 +00:00
Claire 290d57d6d9 Prevent duplicate REST API requests on submitting account personal note with ctrl+enter (#34213) 2025-03-19 23:29:26 +00:00
Claire 6f2979b0b0 Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream 2025-03-18 22:03:50 +01:00
Claire 9d5cbbbf0f Fix account notes not being displayed (#34166) 2025-03-18 10:32:35 +00:00
Claire d2c4f69148 Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream 2025-03-17 20:25:32 +01:00
Claire 30e334b51a Fix language detection sometimes kicking in *after* posting (#34193) 2025-03-17 16:49:09 +00:00
Claire 399fbf97de Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream 2025-03-11 18:44:32 +01:00
Claire 725a68d273 Fix unnecessary rerenders in composer dropdown menu (#34133) 2025-03-11 15:36:31 +00:00
Claire 4bea9a0a66 Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
Claire dbd3e05812 Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream 2025-03-07 17:37:36 +01:00
Claire 2bf5aee469 Fix avatar fallback in media gallery (#34106) 2025-03-07 13:22:05 +00:00
Claire 9d5a9123b9 Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream 2025-03-07 13:15:10 +01:00
Claire b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00
renovate[bot]andRenaud Chaput d2ce9a6064 chore(deps): update eslint (non-major) (#33061) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-03-06 13:55:44 +00:00
Damien Erambert debe6c0545 Add emoji from Twemoji 15.0 to the emoji picker/completion (#33395) 2025-03-05 17:05:15 +00:00
Claire b57687083f Move app/javascript/hooks to app/javascript/mastodon/hooks (#34077) 2025-03-05 16:55:53 +00:00
Eugen Rochko cadda2f957 Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
Claire 26a3081699 Fix preview cards under Content Warnings not being shown in detailed statuses (#34068) 2025-03-05 08:43:31 +00:00
Eugen Rochko 43f616a1c8 Fix infinite scroll not working on profile media tab in web UI (#33860) 2025-03-03 14:16:17 +00:00
Eugen Rochko d399244d4d Fix moved notice on profiles in web UI (#34052) 2025-03-03 08:24:06 +00:00
Eugen Rochko d50110a17a Change alt text reminder to not appear for private mentions in web UI (#33784) 2025-02-28 18:02:58 +00:00
Claire 1cdd91d6f1 Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream 2025-02-27 15:52:20 +01:00
Eugen Rochko ebde60ca82 Refactor <Header> into TypeScript (#33956) 2025-02-25 15:30:46 +00:00
Claire 1dbeac2196 Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream 2025-02-04 18:38:41 +01:00