Commit Graph

  • ba73c4c465 Updated startup script to collect static and evolve as needed. Adarnof 2015-11-28 06:28:30 +00:00
  • 7e6e5bbfb7 Merge pull request #107 from Adarnof/broadcast Adarnof 2015-11-28 00:43:15 -05:00
  • d8bc01484f Updated README to point to allianceauth.com for new guides. Adarnof 2015-11-28 05:32:57 +00:00
  • 02dc27deac Corrected ALLIANCE_NAME context processor to render alliance name if IS_CORP false. Added ALLIANCE_NAME vs CORP_NAME toggle for index page title per IS_CORP value. Closes #85 Adarnof 2015-11-28 05:08:37 +00:00
  • 2e3e3c5941 Merge pull request #106 from Adarnof/timerboard Adarnof 2015-11-27 20:55:16 -05:00
  • c9f61e5def Added new permission model to view timer boards. Enforced permission on base template for link to timerboard as well as view rendering. Addresses #15 Adarnof 2015-11-28 01:52:49 +00:00
  • 6aa1dc67b8 Merge pull request #105 from Adarnof/timerboard Adarnof 2015-11-27 20:38:31 -05:00
  • d7f16ae91e Corrected field labels. Adarnof 2015-11-28 01:37:09 +00:00
  • 412c9c223d Corrected required fields on timer add form. Adarnof 2015-11-28 01:36:09 +00:00
  • d069ddb3c0 Added ability to enter time remaining on RF timer instead of specifying a date/time explicitely. Addresses #15 Adarnof 2015-11-28 01:32:36 +00:00
  • 52eb5e0fd8 Removed commented code. Addresses #104 Adarnof 2015-11-28 00:53:59 +00:00
  • c49804c95c Corrected int-str comparison when decided to delete alliance models. Adarnof 2015-11-28 00:45:57 +00:00
  • 0c1bf29dd3 Introduced new setting for broadcast service. Changed broadcast logic to use broadcase openfire plugin. Inital, untested commit. Adarnof 2015-11-28 00:33:16 +00:00
  • 42e833b2e0 Corrects logic to create owner corp model with appropriate alliance, if applicable. Properly gets corp alliance ID from api information when checking alliance models. Adarnof 2015-11-27 23:59:08 +00:00
  • 20362625ea Corrected access mask logic to ensure required endpoints are available. Adarnof 2015-11-27 00:18:00 +00:00
  • 44007ffda3 Added a readme providing instructions on populating static folder. Adarnof 2015-11-25 07:56:54 +00:00
  • 9914123ae5 Merge pull request #102 from Adarnof/variable_api Adarnof 2015-11-25 01:50:06 -05:00
  • 35277b7f33 Manual conflict resoltuion for pull request #98 Adarnof 2015-11-25 02:59:13 +00:00
  • fbabc97e74 Merge pull request #100 from Adarnof/custom Brett Costabile 2015-11-24 21:06:48 -05:00
  • db7b6265e5 Moved templates to stock folder for uniformity. Updated settings.py.example to reflect this. Adarnof 2015-11-24 23:26:05 +00:00
  • cf8d5b748b Moved staticfiles to stock/static Added STATIC_ROOT to enable collection of staticfiles Ignored static/ directory so changes by end user go untracked Now required python manage.py collectstatic during install procedure Adarnof 2015-11-24 23:20:50 +00:00
  • 0607ad9bde Added a placeholder logo. Adarnof 2015-11-24 05:58:52 +00:00
  • 1d1d4f6851 Added missing gitignore Adarnof 2015-11-24 05:55:48 +00:00
  • db9439e468 Removed old custom directories. Adarnof 2015-11-24 05:54:33 +00:00
  • acc320a695 Relocated custom folders to a friendlier customization folder with appropriate readme Adarnof 2015-11-24 05:52:22 +00:00
  • b669fafad6 Added a basic readme to explain how to use custom directories. Adarnof 2015-11-24 05:18:15 +00:00
  • 59af53537f Includes a directory I forgot in my last commit. Oops. Adarnof 2015-11-24 05:14:06 +00:00
  • 745a5ceca8 Added empty directories for custom templates and images Added template directories to settings.py to be searched first Addresses issue #99 Adarnof 2015-11-24 05:10:53 +00:00
  • 7dd9e670a8 Merge pull request #97 from Adarnof/check_exists Adarnof 2015-11-23 23:11:01 -05:00
  • f3d2a9cca5 Added logic to check if corp or alliance exists Prevents errors in celery task from prevention execution Addresses issues #68 and #93 Adarnof 2015-11-24 02:45:36 +00:00
  • e49a642f21 Merge pull request #7 from R4stl1n/master Adarnof 2015-11-23 21:39:46 -05:00
  • 6d952161c2 Merge pull request #94 from R4stl1n/celery_hotfix Adarnof 2015-11-22 03:41:11 -05:00
  • 0f19d95723 Corrected nested loop in run_corp_update Adarnof 2015-11-14 09:58:22 +00:00
  • aca70f3921 Merge pull request #92 from Kaezon/master Adarnof 2015-11-19 01:09:50 -05:00
  • 544041965e Merge pull request #4 from Kaezon/vagrant-tweaking Brett Costabile 2015-11-19 01:01:06 -05:00
  • fce99fb4dd Merge remote-tracking branch 'refs/remotes/origin/master' into vagrant-tweaking Brett Costabile 2015-11-19 00:59:24 -05:00
  • b2dcc1251e Removed mumble user setup Brett Costabile 2015-11-19 00:58:51 -05:00
  • 9946a4ed90 Merge pull request #3 from Kaezon/vagrant-tweaking Brett Costabile 2015-11-19 00:44:39 -05:00
  • 3318486e9c Added missing step in manual setup Brett Costabile 2015-11-19 00:42:47 -05:00
  • 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