| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-06-07 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb | |||
| 2019-06-07 | Add waiting time to list of pending accounts in admin UI (#10985) | Eugen Rochko | |
| 2019-04-10 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu. | |||
| 2019-04-09 | Add "why do you want to join" field to invite requests (#10524) | Eugen Rochko | |
| * Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted | |||
| 2019-04-08 | Fix batch actions not working on pending accounts (#10508) | ThibG | |
| 2019-04-08 | Fix pending accounts management | Thibaut Girka | |
| 2019-04-06 | Add batch actions for approving and rejecting pending accounts (#10469) | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |