2977 Commits

Author SHA1 Message Date
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
Adarnof
ccda5bf0ae Merge pull request #4 from Adarnof/temp
added corp change handling while auth'd
2015-11-01 01:47:32 -04:00
Adarnof
9402329374 added corp change handling while auth'd 2015-11-01 01:45:40 -04:00
Adarnof
3766272c75 Merge pull request #3 from Adarnof/temp
corrected function parameters
2015-10-31 22:47:53 -04:00
Adarnof
45b0bb5753 corrected function parameters 2015-10-31 22:46:45 -04:00
Adarnof
f2de1a742a Merge pull request #2 from Adarnof/temp
fixed indentation error
2015-10-31 22:36:15 -04:00
Adarnof
e091575453 fixed indentation error 2015-10-31 21:09:57 -04:00
Adarnof
8945cf3a2a Merge pull request #1 from Adarnof/temp
Merge changes in temp branch to orgin toggle branch
2015-10-31 18:32:10 -04:00
Adarnof
984ab31d33 changed templates to reflect corp or alliance toggle
created context processors for IS_CORP, ALLIANCE_ID and ALLIANCE_NAME variables

Signed-off-by: Adarnof <adarnof@gmail.com>
2015-10-31 17:59:27 -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
8152ae7e29 Removed accidental inclusion of working file. 2015-09-21 09:31:02 +00:00
Adarnof
cf5a099006 Minor fixes regarding HRApplication corp handling 2015-09-21 09:28:54 +00:00
Adarnof
5853b41e58 Abstracted standing level (corp or alliance) depending on toggle 2015-09-20 04:19:30 +00:00
Adarnof
2c98b5e4a6 Re-added corp choice to HRApplicationsw 2015-09-20 03:34:29 +00:00
Adarnof
31a98f86c3 Added corp toggle variable and updated descriptions 2015-09-23 23:11:58 -04: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
b40c6ffa62 Fixed variable descriptions 2015-09-19 22:17:00 +00: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
6e01001fda Made available a live copy of fleet fit example template to reduce unexpected template errors on fresh installs. Definitely needs customizing. 2015-09-19 05:33:40 +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
c227695160 Removed references to blue alliance standings, replaced with blue corp standings. 2015-09-18 03:53:37 +00:00
Adarnof
db0a4c235a Fixed reference to renamed variable "ALLIANCE_BLUE_STANDING" -> "BLUE_STANDING" 2015-09-18 03:51:02 +00:00
Adarnof
55a56374d2 Updated settings template 2015-09-17 05:28:52 +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
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
orbitroom
dcd049ec7e Merge pull request #2 from R4stl1n/master
typo fix
2015-03-29 09:17:00 -04:00
Raynaldo Rivera
e8181a23d7 Merge pull request #56 from tehfiend/patch-1
Fixed typos.
2015-02-22 12:40:47 -07:00
orbitroom
629a5a7649 Merge pull request #1 from R4stl1n/master
pull
2015-02-09 22:00:23 -05: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
orbitroom
e794d389d7 set working directory
added code to allow it to be ran from outside of the working directory.
2015-01-20 19:00:13 -05:00
orbitroom
40c4eff8c7 loadMon.sh
allows automated control of the celery scripts when ran as a cron job in order to keep celery from crashing the server due to a loop.
2015-01-20 18:55:51 -05:00