681 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
Brett Costabile
44b88b8b0f Merge pull request #115 from Kaezon/new-distro-vagrant
New distro vagrant
2015-12-01 19:52:32 -05:00
Brett Costabile
948d705fe8 changed distro
Swapped ubuntu/precise32 for hashicorp/presice64
Seems to be way faster for setup.
2015-12-01 19:50:47 -05:00
Brett Costabile
c0986abf4a Merge remote-tracking branch 'refs/remotes/R4stl1n/master' 2015-12-01 19:01:39 -05:00
Adarnof
ec1b17df25 Dissociates user account from email address when deleting service. 2015-12-01 07:56: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
9e72422639 Corrected typo in register_user function preventing succesful registration. 2015-12-01 06:13:06 +00:00
Adarnof
54d216bdf0 Changed how user account deletions are handled.
Now bans/unbans account as necessary.
2015-12-01 04:50:14 +00:00
Adarnof
7461501d41 Corrected parameter list for user registration. 2015-12-01 04:28:17 +00:00
Adarnof
45e91f3b1f Removed duplicate entry of discord row in services list. 2015-12-01 04:26:18 +00:00
Adarnof
4ac7c4249c Updated AuthServiceInfoManager to update correct fields. 2015-12-01 04:15:43 +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
90522a5053 Changed default group permission to:
- Read Messages
 - Send Messages
 - Embed Links
 - Read Message History
 - Connect
 - Speak
 - Use Voice Activity
2015-12-01 03:25:48 +00:00
Adarnof
05eb59789f Merge https://github.com/R4stl1n/allianceauth into discord 2015-12-01 01:34:36 +00:00
Adarnof
bec690ad51 Deletes invites once user registered as Discord ignores max_age right now. 2015-12-01 00:42:04 +00:00
Adarnof
728a18b763 Corrected default invite parameters to increase security: 5 minute lifetime, 1 use. 2015-12-01 00:37:54 +00:00
Adarnof
7001071820 Deleted unnecessary discord client. 2015-12-01 00:27:59 +00:00
Adarnof
d3c8189c92 Corrected Discord user deletion logic.
Fixed Discord account reset.
2015-11-30 23:51:39 +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
34a27ba885 Added syncgroup logic to celery tasks.
Wrote request handles for enabling and disabling discord user.
2015-11-30 22:08:17 +00:00
Adarnof
765fcb52de Added required settings to example settings.py
Added additional fields in authserviceinfos to represent username and uid
2015-11-30 21:53:49 +00:00
Adarnof
c51b8c77e6 Consolidated API manager and service manager.
Initial service functions added to DiscordManager.
2015-11-30 21:47:06 +00:00
Adarnof
4383e9314d Corrected missing header for delete_invite 2015-11-30 04:00:31 +00:00
Adarnof
7e05054854 Initial work on Discord integration.
Manually created REST API manager as per the documented functions.
Attempting to integrade discord-py wrapper, unsuccesful thusfar.
Addresses #88
2015-11-30 03:44:38 +00:00
Adarnof
617ac5e0f5 Merge pull request #108 from Adarnof/scrub
Validate usernames during registration.
2015-11-29 16:31:54 -05:00
Adarnof
8cfcd8b618 Merge pull request #109 from Adarnof/timerboard
Modified timer model to include objective status
2015-11-29 16:31:33 -05:00
Adarnof
5bc0892dae Modified timer model to include objective status. 2015-11-29 04:30:15 +00:00
Adarnof
b5a4b4980a Scrubs usernames on registration allowing only letters, numbers and underscores.
Should prevent issue #46 from appearing on new installs.
2015-11-29 01:57:35 +00:00
Adarnof
d14ec57575 Merge branch 'master' of https://github.com/R4stl1n/allianceauth 2015-11-28 06:28:57 +00:00
Adarnof
ba73c4c465 Updated startup script to collect static and evolve as needed. 2015-11-28 06:28:30 +00:00
Adarnof
7e6e5bbfb7 Merge pull request #107 from Adarnof/broadcast
Broadcast Plugin Support
2015-11-28 00:43:15 -05:00
Adarnof
d8bc01484f Updated README to point to allianceauth.com for new guides. 2015-11-28 05:32:57 +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
2e3e3c5941 Merge pull request #106 from Adarnof/timerboard
Added new permission model to view timer boards.
2015-11-27 20:55:16 -05: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
6aa1dc67b8 Merge pull request #105 from Adarnof/timerboard
Added ability to enter time remaining on RF timer
2015-11-27 20:38:31 -05:00
Adarnof
d7f16ae91e Corrected field labels. 2015-11-28 01:37:09 +00:00
Adarnof
412c9c223d Corrected required fields on timer add form. 2015-11-28 01:36:09 +00:00
Adarnof
d069ddb3c0 Added ability to enter time remaining on RF timer instead of specifying a date/time explicitely.
Addresses #15
2015-11-28 01:33:21 +00:00
Adarnof
52eb5e0fd8 Removed commented code.
Addresses #104
2015-11-28 00:53:59 +00:00
Adarnof
c49804c95c Corrected int-str comparison when decided to delete alliance models. 2015-11-28 00:45:57 +00:00
Adarnof
0c1bf29dd3 Introduced new setting for broadcast service.
Changed broadcast logic to use broadcase openfire plugin.
Inital, untested commit.
2015-11-28 00:33:16 +00:00
Adarnof
42e833b2e0 Corrects logic to create owner corp model with appropriate alliance, if applicable.
Properly gets corp alliance ID from api information when checking alliance models.
2015-11-27 23:59:08 +00:00
Adarnof
20362625ea Corrected access mask logic to ensure required endpoints are available. 2015-11-27 00:18:00 +00:00
Adarnof
44007ffda3 Added a readme providing instructions on populating static folder. 2015-11-25 07:56:54 +00:00
Adarnof
9914123ae5 Merge pull request #102 from Adarnof/variable_api
Variable API requirements and key checking
2015-11-25 01:50:06 -05:00
Adarnof
35277b7f33 Manual conflict resoltuion for pull request #98 2015-11-25 02:59:13 +00:00