Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 16:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,941 Commits 74 Branches 58 Tags
0ff98009899a60b5fb0aaee35f6f78241b51e5a6
Commit Graph

7218 Commits

Author SHA1 Message Date
Claire
3f89cec3c9 Further reduce differences with upstream 2024-02-08 19:52:03 +01:00
Claire
f6f62002c7 Remove leftovers from glitch-soc's layout option 2024-02-08 19:21:35 +01:00
Claire
189b70cd6a Merge SCSS in a single components.scss file 2024-02-08 18:50:38 +01:00
Claire
67ec192d7d Clean up some unused CSS definitions (#29146) 2024-02-08 11:40:22 +00:00
github-actions[bot]
2a362d62a8 New Crowdin Translations (automated) (#29145) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-08 09:43:02 +00:00
github-actions[bot]
17052714a2 New Crowdin Translations (automated) (#29121) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-07 12:38:37 +00:00
github-actions[bot]
a2611d782c New Crowdin Translations (automated) (#2588) 
* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-06 20:45:07 +01:00
JS Moore
541cbdd963 Add env variable support for number of followable hashtags in feed column (#2500) 
* Add env variable support for number of followable hashtags in feed column.

* Add a note about performance concerns for higher values.

See discussion in https://github.com/glitch-soc/mastodon/pull/2500

* Update .devcontainer/docker-compose.yml

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-06 20:23:36 +01:00
Essem
08e511cecb Fix doodle modal icons (#2597) 2024-02-06 20:22:42 +01:00
github-actions[bot]
90ccf7beb2 New Crowdin Translations (automated) (#28965) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-02-06 18:47:44 +00:00
Claire
7ee93b7431 Change source attribute of Suggestion entity in /api/v2/suggestions back to a string (#29108) 2024-02-06 17:10:17 +00:00
Claire
9ce914cc89 Fix report reason selector in moderation interface not unselecting rules when changing category (#29026) 2024-02-06 09:35:36 +00:00
y.takahashi
3c315a68af Fix 'focus the compose textarea' shortcut is not working (#29059) 2024-02-02 06:33:53 +00:00
Eugen Rochko
9cdc60ecc6 Change onboarding prompt to follow suggestions carousel in web UI (#28878) 2024-02-01 13:37:04 +00:00
Claire
8b87673f5e Remove obsolete locale file (#2596) 2024-01-30 23:21:35 +01:00
Claire
3ede233146 Fix crash in private mention conversations in glitch-soc flavor (#2595) 2024-01-30 22:42:22 +01:00
Yamagishi Kazutoshi
b3075a9993 Remove unused l18n messages (#28964) 2024-01-30 15:34:07 +00:00
J H
1467f1e1e1 Fixed the toggle emoji dropdown bug (#29012) 2024-01-30 13:38:49 +00:00
Claire
80308d384a [Glitch] Refactor conversations components in web UI (#2589) 
Port 3205a654ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-01-28 14:53:08 +01:00
Claire
54ece5040d [Glitch] Use active variants for boost icons and increase icon size 
Port 5a838ceaa9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 20:53:53 +01:00
Eugen Rochko
e5f50478b5 [Glitch] Add confirmation when redirecting logged-out requests to permalink 
Port SCSS changes from b19ae521b7 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 20:51:08 +01:00
Claire
5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
github-actions[bot]
ae9c675930 New Crowdin Translations (automated) (#2564) 
* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 19:45:04 +01:00
Claire
805dba7f8d Change compose form to use server-provided post character limit (#28928) 2024-01-26 14:09:45 +00:00
github-actions[bot]
45287049ab New Crowdin Translations (automated) (#28923) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-26 09:15:55 +00:00
Eugen Rochko
6936e5aa69 Change design of compose form in web UI (#28119) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-25 15:41:31 +00:00
Eugen Rochko
3205a654ca Refactor conversations components in web UI (#28833) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-25 14:34:26 +00:00
github-actions[bot]
59d2ea0d82 New Crowdin Translations (automated) (#28899) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-25 13:00:44 +00:00
Eugen Rochko
22e419f95e [Glitch] Fix search form re-rendering spuriously in web UI 
Port 01ce9df880 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-24 20:53:15 +01:00
Claire
22cfab0ebf Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
 2024-01-24 20:42:53 +01:00
Claire
5a838ceaa9 Use active variants for boost icons and increase icon size (#27924) 2024-01-24 12:37:43 +00:00
Eugen Rochko
b19ae521b7 Add confirmation when redirecting logged-out requests to permalink (#27792) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-24 10:49:19 +00:00
Eugen Rochko
01ce9df880 Fix search form re-rendering spuriously in web UI (#28876) 2024-01-24 07:03:30 +00:00
github-actions[bot]
78ee1453f9 New Crowdin Translations (automated) (#28857) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-23 10:11:37 +00:00
Eugen Rochko
72bae7e170 [Glitch] Fix duplicate and missing keys in search popout component in web UI 
Port 9f8e3cca9a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-22 19:21:02 +01:00
Claire
102eff7c05 Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 2024-01-22 19:19:40 +01:00
renovate[bot]
1d381c1664 [Glitch] Update dependency react-redux to v9.1.0 
Port 163db814c2 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-22 19:15:02 +01:00
Claire
0700eb58bc Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream 2024-01-22 19:12:05 +01:00
github-actions[bot]
76e383ea1e New Crowdin Translations (automated) (#28827) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-22 11:52:26 +00:00
Eugen Rochko
9f8e3cca9a Fix duplicate and missing keys in search popout component in web UI (#28834) 2024-01-21 07:44:46 +00:00
github-actions[bot]
9cd17020bc New Crowdin Translations (automated) (#28798) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-19 09:41:57 +00:00
renovate[bot]
163db814c2 Update dependency react-redux to v9.1.0 (#28717) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-01-19 09:41:03 +00:00
HTeuMeuLeu
86cc88c216 Fix banner image not showing in follow emails (#28814) 2024-01-19 09:23:59 +00:00
Claire
07b6777c99 Fix styling issue in account fields (#2578) 2024-01-18 20:27:47 +01:00
Santiago Kozak
036e25f19d [Glitch] Improve display of lock icon in account headers 
Port 30b193b856 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-17 18:37:04 +01:00
Claire
0207c4b055 [Glitch] Change media “ALT” label to a specific class 
Port e817fe4c35 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-17 18:36:09 +01:00
Claire
e8294925e6 [Glitch] Fix various icon alignment issues 
Port baab58c80b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-17 18:34:57 +01:00
Claire
c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
 2024-01-17 18:32:15 +01:00
renovate[bot]
d56e9fb873 [Glitch] Update devDependencies (non-major) 
Port 4e277f83dc to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-17 18:12:00 +01:00
Claire
8485bedddc Merge commit '4e277f83dc740b3a842c7fd8ed167c3c76fcabf8' into glitch-soc/merge-upstream 2024-01-17 18:09:15 +01:00