| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2021-12-16 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system. | |||
| 2021-12-05 | Add batch suspend for accounts in admin UI (#17009) | Eugen Rochko | |
| 2020-11-06 | Add subresource integrity for JS and CSS assets (#15096) | Eugen Rochko | |
| Fix #2744 | |||
| 2020-10-28 | Fix IP blocks in admin panel | Thibaut Girka | |
| It was broken due to discrepancies between upstream and glitch-soc's theming system. | |||
| 2020-10-12 | Add IP-based rules (#14963) | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |