Commit Graph

  • 977cc22a9a Merge pull request #91 from Adarnof/temp Adarnof 2015-11-19 00:39:58 -05:00
  • b36890ea9b Moved alliance/corp blue status update logic within block verifying corp standings exist Adarnof 2015-11-19 05:35:39 +00:00
  • 4ddff58370 Merge remote-tracking branch 'refs/remotes/origin/master' into vagrant-tweaking Brett Costabile 2015-11-19 00:34:46 -05:00
  • 383d89a0a5 Merge remote-tracking branch 'refs/remotes/R4stl1n/master' Brett Costabile 2015-11-19 00:34:09 -05:00
  • 8a6c244e67 corrected username Brett Costabile 2015-11-18 23:24:56 -05:00
  • 57a1c6aaaa Removed experimental setup Brett Costabile 2015-11-18 23:08:59 -05:00
  • c0f53218dc Merge remote-tracking branch 'refs/remotes/origin/master' into vagrant-tweaking Brett Costabile 2015-11-18 01:06:22 -05:00
  • 6e9f08520a Merge remote-tracking branch 'refs/remotes/R4stl1n/master' Brett Costabile 2015-11-18 00:48:28 -05:00
  • d8f4cfb3c9 Corrected logic for handling no standings Adarnof 2015-11-18 03:56:28 +00:00
  • 8b89ef20dd Merge pull request #90 from Adarnof/celery_hotfix Brett Costabile 2015-11-17 20:17:52 -05:00
  • b46365a3d3 Merge pull request #87 from Adarnof/forumavatars Adarnof 2015-11-15 15:51:14 -05:00
  • 05884095a9 Merge pull request #84 from Adarnof/ts3hotfix Brett Costabile 2015-11-15 14:48:03 -05:00
  • 362d96e016 Merge pull request #81 from Adarnof/hiddengroup Brett Costabile 2015-11-15 14:46:30 -05:00
  • 810b626005 Corrected one last typo, I promise Adarnof 2015-11-08 10:14:44 +00:00
  • 5ab4ce2869 Yet another typo Adarnof 2015-11-15 20:22:22 +00:00
  • ff46c1d4e9 Fixed broken function reference Adarnof 2015-11-15 20:20:49 +00:00
  • 1285fb6dfc Corrected SQL syntax Adarnof 2015-11-15 20:19:52 +00:00
  • df487aa61e Corrected mismatched avatar sizes Adarnof 2015-11-15 20:15:20 +00:00
  • 0a24f3bad4 Enabled forum avatar images in phpbb set by main character id Adarnof 2015-11-15 20:12:26 +00:00
  • 3614c78971 Corrected indexoutofrange exception when handling certain serverqueries Adarnof 2015-11-08 05:14:55 +00:00
  • b5c973ecd6 Added ability to hide specific groups from frontent such that only staff can manage membership. Adarnof 2015-11-07 09:39:33 +00:00
  • f9ce0ff7c0 Postgres Brett Costabile 2015-11-05 20:16:11 -05:00
  • cf634d77a4 improved alliance model deletion logic Adarnof 2015-11-05 04:16:14 +00:00
  • 0420bfb494 improved handling of corp/alliance model deletion Adarnof 2015-11-05 02:25:12 +00:00
  • fd70fb8f03 Revision of hotfix for Issue #89 ensures alliance model exists before checking ID Adarnof 2015-11-04 23:45:00 +00:00
  • c4f66e380a Hotfix for Issue #89 Reworked logic to prevent comparison of NoneType alliance ID Adarnof 2015-11-04 23:35:43 +00:00
  • 239934cd2f Fixed indentation issue for Services link Adarnof 2015-11-07 06:12:41 +00:00
  • 9b9bf22502 Fixed absent corp/alliance name next to cog in base template Adarnof 2015-11-07 06:10:56 +00:00
  • 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 Adarnof 2015-11-07 05:33:46 +00:00
  • b7327a34d0 Corrected reference to misnamed group. Adarnof 2015-11-07 00:46:44 +00:00
  • cccc5680f2 Corrected inclusion of specific install alliance name and kilboard link. Adarnof 2015-11-07 00:09:43 +00:00
  • eb4995eebb Standardized background rendering across all templates. Added logo image field on index. Adarnof 2015-11-07 00:07:16 +00:00
  • 8e3221e5ec Added logic to handle missing objects during run_api_refresh Adarnof 2015-11-06 23:22:47 +00:00
  • b8ac8c7561 Corrected default boolean state for IS_CORP comparisons Adarnof 2015-11-06 22:39:17 +00:00
  • 75676e7887 Corrected login in corp/alliance updates to prevent deletion of running alliance Adarnof 2015-11-06 22:37:55 +00:00
  • 0d0dda150e Merge pull request #72 from Adarnof/master Adarnof 2015-11-05 23:23:18 -05:00
  • 49516045a4 Removed a Thumbs.db which seems to have wandered in. Adarnof 2015-11-06 04:21:43 +00:00
  • 5339a656a3 Merge branch 'master' of https://github.com/R4stl1n/allianceauth Adarnof 2015-11-06 04:19:31 +00:00
  • 740ebb3ad2 Merge pull request #71 from Kaezon/master Adarnof 2015-11-05 23:18:06 -05:00
  • 7cb8c88499 Gitignore Brett Costabile 2015-11-05 23:13:09 -05:00
  • db1f475cf4 Removed logging Brett Costabile 2015-11-05 23:09:41 -05:00
  • 0914ac171f Redundant query Brett Costabile 2015-11-05 22:57:58 -05:00
  • 3bd40cc57e Undoing my personal changes Brett Costabile 2015-11-05 22:51:54 -05:00
  • 3e550105a1 Corrected length mismatch between registration form and database for username field Adarnof 2015-11-06 03:41:57 +00:00
  • 15e959b265 Merged with R4stl1n master Brett Costabile 2015-11-05 22:37:37 -05:00
  • b5133a55e8 Merge pull request #70 from Adarnof/master Brett Costabile 2015-11-05 22:26:52 -05:00
  • 4134bbb188 Merge pull request #6 from Adarnof/temp Adarnof 2015-11-05 22:24:57 -05:00
  • 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. Adarnof 2015-11-06 03:22:21 +00:00
  • 8f8bc57567 Added error bar to be uniform across templates. Adarnof 2015-11-06 02:12:54 +00:00
  • 21a00baae3 Standardized url placeholders in settings.py.example and replaced lost trailing slash Removed reference to Alliance Services with neutral Services Adarnof 2015-11-06 02:08:38 +00:00
  • 2b0a0dcde0 Merge pull request #5 from Adarnof/toggle Adarnof 2015-11-05 20:56:26 -05:00
  • c4069de4c5 Merge pull request #2 from Kaezon/requirements-fix Brett Costabile 2015-11-05 20:54:27 -05:00
  • c22b02bab7 Fixing my mistake Brett Costabile 2015-11-05 20:42:26 -05:00
  • 6c4520bf58 Update IS_BLUE authserviceinfo field during blue<->member transition Adarnof 2015-11-04 19:54:14 +00:00
  • 7ad37c2cd2 Corrected typo in run_api_refresh Adarnof 2015-11-04 17:35:07 +00:00
  • 14258afdc1 Merge pull request #1 from Kaezon/TS3-group-management Brett Costabile 2015-11-03 01:44:24 -05:00
  • c9958ebbb5 Removed all my logging Brett Costabile 2015-11-03 01:18:08 -05:00
  • c8d7ea2ca9 FUCKING MAPS AND LISTS Brett Costabile 2015-11-03 00:53:44 -05:00
  • b2eadc2a78 logging Brett Costabile 2015-11-03 00:46:35 -05:00
  • adcbcdaf52 Casting int to str Brett Costabile 2015-11-03 00:41:37 -05:00
  • b29d6bd7da Don't need that Brett Costabile 2015-11-02 23:55:20 -05:00
  • 5a03565f86 So close Brett Costabile 2015-11-02 23:43:21 -05:00
  • e9a2cb54b1 Lists and maps Brett Costabile 2015-11-02 23:34:54 -05:00
  • 876ac6f3a2 Strings and ints Brett Costabile 2015-11-02 23:30:00 -05:00
  • ba1e11d182 Can I stop yet? Brett Costabile 2015-11-02 23:21:38 -05:00
  • bba5bc33c4 Logging Brett Costabile 2015-11-02 23:16:59 -05:00
  • d7933f5311 Logging Brett Costabile 2015-11-02 23:08:02 -05:00
  • 9c0d980bfa logging Brett Costabile 2015-11-02 22:46:26 -05:00
  • 385533a9b5 filter Brett Costabile 2015-11-02 22:15:24 -05:00
  • 560673767a syntax Brett Costabile 2015-11-02 22:12:49 -05:00
  • d3d1463404 Version conflict Brett Costabile 2015-11-02 22:08:32 -05:00
  • 425aef081d Add/Remove user need sting inputs Brett Costabile 2015-11-02 00:49:34 -05:00
  • 8a0e3f309d More logging Brett Costabile 2015-11-02 00:41:31 -05:00
  • f0527a5479 mistake Brett Costabile 2015-11-02 00:23:12 -05:00
  • c81b676553 remove_user_from_group Brett Costabile 2015-11-02 00:14:58 -05:00
  • 6abd62960f Small error Brett Costabile 2015-11-01 23:50:26 -05:00
  • 7039cffddb Fixing Server Admin assignment Brett Costabile 2015-11-01 23:40:34 -05:00
  • 478d855d62 Logging Brett Costabile 2015-11-01 18:19:56 -05:00
  • 621de341a8 Logging Brett Costabile 2015-11-01 18:06:35 -05:00
  • 2eb0bd5221 More indentation Brett Costabile 2015-11-01 17:53:10 -05:00
  • ee3fe5e43e More logging Brett Costabile 2015-11-01 17:49:53 -05:00
  • df659c4851 Copypaste error Brett Costabile 2015-11-01 17:34:01 -05:00
  • 94ef8ce694 Indentation Brett Costabile 2015-11-01 17:32:08 -05:00
  • cddd2b91e4 changed group key type Brett Costabile 2015-11-01 17:28:41 -05:00
  • 2bfbd614e6 Adjusted logging Brett Costabile 2015-11-01 17:27:04 -05:00
  • 0c4694d123 Moved TS3 group update Brett Costabile 2015-11-01 17:11:40 -05:00
  • b76bc2729c More random changes Brett Costabile 2015-11-01 16:41:16 -05:00
  • ccda5bf0ae Merge pull request #4 from Adarnof/temp Adarnof 2015-11-01 01:47:32 -04:00
  • 9402329374 added corp change handling while auth'd Adarnof 2015-11-01 01:45:40 -04:00
  • 3766272c75 Merge pull request #3 from Adarnof/temp Adarnof 2015-10-31 22:47:53 -04:00
  • 45b0bb5753 corrected function parameters Adarnof 2015-10-31 22:46:45 -04:00
  • f2de1a742a Merge pull request #2 from Adarnof/temp Adarnof 2015-10-31 22:36:15 -04:00
  • e091575453 fixed indentation error Adarnof 2015-10-31 21:09:57 -04:00
  • 8945cf3a2a Merge pull request #1 from Adarnof/temp Adarnof 2015-10-31 18:32:10 -04:00
  • 984ab31d33 changed templates to reflect corp or alliance toggle created context processors for IS_CORP, ALLIANCE_ID and ALLIANCE_NAME variables Adarnof 2015-10-31 17:59:27 -04:00
  • 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 Adarnof 2015-10-31 17:35:00 -04:00
  • 8152ae7e29 Removed accidental inclusion of working file. Adarnof 2015-09-21 09:31:02 +00:00
  • cf5a099006 Minor fixes regarding HRApplication corp handling Adarnof 2015-09-21 09:28:54 +00:00
  • 5853b41e58 Abstracted standing level (corp or alliance) depending on toggle Adarnof 2015-09-20 04:19:30 +00:00
  • 2c98b5e4a6 Re-added corp choice to HRApplicationsw Adarnof 2015-09-20 03:34:29 +00:00