215 Commits

Author SHA1 Message Date
Adarnof
8442ec1f55 Changed discord account handling. Now requests email and password and grabs UID via API.
UID is stored in authserviceinfo model and used as required.
2015-12-02 01:02:13 +00:00
Adarnof
f6ef741e63 Added password change function as reset action. 2015-12-01 06:55:33 +00:00
Adarnof
57b44620cd Disabled Discord account reset until a proper mechanism can be thought up. 2015-12-01 06:23:18 +00:00
Adarnof
45e91f3b1f Removed duplicate entry of discord row in services list. 2015-12-01 04:26:18 +00:00
Adarnof
c009420536 Included Discord in disable_services from common_task.
Changed how user accounts in discord are handled: endpoint accepts password and email.
Accounts are created with a password(random) and their user email. Need to activate account through link in email.
2015-12-01 04:12:50 +00:00
Adarnof
05eb59789f Merge https://github.com/R4stl1n/allianceauth into discord 2015-12-01 01:34:36 +00:00
Adarnof
d9ffaa5e50 Initial work on reset discord account. 2015-11-30 23:41:44 +00:00
Adarnof
a6447d3596 Added link to discord server to services page.
Corrected handling of user deletion to return true if account absent on server.
2015-11-30 23:01:44 +00:00
Adarnof
2da93d4410 Added required settings and context to render services page.
Added URLs for enabling and disabling Discord.
Added Discord section to services page.
2015-11-30 22:30:18 +00:00
Adarnof
5bc0892dae Modified timer model to include objective status. 2015-11-29 04:30:15 +00:00
Adarnof
02dc27deac Corrected ALLIANCE_NAME context processor to render alliance name if IS_CORP false.
Added ALLIANCE_NAME vs CORP_NAME toggle for index page title per IS_CORP value.
Closes #85
2015-11-28 05:08:37 +00:00
Adarnof
c9f61e5def Added new permission model to view timer boards.
Enforced permission on base template for link to timerboard as well as view rendering.
Addresses #15
2015-11-28 01:53:21 +00:00
Adarnof
35277b7f33 Manual conflict resoltuion for pull request #98 2015-11-25 02:59:13 +00:00
Adarnof
db7b6265e5 Moved templates to stock folder for uniformity.
Updated settings.py.example to reflect this.
2015-11-24 23:26:05 +00:00
Adarnof
cf8d5b748b Moved staticfiles to stock/static
Added STATIC_ROOT to enable collection of staticfiles
Ignored static/ directory so changes by end user go untracked
Now required python manage.py collectstatic during install procedure
2015-11-24 23:20:50 +00:00