History | View | Annotate | Download (393 Bytes)
Merge branch 'faidon/misc-fixes'
Conflicts: settings.d/50-invitations.conf
Remove redundant option in invitation settings
No reason to have SMTP_* there or at all, since they are apparently notused anymore.
Remove useless & noisy copyright banners for .conf
Remove 36 lines of noise from all of settings.d configuration files.Besides being utterly useless and extremely annoying, it's also commonlyincorrect since some of them are derived from Django and they're not...
Configurable number of invitations per invitation level
Refs: #439
Per user invitation limits
refs: #705
Merge branch 'api-current' into helpdesk-gui
Conflicts: settings.py.dist
Split settings.py.dist in distinct conf files
Split settings.py.dist in distinct conf files under settings.d/,similarly to:
https://code.djangoproject.com/wiki/SplitSettings#UsingalistofconffilesTransifex
Use settings..d/*-local.conf files for local modifications,...