about summary refs log tree commit diff
path: root/app/views/admin/pending_accounts/index.html.haml
AgeCommit message (Collapse)Author
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut 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-08Fix batch actions not working on pending accounts (#10508)ThibG
2019-04-08Fix pending accounts managementThibaut Girka
2019-04-06Add batch actions for approving and rejecting pending accounts (#10469)Eugen Rochko