332 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brett Costabile	362d96e016	Merge pull request #81 from Adarnof/hiddengroup ... Added ability to hide specific groups from frontend	2015-11-15 14:46:30 -05:00
Adarnof	b5c973ecd6	Added ability to hide specific groups from frontent such that only staff can manage membership.	2015-11-07 09:39:33 +00:00
Adarnof	239934cd2f	Fixed indentation issue for Services link	2015-11-07 06:12:41 +00:00
Adarnof	9b9bf22502	Fixed absent corp/alliance name next to cog in base template	2015-11-07 06:10:56 +00:00
Adarnof	1cc3b2a6b7	Fixed Issue #77 Teamspeak3 Manger errors prevent run_databaseUpdate from completing ... Wrapped _sync_ts_group_db in a try/catch block until we abstract services into their own apps	2015-11-07 05:33:46 +00:00
Adarnof	b7327a34d0	Corrected reference to misnamed group.	2015-11-07 00:46:44 +00:00
Adarnof	cccc5680f2	Corrected inclusion of specific install alliance name and kilboard link.	2015-11-07 00:09:43 +00:00
Adarnof	eb4995eebb	Standardized background rendering across all templates. ... Added logo image field on index.	2015-11-07 00:07:16 +00:00
Adarnof	8e3221e5ec	Added logic to handle missing objects during run_api_refresh	2015-11-06 23:22:47 +00:00
Adarnof	b8ac8c7561	Corrected default boolean state for IS_CORP comparisons	2015-11-06 22:39:17 +00:00
Adarnof	75676e7887	Corrected login in corp/alliance updates to prevent deletion of running alliance	2015-11-06 22:37:55 +00:00
Adarnof	0d0dda150e	Merge pull request #72 from Adarnof/master ... Minor fixes	2015-11-05 23:23:18 -05:00
Adarnof	49516045a4	Removed a Thumbs.db which seems to have wandered in.	2015-11-06 04:21:43 +00:00
Adarnof	5339a656a3	Merge branch 'master' of https://github.com/R4stl1n/allianceauth	2015-11-06 04:19:31 +00:00
Adarnof	740ebb3ad2	Merge pull request #71 from Kaezon/master ... TS3 Manager Rewrite	2015-11-05 23:18:06 -05:00
Brett Costabile	7cb8c88499	Gitignore ... fix'd	2015-11-05 23:13:09 -05: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	3bd40cc57e	Undoing my personal changes ... Oops, that shouldn't have happened.	2015-11-05 22:51:54 -05:00
Adarnof	3e550105a1	Corrected length mismatch between registration form and database for username field	2015-11-06 03:41:57 +00: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
Brett Costabile	b5133a55e8	Merge pull request #70 from Adarnof/master ... Corp Toggle	2015-11-05 22:26:52 -05:00
Adarnof	4134bbb188	Merge pull request #6 from Adarnof/temp ... R4stl1n pull request corrections	2015-11-05 22:24:57 -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	8f8bc57567	Added error bar to be uniform across templates.	2015-11-06 02:12:54 +00:00
Adarnof	21a00baae3	Standardized url placeholders in settings.py.example and replaced lost trailing slash ... Removed reference to Alliance Services with neutral Services	2015-11-06 02:08:38 +00:00
Adarnof	2b0a0dcde0	Merge pull request #5 from Adarnof/toggle ... Incorporate corp/alliance toggle.	2015-11-05 20:56:26 -05:00
Brett Costabile	c4069de4c5	Merge pull request #2 from Kaezon/requirements-fix ... Fixing my mistake	2015-11-05 20:54:27 -05:00
Brett Costabile	c22b02bab7	Fixing my mistake ... I forgot to change this change back after an experiment in my TS3 branch.	2015-11-05 20:42:26 -05: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	14258afdc1	Merge pull request #1 from Kaezon/TS3-group-management ... Ts3 group management	2015-11-03 01:44:24 -05: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	c8d7ea2ca9	FUCKING MAPS AND LISTS ... FUUUUUUUUUUUUUUUUUUUUUCK	2015-11-03 00:53:44 -05:00
Brett Costabile	b2eadc2a78	logging ... yes more	2015-11-03 00:46:35 -05:00
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