Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-10 04:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
490 Commits 9 Branches 125 Tags
Commit Graph

83 Commits

Author SHA1 Message Date
Adarnof
9225896938 Merge branch 'master' of https://github.com/R4stl1n/allianceauth into more_logging 
Conflicts:
	celerytask/tasks.py
 2016-01-02 14:35:10 +00:00
Trent Bartlem
0fcc34ee23 #154 only sync TS3 if it's enabled 2016-01-02 16:19:37 +10:00
Adarnof
55fc69cf8d Basic logging for Discord account creation and database updating. 2015-12-28 06:50:13 +00:00
Adarnof
ab4f00fc1e Merge branch 'master' of https://github.com/R4stl1n/allianceauth 2015-12-10 02:55:41 +00:00
Adarnof
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
 2015-12-10 02:54:30 +00:00
Adarnof
d7e336d8b6 Attempted hotfix for #134 and likely #127 
Reverts #119 in an attempt to prevent infinite group creation on Discord server.
 2015-12-04 22:10:07 +00:00
Adarnof
052dd10834 Fixes #126 2015-12-04 00:01:18 +00:00
Adarnof
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.
 2015-12-02 05:57:33 +00:00
Adarnof
ae38f8f01f Corrected parameter checked for Discord account activation. 2015-12-02 01:08:15 +00:00
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
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
c49804c95c Corrected int-str comparison when decided to delete alliance models. 2015-11-28 00:45:57 +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
35277b7f33 Manual conflict resoltuion for pull request #98 2015-11-25 02:59:13 +00:00
Adarnof
f3d2a9cca5 Added logic to check if corp or alliance exists 
Prevents errors in celery task from prevention execution
Addresses issues #68 and #93
 2015-11-24 02:45:36 +00:00
Adarnof
0f19d95723 Corrected nested loop in run_corp_update 2015-11-14 09:58:22 +00:00
Adarnof
b36890ea9b Moved alliance/corp blue status update logic within block verifying corp standings exist 2015-11-19 05:35:39 +00:00
Adarnof
d8f4cfb3c9 Corrected logic for handling no standings 2015-11-18 03:56:28 +00:00
Adarnof
cf634d77a4 improved alliance model deletion logic 2015-11-05 04:16:14 +00:00
Adarnof
0420bfb494 improved handling of corp/alliance model deletion 2015-11-05 02:25:12 +00:00
Adarnof
fd70fb8f03 Revision of hotfix for Issue #89 
ensures alliance model exists before checking ID
 2015-11-04 23:45:00 +00:00
Adarnof
c4f66e380a Hotfix for Issue #89 
Reworked logic to prevent comparison of NoneType alliance ID
 2015-11-04 23:35:43 +00:00
Adarnof
8e3221e5ec Added logic to handle missing objects during run_api_refresh 2015-11-06 23:22:47 +00:00
Adarnof
75676e7887 Corrected login in corp/alliance updates to prevent deletion of running alliance 2015-11-06 22:37:55 +00:00
Brett Costabile
db1f475cf4 Removed logging 
Got rid of some logging I missed when cleaning up.
Also, a thumbs.db slipped past me somehow?
 2015-11-05 23:09:41 -05:00
Brett Costabile
0914ac171f Redundant query 
That was dumb
 2015-11-05 22:57:58 -05:00
Brett Costabile
15e959b265 Merged with R4stl1n master 
Had to resolve a small conflict in email. Replaced mine with upstream.
 2015-11-05 22:37:37 -05:00
Adarnof
2a05b42c01 Removed redundant function from tasks.py 
Added Corp/Alliance name switching to base template.
Fixed logic error in corp application filtering for hrapplication views.
 2015-11-06 03:22:21 +00:00
Adarnof
6c4520bf58 Update IS_BLUE authserviceinfo field during blue<->member transition 2015-11-04 19:54:14 +00:00
Adarnof
7ad37c2cd2 Corrected typo in run_api_refresh 2015-11-04 17:35:07 +00:00
Brett Costabile
c9958ebbb5 Removed all my logging 
I'm done. Don't need this anymore.
 2015-11-03 01:18:08 -05:00
Brett Costabile
b29d6bd7da Don't need that 
Testing
 2015-11-02 23:55:20 -05:00
Brett Costabile
0c4694d123 Moved TS3 group update 
The group update was being called once for every group the user was in,
but the update function itself already iterates over all the groups and
only needs to be called once per user.
I've moved the execution out of the group iteration so it only gets
called once.
 2015-11-01 17:11:40 -05:00
Brett Costabile
b76bc2729c More random changes 
Super disorganized here. Trying to get back to a working state
 2015-11-01 16:41:16 -05:00
Adarnof
9402329374 added corp change handling while auth'd 2015-11-01 01:45:40 -04:00
Adarnof
45b0bb5753 corrected function parameters 2015-10-31 22:46:45 -04:00
Adarnof
e091575453 fixed indentation error 2015-10-31 21:09:57 -04:00
Adarnof
a3de13f055 cleaned up settings descriptions 
incorporated alliance/corp check into main character change
restored alliance text to forms
returned optional alliance checking to periodic tasks (pray for me)
deleted accidental inclusion of PID file

this is gonna tickle.

Signed-off-by: Adarnof <adarnof@gmail.com>
 2015-10-31 17:35:00 -04:00
Adarnof
5853b41e58 Abstracted standing level (corp or alliance) depending on toggle 2015-09-20 04:19:30 +00:00
Adarnof
a40e29ea89 Added depenedent function generate_corp_group_name until I can figure out 
how to import from util.common_task.py
 2015-09-23 15:43:01 -04:00
Adarnof
9e189a639d Cleaned up corp -> blue and blue -> corp transitions in API check 2015-09-19 21:47:45 +00:00
Adarnof
fe6325cef9 Added blue -> member handling to celerytask 2015-09-19 05:58:33 +00:00
Adarnof
cb79054db9 Added member -> blue handling to mumble username 2015-09-19 05:52:14 +00:00
Adarnof
a62988530d Reworked permission correction during API check. Is cleaner... a bit. 2015-09-19 05:28:49 +00:00
Adarnof
c0d8e880ab Started adding member -> blue permission handling during api check. Probably very buggy. 2015-09-18 04:26:21 +00:00
Adarnof
259c2c7141 Fixed refences to renamed variable "alliance_standings" -> "corp_standings" 2015-09-18 03:59:44 +00:00
Adarnof
db0a4c235a Fixed reference to renamed variable "ALLIANCE_BLUE_STANDING" -> "BLUE_STANDING" 2015-09-18 03:51:02 +00:00
Adarnof
48d1afb104 Fixed indentation in tasks.py 
Removed reference to undefined variable 'alliance' when checking corps
 2015-09-17 05:02:06 +00:00
Adarnof
e98bc36a9c Removed all dependency on alliance membership 
Renamed permission 'alliance_member' 'member'
Renamed multiple variables in settings.py and associated handlers in util

Maybe it still works?
 2015-09-17 04:42:36 +00:00
Brett Costabile
c86ba4990d Lots of changes, not tested 
Pushing latest changes to run them by a few folks.
 2015-05-28 01:23:45 -04:00