Onebox Github Pull Request Styling
Merge pull request #2808 from gschlager/i18n_fix07

FIX: Category creation failed when translation was missing
Merge pull request #2825 from lidlanca/patch-5

Onebox Github Pull Request Styling
FIX: Back button broke on customize routes in admin
FEATURE: add site preference for standard subjects, including support for Re
FEATURE: new rake task to clean up uploads & thumbnails
remove deprecated TOS text content
initial version, mostly inspired from phpbb script
Merge pull request #2828 from Coren/import_mybb

initial version, mostly inspired from phpbb script
Merge pull request #2826 from techAPJ/patch-1

FEATURE: add site preference for standard subjects, including support for Re
FEATURE: hide emails behind a button for staff members
use the right HTTP verb
Add trust_level_locked column
FIX: Leader requirements weren't loading when visited directly
FEATURE: Allow admins to lock users from TL3 promotion/demotion

Also, update the display logic for the leader promotion screen to
account for the demotion grace period.
Change 24 hours to soon (it runs every 4 hours)
Display grace period note even if not below requirements
Also skip locked users in the job query
Fix wrong variable name
Rename 'leader' -> 'tl3'