glitchier-soc

Author	SHA1	Message	Date
Thibaut Girka	00552d2f79	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	87f5646ec3	Add waiting time to list of pending accounts in admin UI (#10985 )	6 years ago
Thibaut Girka	cde0ac1aa7	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	7eb05b8724	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	a604f766e0	Fix batch actions not working on pending accounts (#10508 )	6 years ago
Thibaut Girka	85ab126f88	Fix pending accounts management	6 years ago
Eugen Rochko	c34a7f5bd2	Add batch actions for approving and rejecting pending accounts (#10469 )	6 years ago