| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2022-10-30 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change. | |||
| 2021-10-24 | translation glitch's web interface [ja] | atsu1125 | |
| Squashed commit of the following: commit f8c339b4dafd7347c5e824191dbf28d770d6583d Author: atsuchan <83960488+atsu1125@users.noreply.github.com> Date: Sat Oct 23 20:24:28 2021 +0900 translation glitch's web interface [ja] commit a9520d5c5fb21490fa66c51bf1063f1edb9150ff Author: atsu1125 <mastodon@atsuchan.page> Date: Sat Oct 23 15:21:55 2021 +0900 translation glitch's web interface [ja] commit 699848f2abff24be149c4a1c623df8b920ef2ed9 Author: atsu1125 <mastodon@atsuchan.page> Date: Sat Oct 23 13:23:39 2021 +0900 translation glitch's web interface [ja] | |||
| 2021-10-20 | translation glitch's client setting interface [ja] | atsu1125 | |
| 2018-09-21 | change translation glitch's features [ja] | 霧島ひなた | |
| 2018-09-21 | translation glitch's features [ja] | 霧島ひなた | |
| 2018-04-14 | Add missing Japanese translation | imncls | |
| 2018-01-07 | Update ja.js | ncls7615 | |
| 2018-01-05 | Threaded mode~ | kibigo! | |
| 2017-12-19 | Add en and ja | ncls7615 | |
| 2017-12-15 | Update ja.js | NCLS | |
| 2017-12-15 | Update ja.js | NCLS | |
| 2017-12-12 | add ja | ncls7615 | |
| 2017-12-11 | add comma | ncls7615 | |
| 2017-12-11 | " => ' | ncls7615 | |
| 2017-12-11 | Merge branch 'master' of https://github.com/glitch-soc/mastodon into ↵ | ncls7615 | |
| glitch-langfiles # Conflicts: # app/javascript/glitch/locales/ja.json | |||
| 2017-12-10 | Move ja localization to new locaiton | kibigo! | |
| 2017-12-10 | Javascript intl8n flavour support | kibigo! | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |