| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2021-07-08 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. | |||
| 2021-07-07 | Change number_to_human calls to always use 3-digits precision (#16469) | Claire | |
| Fixes #16435 | |||
| 2021-04-20 | Fix the follow recommendation admin page on glitch-soc | Claire | |
| 2021-04-17 | Fix missing source strings and inconsistent lead text style in admin UI (#16052) | Eugen Rochko | |
| 2021-04-12 | Add cold-start follow recommendations (#15945) | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |