stevenoh0908/mastodon-sakyey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,005 Commits 75 Branches 3 Tags
sakyey/main
Commit Graph

4557 Commits

Author SHA1 Message Date
Stephen Oh
f9c039eef2 Merge tag 'v4.5.8' of https://github.com/glitch-soc/mastodon into rebase/glitch-soc-v4.5.8 
- glitch-soc의 v4.5.8로 update함.
- 번역에는 차이가 없기에, 현행 사계 대광장의 번역을 유지.
 2026-03-25 15:26:37 +09:00
Claire
2c35e71cfc Merge commit '38e7bb9b866b5d207a511de093de25536f13e9c4' into glitch-soc/merge-4.5 2026-03-24 16:17:23 +01:00
Claire
c188e659b1 Merge commit from fork 2026-03-24 15:42:40 +01:00
Matt Jankowski
23be60a641 Update devise to version 5.0 (#37419) 2026-03-24 15:36:06 +01:00
github-actions[bot]
e0d097fac0 New Crowdin Translations for stable-4.5 (automated) (#38341) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2026-03-24 10:43:13 +01:00
커피사유
74cb4dea2f 한국어 번역 추가 수정 
- Glitch App Settings 메뉴의 한국어 번역을 자연스럽게 다듬음.
- 기존 번역에서 부자연스럽거나 구두점을 빼먹은 부분을 보충함.
- 기존 Mastodon or Glitch의 한국어 번역 설정 파일이 빼먹은 키를 보충하여 영어로 표시되는 텍스트를 없앰.
 2026-03-19 02:04:55 +09:00
커피사유
75c2acb9bf Updated Misconfigured Source Code URL 2026-03-18 21:37:51 +09:00
커피사유
c16df35594 Updated Initial Version of Custom Korean Translation 
- Updated default mastodon+glitch korean translation, to custom version for sakyey.kr
 2026-03-18 21:02:52 +09:00
Claire
f4baed2a69 Merge commit 'f37dc6c59e88aa3a119ecbe76ee9fba480d13daa' into glitch-soc/merge-4.5 2026-03-14 11:54:20 +01:00
Hugo Gameiro
9171fa49b6 Fix OpenStack Swift Keystone token rate limiting (#38145) 2026-03-13 18:17:18 +01:00
Claire
b868e598bc Merge commit '3de59a93441367fbca0fd22818c8411adc73a967' into glitch-soc/merge-4.5 2025-12-28 10:51:43 +01:00
Claire
df1ab0ab90 Fix default Admin role not including view_feeds permission (#37301) 2025-12-19 11:02:32 +01:00
Claire
6c1e892dd7 Merge commit '86cff1abca6af7ffb1a6ca004ae308c0df6d45ba' into glitch-soc/merge-4.5 2025-12-08 16:37:11 +01:00
github-actions[bot]
a9f8268a75 New Crowdin Translations for stable-4.5 (automated) (#37158) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-08 12:56:49 +01:00
Claire
b35c691ab2 Merge commit '19588756ef62847a01486fa360d4e4ee00307948' into glitch-soc/merge-4.5 2025-11-20 14:49:19 +01:00
github-actions[bot]
e398ff40b2 New Crowdin Translations for stable-4.5 (automated) (#36945) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-20 13:40:31 +01:00
Claire
585827c14f Merge commit 'bb6093c3153f092736e2f25959e3dcdceeb7bce1' into glitch-soc/merge-4.5 2025-11-13 17:22:33 +01:00
github-actions[bot]
e742eff044 New Crowdin Translations for stable-4.5 (automated) (#36864) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-13 15:46:34 +01:00
Claire
8a2d38a47b Merge commit '048430f4e8010672eb667f1ccf2372571cfb97dd' into glitch-soc/merge-4.5 2025-11-06 12:16:55 +01:00
github-actions[bot]
048430f4e8 New Crowdin Translations for stable-4.5 (automated) (#36745) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-06 11:37:54 +01:00
Claire
7ea3c6a039 Merge commit 'e91c7645905972d9663a0d944b133ff24670bce2' into glitch-soc/merge-4.5 2025-11-05 10:02:33 +01:00
Rachael Wright-Munn
b5a6feb3bf Move "Privacy and reach" from "Public profile" to top-level navigation (#27294) 2025-11-05 09:59:00 +01:00
Claire
05964f571b Prevent creation of Private Mentions quoting someone who is not mentioned (#36689) 2025-11-05 09:59:00 +01:00
Claire
5f5e6ca031 Merge commit 'af4c372ab22b636742833592235d18418604fcc1' into glitch-soc/merge-4.5 2025-10-31 16:04:05 +01:00
github-actions[bot]
adfabf8c80 New Crowdin Translations for stable-4.5 (automated) (#36670) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-31 14:51:18 +01:00
Claire
002e592667 Merge commit '51877081b435b38e1c5bd449087279469fa7c667' into glitch-soc/merge-upstream 2025-10-29 12:24:49 +01:00
github-actions[bot]
7b66eefd3e New Crowdin Translations (automated) (#36632) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-29 10:13:42 +00:00
Claire
48ec31bec8 Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed stuff too close to glitch-soc's theming system changes.
  Applied upstream's changes.
- `streaming/index.js`:
  Upstream refactored a bunch of stuff where our code was different due to
  local-only posts.
  Applied upstream's changes while taking care of local-only posts.
 2025-10-28 22:10:12 +01:00
Claire
5f3f75559f Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream 2025-10-28 20:25:09 +01:00
github-actions[bot]
5d00ae7eb3 New Crowdin Translations (automated) (#36617) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-28 08:29:36 +00:00
Renaud Chaput
779a1f8448 Add a new setting to choose the server landing page (#36588) 2025-10-27 10:16:59 +00:00
github-actions[bot]
e40ca321ed New Crowdin Translations (automated) (#36590) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-27 09:45:37 +00:00
Claire
deed31ba8c Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/public_feed.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
- `spec/models/tag_feed_spec.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
 2025-10-23 18:33:52 +02:00
github-actions[bot]
f7b99cd48a New Crowdin Translations (automated) (#36569) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-23 09:29:02 +00:00
Claire
7774cd6670 Add disabled setting for live and topic feeds, as well as user permission to bypass that (#36563) 2025-10-23 08:37:05 +00:00
Claire
ee9a15031b Merge commit '9f7075a0ce2b6ecef8d92ef318785fa8ce708688' into glitch-soc/merge-upstream 2025-10-22 18:06:32 +02:00
belatedly
6adbd9ce52 Fix discovery preamble missing word in EN and EN-GB locales (#36560) 2025-10-22 09:18:02 +00:00
github-actions[bot]
08ae77fd9c New Crowdin Translations (automated) (#36556) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-22 08:24:40 +00:00
Claire
209434cb1d Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream 2025-10-21 18:15:56 +02:00
Renaud Chaput
b80ec3721d Drop support for PostgreSQL 13 (#36540) 2025-10-21 14:26:00 +00:00
Claire
5674100f0b Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream 2025-10-21 15:57:43 +02:00
github-actions[bot]
2b9e4294fe New Crowdin Translations (automated) (#36538) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-21 08:50:24 +00:00
Claire
9080083263 Merge commit '341ea7f462c68ebe2fc5ee15dc7c58aa5775d5a0' into glitch-soc/merge-upstream 2025-10-20 21:37:50 +02:00
github-actions[bot]
82483ed8b0 New Crowdin Translations (automated) (#36520) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-20 10:10:37 +00:00
Claire
22e3c0e745 Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a setting adjacent to a glitch-soc-only setting.
  Added upstream's setting while keeping ours.
 2025-10-17 19:00:18 +02:00
Claire
4c0104084d Merge commit 'c96e28a41d6f3dee898b09ab1b250ac5b5dfd9e4' into glitch-soc/merge-upstream 2025-10-17 18:36:27 +02:00
diondiondion
6dad80eb8c Add new "quick boosting" setting (#36516) 2025-10-17 13:02:47 +00:00
github-actions[bot]
ccac6da3e8 New Crowdin Translations (automated) (#36513) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-10-17 08:41:07 +00:00
Claire
323c6e51fe Merge commit '7530f06deea63a03e0ca05f777f0f1582372c305' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream reorganized the whole page, while glitch-soc had an extra setting.
  Adopted upstream's redesign and moved the extra setting where it made sense.
 2025-10-16 19:23:29 +02:00
diondiondion
20961c7538 Add keyboard shortcut info banner to the boosting preferences section (#36506) 2025-10-16 14:53:23 +00:00