| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2021-11-26 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version. | |||
| 2021-10-20 | translation glitch's preferences [ja] | atsu1125 | |
| 2021-10-07 | Add zh-CN translations | Julianne420 | |
| 2021-08-06 | Fix typo on simple_form.ko.yml | Jeong Arm | |
| 2021-08-06 | Add Korean translations | Jeong Arm | |
| 2020-10-19 | Glitchsoc translation to 'es' language (#1439) | otrapersona | |
| glitch-soc-specific translation to 'es' language | |||
| 2020-05-30 | Add support for setting Content Warning for CW-less outgoing toots | Thibaut Girka | |
| 2020-05-30 | Move glitch-specific ruby-side locales to their own files | Thibaut Girka | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |