glitchier-soc

Author	SHA1	Message	Date
Thibaut Girka	34b8346e7f	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb	6 years ago
Eugen Rochko	a60364ca7d	Add waiting time to list of pending accounts in admin UI (#10985 )	6 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream 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.	6 years ago
Eugen Rochko	8b69a66380	Add "why do you want to join" field to invite requests (#10524 ) * 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	6 years ago
ThibG	5247ea4efd	Fix batch actions not working on pending accounts (#10508 )	6 years ago
Thibaut Girka	63837a4b78	Fix pending accounts management	6 years ago
Eugen Rochko	e1d0390e29	Add batch actions for approving and rejecting pending accounts (#10469 )	6 years ago