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

21018 Commits (a79bd2cd1117512ecc77e97c1d946e7f26fbd439)

Author SHA1 Message Date
Claire a79bd2cd11 Make some CSS differences with upstream more explicit 2024-03-08 11:47:34 +01:00
Claire d09ab957d4 Remove duplicate `captcha_enabled` key in `app/models/form/admin_settings.rb` 2024-03-08 11:38:01 +01:00
Claire e95f2c2b68
Add a glitch-soc local setting to make the post publish toast optional (#2666) 2024-03-08 11:35:18 +01:00
github-actions[bot] d002458c7b
New Crowdin Translations (automated) (#2661) 
* New Crowdin translations

* Fix bogus translations

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-07 22:39:48 +01:00
Claire f407505f75
Merge pull request #2667 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 653ce43abe
 2024-03-07 19:04:33 +01:00
Mashiro 1fc6edfa84 [Glitch] Fix unhandled nullable attachments limitation counter 
Port b8bd94ca8e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-07 13:01:21 +01:00
Claire 442a5cb66c Merge commit '653ce43abe0a928d944a15c433d2c8324f9b5e2a' into glitch-soc/merge-upstream 2024-03-07 12:59:51 +01:00
Claire 3f239facff
Update flavor screenshots (#2664) 2024-03-07 12:59:00 +01:00
Renaud Chaput 653ce43abe
Update `json-jwt` gem to fix CVE-2023-51774 (#29520) 2024-03-07 11:11:14 +00:00
gunchleoc c01f4cebed
Add Mohawk to posting languages (#27115) 2024-03-07 11:04:31 +00:00
gunchleoc 995e15c24a
Add Jawi Malay to posting languages (#29098) 2024-03-07 11:03:41 +00:00
Claire 8c9341a67b
Further reduce pointless CSS differences with upstream (#2665) 2024-03-06 22:13:23 +01:00
Claire a11151d58f
Update our README and include upstream's (#2663) 2024-03-06 22:12:57 +01:00
Mashiro b8bd94ca8e
Fix unhandled nullable attachments limitation counter (#29183) 2024-03-06 12:53:54 +00:00
Claire 8f4cc711c2
Merge pull request #2662 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to f89512fbed
 2024-03-05 20:56:08 +01:00
Claire 45e56db8e4 Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.
 2024-03-05 16:25:50 +01:00
renovate[bot] f89512fbed
Update dependency rack-cors to v2.0.2 [SECURITY] (#29507) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 15:09:52 +01:00
renovate[bot] 7265d47342
Update peter-evans/create-pull-request action to v6.0.1 (#29503) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 09:42:49 +00:00
renovate[bot] 4c138ee4eb
Update DefinitelyTyped types (non-major) (#29502) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 09:42:26 +00:00
renovate[bot] cb0f3ecc28
Update eslint (non-major) (#29505) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 09:41:31 +00:00
renovate[bot] 0f7f257139
Update Yarn to v4.1.1 (#29508) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-05 09:39:12 +00:00
Claire 74998b0636
Merge pull request #2657 from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2024-03-04 16:27:34 +01:00
Claire a7d9c5e374 Fix bogus translations 2024-03-04 11:27:37 +01:00
Claire ee8d0b9447
Fix follow suggestions potentially including silenced or blocked accounts (#29306) 2024-03-04 06:35:20 +00:00
GitHub Actions 1b418a3550 New Crowdin translations 2024-03-04 04:57:12 +00:00
Claire 96c6cafc34
Merge pull request #2660 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 18945f62e0
 2024-03-03 16:11:28 +01:00
renovate[bot] 68600893d2
Update babel monorepo to v7.24.0 (#29434) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-03-02 18:33:33 +00:00
Matt Jankowski 64b8ba36bb
Add `bin/dev` script to launch foreman (#28242) 2024-03-02 18:31:43 +00:00
Dave MacLeod b6b94c971f
Add Interlingue to available_locales (#28630) 2024-03-01 17:51:22 +00:00
gunchleoc 1d5de8b26a
Add Vai to posting languages (#27136) 2024-03-01 17:41:49 +00:00
gunchleoc 5ab944af95
Rename Panjabi to Punjabi (#27117) 2024-03-01 17:40:48 +00:00
Helge 8d22599318
Add Pennsylvania Dutch to languages dropdown (#26634) 2024-03-01 17:36:00 +00:00
Krzysztof Piwowar b4af3639e8
Add Kashubian to languages dropdown (#26024) 2024-03-01 17:35:35 +00:00
Claire 159e500749 Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream 2024-03-01 18:34:48 +01:00
Claire c7fc7d0c2a
Merge pull request #2659 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3389c41b58
 2024-03-01 18:34:00 +01:00
Matt Jankowski 18945f62e0
Convert more API specs from controller->request style (#29004) 2024-03-01 16:24:45 +00:00
Daniel M Brasil a25014de8f
Improve `IpBlock` model test coverage (#29460) 2024-03-01 16:17:40 +00:00
Claire 1d721b21e1
Add attribution to Tabler.io icons used in the new mailer designs (#29470) 2024-03-01 14:51:01 +00:00
HTeuMeuLeu 934cab7508
New welcome email (#28883) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-03-01 12:16:53 +00:00
Claire f01605c665 Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.tsx`:
  Changes applied to `app/javascript/core/admin.ts` instead.
 2024-03-01 13:02:59 +01:00
Matt Jankowski 3389c41b58
Move `nobody` position in `UserRole` magic number to constant (#29465) 2024-03-01 11:05:24 +00:00
Claire ec953bf378
Fix regression in handling `select` elements in `packs/admin.tsx` (#29469) 2024-03-01 10:16:35 +00:00
Matt Jankowski b9940eb977
Disable codecov comments on PRs (#29464) 2024-02-29 23:25:04 +00:00
Claire 71f673b3e6
Merge pull request #2656 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 958a810553
 2024-02-29 20:38:25 +01:00
Claire f6654e0842 Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  This file was split between `app/javascript/core/admin.js`,
  `app/javascript/pack/admin.jsx`, and
  `app/javascript/flavours/glitch/packs/admin.jsx`.
  Ported upstream's change, splitting the new file to
  `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`,
  and `app/javascript/flavours/glitch/packs/admin.tsx`
 2024-02-29 19:02:31 +01:00
Claire a04b384482 [Glitch] Fix regression with search bar icon position 
Port edd6aa70e1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-29 18:30:24 +01:00
Claire bbfcd71118 [Glitch] Fix preview card player getting embedded when clicking on the external link button 
Port f24c62a5c8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-29 18:29:57 +01:00
Renaud Chaput 5b97fdf84c [Glitch] Fix full date display not respecting the locale 12/24h format 
Port 4185f3792c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-29 18:29:11 +01:00
Claire 4d7e7cc562 Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 2024-02-29 18:24:47 +01:00
Claire 8dbdd7571f
Merge pull request #2655 from TheEssem/fix/open-in 
Use upstream's openURL function for search
 2024-02-29 18:23:56 +01:00