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

2014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brett Costabile
b2dcc1251e Removed mumble user setup 
Because we don't need it anymore
 2015-11-19 00:58:51 -05:00
Brett Costabile
9946a4ed90 Merge pull request #3 from Kaezon/vagrant-tweaking 
Vagrant tweaking
 2015-11-19 00:44:39 -05:00
Brett Costabile
3318486e9c Added missing step in manual setup 
Gotta run corp_update
 2015-11-19 00:42:47 -05:00
Adarnof
977cc22a9a Merge pull request #91 from Adarnof/temp 
Moved alliance/corp blue status update logic within block verifying standings exist
 2015-11-19 00:39:58 -05:00
Adarnof
b36890ea9b Moved alliance/corp blue status update logic within block verifying corp standings exist 2015-11-19 05:35:39 +00:00
Brett Costabile
4ddff58370 Merge remote-tracking branch 'refs/remotes/origin/master' into vagrant-tweaking 2015-11-19 00:34:46 -05:00
Brett Costabile
383d89a0a5 Merge remote-tracking branch 'refs/remotes/R4stl1n/master' 2015-11-19 00:34:09 -05:00
Brett Costabile
8a6c244e67 corrected username 
missed that line
 2015-11-18 23:24:56 -05:00
Brett Costabile
57a1c6aaaa Removed experimental setup 
Alot of my experimental stuff for postgresql was causing issues, so I'm
removing that for a different project. This way I can get a clean setup
out.
 2015-11-18 23:08:59 -05:00
Brett Costabile
c0f53218dc Merge remote-tracking branch 'refs/remotes/origin/master' into vagrant-tweaking 2015-11-18 01:06:22 -05:00
Brett Costabile
6e9f08520a Merge remote-tracking branch 'refs/remotes/R4stl1n/master' 2015-11-18 00:48:28 -05:00
Adarnof
d8f4cfb3c9 Corrected logic for handling no standings 2015-11-18 03:56:28 +00:00
Brett Costabile
8b89ef20dd Merge pull request #90 from Adarnof/celery_hotfix 
Fix corp/alliance model deletion logic.
 2015-11-17 20:17:52 -05:00
Adarnof
b46365a3d3 Merge pull request #87 from Adarnof/forumavatars 
phpbb3 avatars
 2015-11-15 15:51:14 -05:00
Brett Costabile
05884095a9 Merge pull request #84 from Adarnof/ts3hotfix 
Corrects string index out of range exception when handling certain TS3 commands
 2015-11-15 14:48:03 -05:00
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
0f19d95723 Corrected nested loop in run_corp_update 2015-11-14 09:58:22 +00:00
Adarnof
810b626005 Corrected one last typo, I promise 2015-11-08 10:14:44 +00:00
Adarnof
5ab4ce2869 Yet another typo 2015-11-15 20:22:22 +00:00
Adarnof
ff46c1d4e9 Fixed broken function reference 2015-11-15 20:20:49 +00:00
Adarnof
1285fb6dfc Corrected SQL syntax 2015-11-15 20:19:52 +00:00
Adarnof
df487aa61e Corrected mismatched avatar sizes 2015-11-15 20:15:20 +00:00
Adarnof
0a24f3bad4 Enabled forum avatar images in phpbb set by main character id 2015-11-15 20:12:26 +00:00
Adarnof
3614c78971 Corrected indexoutofrange exception when handling certain serverqueries 2015-11-08 05:14:55 +00: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