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

269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brett Costabile
adcbcdaf52 Casting int to str 
because it's better than trying to compare them shithead
 2015-11-03 00:41:37 -05:00
Brett Costabile
b29d6bd7da Don't need that 
Testing
 2015-11-02 23:55:20 -05:00
Brett Costabile
5a03565f86 So close 
but no qute
 2015-11-02 23:43:21 -05:00
Brett Costabile
e9a2cb54b1 Lists and maps 
it's important to remember which one you're working with
 2015-11-02 23:34:54 -05:00
Brett Costabile
876ac6f3a2 Strings and ints 
I was comparing them. That was dumb
 2015-11-02 23:30:00 -05:00
Brett Costabile
ba1e11d182 Can I stop yet? 2015-11-02 23:21:38 -05:00
Brett Costabile
bba5bc33c4 Logging 
I'm tired
 2015-11-02 23:16:59 -05:00
Brett Costabile
d7933f5311 Logging 
Even more
 2015-11-02 23:08:02 -05:00
Brett Costabile
9c0d980bfa logging 
I broke it again
 2015-11-02 22:46:26 -05:00
Brett Costabile
385533a9b5 filter 
It's not plural
 2015-11-02 22:15:24 -05:00
Brett Costabile
560673767a syntax 
get some
 2015-11-02 22:12:49 -05:00
Brett Costabile
d3d1463404 Version conflict 
update_or_insert is from a newer version of django. gotta use .save()
 2015-11-02 22:08:32 -05:00
Brett Costabile
425aef081d Add/Remove user need sting inputs 
Had to cast groupid to str
 2015-11-02 00:49:34 -05:00
Brett Costabile
8a0e3f309d More logging 
Groups aren't adding now. Gotta make the logging better in
update_groups()
 2015-11-02 00:41:31 -05:00
Brett Costabile
f0527a5479 mistake 
forgot to change one instance of groupname to groupid
 2015-11-02 00:23:12 -05:00
Brett Costabile
c81b676553 remove_user_from_group 
Mirrored changes from add_user_from_group() remove_user_from_group()
 2015-11-02 00:14:58 -05:00
Brett Costabile
6abd62960f Small error 
If statement with bad syntax
 2015-11-01 23:50:26 -05:00
Brett Costabile
7039cffddb Fixing Server Admin assignment 
Changed _add_user_to_group() to take group ID instead of group name.
addgroups and remgroups are now lists instead of dictionaries because I
don't need the group names anymore.
Removed debug logging from _add_user_to_group() and send_command()
 2015-11-01 23:40:34 -05:00
Brett Costabile
478d855d62 Logging 
It looks like the escaping is fine, but there's two "Server Admin"
groups (id3 and id6) which might be messing with the assignment.
 2015-11-01 18:19:56 -05:00
Brett Costabile
621de341a8 Logging 
I think the issue may be with escaping the whitespace in group names. If
this is the case, I'll have to tweak the code in ts3.py
 2015-11-01 18:06:35 -05:00
Brett Costabile
2eb0bd5221 More indentation 
Notepad++ was configured to use tabs instead of spaces. That shouldn't
happen anymore.
 2015-11-01 17:53:10 -05:00
Brett Costabile
ee3fe5e43e More logging 
Added more debug logging to figure out why Server Admin never gets
assigned.
 2015-11-01 17:49:53 -05:00
Brett Costabile
df659c4851 Copypaste error 
user_ts_group_key should have been ts_group_key
 2015-11-01 17:34:01 -05:00
Brett Costabile
94ef8ce694 Indentation 
I broke it. Now it's fixed.
 2015-11-01 17:32:08 -05:00
Brett Costabile
cddd2b91e4 changed group key type 
Why did I even think long was a good idea?
 2015-11-01 17:28:41 -05:00
Brett Costabile
2bfbd614e6 Adjusted logging 
Changed logging to make a little more sense during debugging
 2015-11-01 17:27:04 -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
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
Brett Costabile
423e0ad161 Added function to sync TS3 groups 2015-05-26 01:22:42 -04:00
Brett Costabile
9d884c0a2c More format corrections 
I forgot to adjust the class names in admin.py after changing the first
characters to caps.
There was also a little shuffling of code to make the definitions work.
 2015-05-24 15:32:43 -04:00
Brett Costabile
1fcd47f333 Small format error 
Classes should start with a Capitol letter
 2015-05-23 17:13:22 -04:00
Brett Costabile
e1c3750f3a And models 
Messed up last commit. This one actually includes models.py
 2015-05-23 17:03:35 -04:00
Brett Costabile
2d85fb84ed Added TS3 group models and admin 2015-05-23 17:00:56 -04:00
kaezon
0e2540eb4f Initial commit with the alliance BG image, modified index page, and corrected password reset URL. 2015-05-20 01:36:26 +02:00
Raynaldo Rivera
e8181a23d7 Merge pull request #56 from tehfiend/patch-1 
Fixed typos.
 2015-02-22 12:40:47 -07:00
tehfiend
22a263ad4d Fixed typo. 2015-02-08 23:00:42 -07:00
tehfiend
17baf97f76 Fixed typo. 2015-02-08 22:59:15 -07:00
Raynaldo Rivera
1fb0397e3c Merge pull request #55 from tyler274/HRapplication_error 
Fix for hr_application bug
 2015-01-30 19:49:59 -07:00
Tyler274
9d295edbf7 no message 2015-01-30 21:49:11 -05:00
Tyler274
e615239620 Revert "Fix for hr_application bug" 
This reverts commit b19c81a1cba48057a5dccab632091a015fc56ffb.
 2015-01-30 21:47:19 -05:00
Tyler274
b19c81a1cb Fix for hr_application bug 2015-01-29 00:05:05 -05:00
Raynaldo Rivera
1ab216383a Merge pull request #32 from orbitroom/master 
Added fleet Fittings Page
 2015-01-14 14:01:41 -07:00
Raynaldo Rivera
051e340640 Merge pull request #49 from TrentBartlem/master 
Adjust vagrant scripts; enable env variable override
 2015-01-14 13:57:40 -07:00
Raynaldo Rivera
9f9a1f7369 Merge pull request #45 from tyler274/ThreadCleanupAndDate 
Cleanup the threading, its a method in openfiremanager now to spawn a th...
 2015-01-13 01:45:01 -07:00
Trent Bartlem
60f37439ef Merge branch 'master' of https://github.com/TrentBartlem/allianceauth 2015-01-11 10:53:49 +10:00
Trent Bartlem
a7700ffab3 Added environment variable overrides 2015-01-11 10:53:45 +10:00
Trent Bartlem
9d5c39caeb updated to match new services 2015-01-11 10:53:22 +10:00
Trent Bartlem
69b5fe42fd Added environment variable overrides 2015-01-11 10:52:34 +10:00
orbitroom
cd8de6d19e Update fleetfits.html.example 2015-01-08 17:59:27 -05:00