Commit Graph

  • 9b2934ae7a Corrected handling of group updates Removed old openfire package from requirements Adarnof 2015-12-22 22:39:38 +00:00
  • 23c8d48fbe Adds REST API support to Openfire using git package per #144 Adarnof 2015-12-22 22:14:20 +00:00
  • 55156bf190 As per #138 only updates discord groups if user account joining succesful. Adarnof 2015-12-22 05:25:28 +00:00
  • ab4f00fc1e Merge branch 'master' of https://github.com/R4stl1n/allianceauth Adarnof 2015-12-10 02:55:41 +00:00
  • cddedde26e Teamspeak group syncing now occurs once per database update rather than once per user per db update. Reduces calls to teamspeak as per #134 Adarnof 2015-12-10 02:54:30 +00:00
  • d7e336d8b6 Attempted hotfix for #134 and likely #127 Reverts #119 in an attempt to prevent infinite group creation on Discord server. Adarnof 2015-12-04 22:10:07 +00:00
  • e1a461a0cc Merge pull request #122 from TrentBartlem/patch-1 Adarnof 2015-12-03 20:33:29 -05:00
  • 052dd10834 Fixes #126 Adarnof 2015-12-04 00:01:18 +00:00
  • 586c4bf5cb *.py.example files are Python Trent Bartlem 2015-12-03 18:11:13 +10:00
  • dcd17e7df8 Create .gitattributes Trent Bartlem 2015-12-03 18:09:44 +10:00
  • 206e923322 Syntax highlighting in vim, github Trent Bartlem 2015-12-03 17:58:41 +10:00
  • a6ed320fd6 Create .gitignore Trent Bartlem 2015-12-03 17:52:18 +10:00
  • 8028749688 Added reqeuests package as requirement. Adarnof 2015-12-03 02:17:23 +00:00
  • f0a70a1d05 Removed incomplete function. Closes #120. Adarnof 2015-12-02 17:24:20 +00:00
  • b08cfd7409 Intelligently produces group listing. Halves the time required to create account. Closes #119 Adarnof 2015-12-02 06:38:17 +00:00
  • 4c27452bf9 Added error handling for missing character model. Adarnof 2015-12-02 06:09:20 +00:00
  • 93699bc69c Merge pull request #118 from Adarnof/celeryfix Adarnof 2015-12-02 00:59:29 -05:00
  • f899a76b5f Addresses #110 Corrected logic attempting to retrieve data from nonexistant character model. Also added logic to create character models for new characters on existing API keys. Adarnof 2015-12-02 05:56:18 +00:00
  • 58bcddc431 Merge pull request #117 from Adarnof/hrapplicationfix Adarnof 2015-12-01 23:53:18 -05:00
  • 627dbcf210 Added text indicating a Discord account is needed and link to site. Adarnof 2015-12-02 04:51:10 +00:00
  • c85882fa74 Added error handling for missing corp models. Addresses #116 and more unreported. Adarnof 2015-12-02 04:45:57 +00:00
  • 57aca60cdf Merge pull request #113 from Adarnof/discord Adarnof 2015-12-01 23:23:38 -05:00
  • f342569f16 Corrected reference to wrong manager in group creation. Adarnof 2015-12-02 04:22:48 +00:00
  • 286910059b Moved syncgroup deletion into block ensuring user was deleted. Adarnof 2015-12-02 03:57:54 +00:00
  • 7e371e34f8 Hid Discord user ID as it adds nothing and can confuse members. Adarnof 2015-12-02 03:31:12 +00:00
  • b9db6fc38c Reduced number of api calls to improve response time. Adarnof 2015-12-02 03:22:18 +00:00
  • 563967bf0d Updated form to a password input for security. DiscordManager now strips groups before kicking. This prevents server owners from keeping groups if they connect account with auth. Adarnof 2015-12-02 01:39:06 +00:00
  • a388e2595e Cleaned up redundant functions. Adarnof 2015-12-02 01:18:59 +00:00
  • ae38f8f01f Corrected parameter checked for Discord account activation. Adarnof 2015-12-02 01:08:15 +00:00
  • 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. Adarnof 2015-12-02 01:02:13 +00:00
  • 44b88b8b0f Merge pull request #115 from Kaezon/new-distro-vagrant Brett Costabile 2015-12-01 19:52:32 -05:00
  • 948d705fe8 changed distro Brett Costabile 2015-12-01 19:50:47 -05:00
  • c0986abf4a Merge remote-tracking branch 'refs/remotes/R4stl1n/master' Brett Costabile 2015-12-01 19:01:39 -05:00
  • ec1b17df25 Dissociates user account from email address when deleting service. Adarnof 2015-12-01 07:56:13 +00:00
  • f6ef741e63 Added password change function as reset action. Adarnof 2015-12-01 06:55:33 +00:00
  • 57b44620cd Disabled Discord account reset until a proper mechanism can be thought up. Adarnof 2015-12-01 06:23:18 +00:00
  • 9e72422639 Corrected typo in register_user function preventing succesful registration. Adarnof 2015-12-01 06:13:06 +00:00
  • 54d216bdf0 Changed how user account deletions are handled. Now bans/unbans account as necessary. Adarnof 2015-12-01 04:50:14 +00:00
  • 7461501d41 Corrected parameter list for user registration. Adarnof 2015-12-01 04:28:17 +00:00
  • 45e91f3b1f Removed duplicate entry of discord row in services list. Adarnof 2015-12-01 04:26:18 +00:00
  • 4ac7c4249c Updated AuthServiceInfoManager to update correct fields. Adarnof 2015-12-01 04:15:43 +00:00
  • 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. Adarnof 2015-12-01 04:12:50 +00:00
  • 90522a5053 Changed default group permission to: - Read Messages - Send Messages - Embed Links - Read Message History - Connect - Speak - Use Voice Activity Adarnof 2015-12-01 03:25:48 +00:00
  • 05eb59789f Merge https://github.com/R4stl1n/allianceauth into discord Adarnof 2015-12-01 01:34:36 +00:00
  • bec690ad51 Deletes invites once user registered as Discord ignores max_age right now. Adarnof 2015-12-01 00:42:04 +00:00
  • 728a18b763 Corrected default invite parameters to increase security: 5 minute lifetime, 1 use. Adarnof 2015-12-01 00:37:54 +00:00
  • 7001071820 Deleted unnecessary discord client. Adarnof 2015-12-01 00:27:59 +00:00
  • d3c8189c92 Corrected Discord user deletion logic. Fixed Discord account reset. Adarnof 2015-11-30 23:51:39 +00:00
  • d9ffaa5e50 Initial work on reset discord account. Adarnof 2015-11-30 23:41:44 +00:00
  • a6447d3596 Added link to discord server to services page. Corrected handling of user deletion to return true if account absent on server. Adarnof 2015-11-30 23:01:44 +00:00
  • 2da93d4410 Added required settings and context to render services page. Added URLs for enabling and disabling Discord. Added Discord section to services page. Adarnof 2015-11-30 22:30:18 +00:00
  • 34a27ba885 Added syncgroup logic to celery tasks. Wrote request handles for enabling and disabling discord user. Adarnof 2015-11-30 22:08:17 +00:00
  • 765fcb52de Added required settings to example settings.py Added additional fields in authserviceinfos to represent username and uid Adarnof 2015-11-30 21:53:49 +00:00
  • c51b8c77e6 Consolidated API manager and service manager. Initial service functions added to DiscordManager. Adarnof 2015-11-30 21:47:06 +00:00
  • 4383e9314d Corrected missing header for delete_invite Adarnof 2015-11-30 04:00:31 +00:00
  • 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 Adarnof 2015-11-30 03:43:02 +00:00
  • 617ac5e0f5 Merge pull request #108 from Adarnof/scrub Adarnof 2015-11-29 16:31:54 -05:00
  • 8cfcd8b618 Merge pull request #109 from Adarnof/timerboard Adarnof 2015-11-29 16:31:33 -05:00
  • 5bc0892dae Modified timer model to include objective status. Adarnof 2015-11-29 04:30:15 +00:00
  • b5a4b4980a Scrubs usernames on registration allowing only letters, numbers and underscores. Should prevent issue #46 from appearing on new installs. Adarnof 2015-11-29 01:57:35 +00:00
  • d14ec57575 Merge branch 'master' of https://github.com/R4stl1n/allianceauth Adarnof 2015-11-28 06:28:57 +00:00
  • ba73c4c465 Updated startup script to collect static and evolve as needed. Adarnof 2015-11-28 06:28:30 +00:00
  • 7e6e5bbfb7 Merge pull request #107 from Adarnof/broadcast Adarnof 2015-11-28 00:43:15 -05:00
  • d8bc01484f Updated README to point to allianceauth.com for new guides. Adarnof 2015-11-28 05:32:57 +00:00
  • 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 Adarnof 2015-11-28 05:08:37 +00:00
  • 2e3e3c5941 Merge pull request #106 from Adarnof/timerboard Adarnof 2015-11-27 20:55:16 -05:00
  • 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 Adarnof 2015-11-28 01:52:49 +00:00
  • 6aa1dc67b8 Merge pull request #105 from Adarnof/timerboard Adarnof 2015-11-27 20:38:31 -05:00
  • d7f16ae91e Corrected field labels. Adarnof 2015-11-28 01:37:09 +00:00
  • 412c9c223d Corrected required fields on timer add form. Adarnof 2015-11-28 01:36:09 +00:00
  • d069ddb3c0 Added ability to enter time remaining on RF timer instead of specifying a date/time explicitely. Addresses #15 Adarnof 2015-11-28 01:32:36 +00:00
  • 52eb5e0fd8 Removed commented code. Addresses #104 Adarnof 2015-11-28 00:53:59 +00:00
  • c49804c95c Corrected int-str comparison when decided to delete alliance models. Adarnof 2015-11-28 00:45:57 +00:00
  • 0c1bf29dd3 Introduced new setting for broadcast service. Changed broadcast logic to use broadcase openfire plugin. Inital, untested commit. Adarnof 2015-11-28 00:33:16 +00:00
  • 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. Adarnof 2015-11-27 23:59:08 +00:00
  • 20362625ea Corrected access mask logic to ensure required endpoints are available. Adarnof 2015-11-27 00:18:00 +00:00
  • 44007ffda3 Added a readme providing instructions on populating static folder. Adarnof 2015-11-25 07:56:54 +00:00
  • 9914123ae5 Merge pull request #102 from Adarnof/variable_api Adarnof 2015-11-25 01:50:06 -05:00
  • 35277b7f33 Manual conflict resoltuion for pull request #98 Adarnof 2015-11-25 02:59:13 +00:00
  • fbabc97e74 Merge pull request #100 from Adarnof/custom Brett Costabile 2015-11-24 21:06:48 -05:00
  • db7b6265e5 Moved templates to stock folder for uniformity. Updated settings.py.example to reflect this. Adarnof 2015-11-24 23:26:05 +00:00
  • 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 Adarnof 2015-11-24 23:20:50 +00:00
  • 0607ad9bde Added a placeholder logo. Adarnof 2015-11-24 05:58:52 +00:00
  • 1d1d4f6851 Added missing gitignore Adarnof 2015-11-24 05:55:48 +00:00
  • db9439e468 Removed old custom directories. Adarnof 2015-11-24 05:54:33 +00:00
  • acc320a695 Relocated custom folders to a friendlier customization folder with appropriate readme Adarnof 2015-11-24 05:52:22 +00:00
  • b669fafad6 Added a basic readme to explain how to use custom directories. Adarnof 2015-11-24 05:18:15 +00:00
  • 59af53537f Includes a directory I forgot in my last commit. Oops. Adarnof 2015-11-24 05:14:06 +00:00
  • 745a5ceca8 Added empty directories for custom templates and images Added template directories to settings.py to be searched first Addresses issue #99 Adarnof 2015-11-24 05:10:53 +00:00
  • 7dd9e670a8 Merge pull request #97 from Adarnof/check_exists Adarnof 2015-11-23 23:11:01 -05:00
  • f3d2a9cca5 Added logic to check if corp or alliance exists Prevents errors in celery task from prevention execution Addresses issues #68 and #93 Adarnof 2015-11-24 02:45:36 +00:00
  • e49a642f21 Merge pull request #7 from R4stl1n/master Adarnof 2015-11-23 21:39:46 -05:00
  • 6d952161c2 Merge pull request #94 from R4stl1n/celery_hotfix Adarnof 2015-11-22 03:41:11 -05:00
  • 0f19d95723 Corrected nested loop in run_corp_update Adarnof 2015-11-14 09:58:22 +00:00
  • aca70f3921 Merge pull request #92 from Kaezon/master Adarnof 2015-11-19 01:09:50 -05:00
  • 544041965e Merge pull request #4 from Kaezon/vagrant-tweaking Brett Costabile 2015-11-19 01:01:06 -05:00
  • fce99fb4dd Merge remote-tracking branch 'refs/remotes/origin/master' into vagrant-tweaking Brett Costabile 2015-11-19 00:59:24 -05:00
  • b2dcc1251e Removed mumble user setup Brett Costabile 2015-11-19 00:58:51 -05:00
  • 9946a4ed90 Merge pull request #3 from Kaezon/vagrant-tweaking Brett Costabile 2015-11-19 00:44:39 -05:00
  • 3318486e9c Added missing step in manual setup Brett Costabile 2015-11-19 00:42:47 -05:00