Adarnof
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
2015-11-28 05:08:37 +00:00
Adarnof
2e3e3c5941
Merge pull request #106 from Adarnof/timerboard
...
Added new permission model to view timer boards.
2015-11-27 20:55:16 -05:00
Adarnof
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
2015-11-28 01:53:21 +00:00
Adarnof
6aa1dc67b8
Merge pull request #105 from Adarnof/timerboard
...
Added ability to enter time remaining on RF timer
2015-11-27 20:38:31 -05:00
Adarnof
d7f16ae91e
Corrected field labels.
2015-11-28 01:37:09 +00:00
Adarnof
412c9c223d
Corrected required fields on timer add form.
2015-11-28 01:36:09 +00:00
Adarnof
d069ddb3c0
Added ability to enter time remaining on RF timer instead of specifying a date/time explicitely.
...
Addresses #15
2015-11-28 01:33:21 +00:00
Adarnof
52eb5e0fd8
Removed commented code.
...
Addresses #104
2015-11-28 00:53:59 +00:00
Adarnof
c49804c95c
Corrected int-str comparison when decided to delete alliance models.
2015-11-28 00:45:57 +00:00
Adarnof
0c1bf29dd3
Introduced new setting for broadcast service.
...
Changed broadcast logic to use broadcase openfire plugin.
Inital, untested commit.
2015-11-28 00:33:16 +00:00
Adarnof
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.
2015-11-27 23:59:08 +00:00
Adarnof
20362625ea
Corrected access mask logic to ensure required endpoints are available.
2015-11-27 00:18:00 +00:00
Adarnof
44007ffda3
Added a readme providing instructions on populating static folder.
2015-11-25 07:56:54 +00:00
Adarnof
9914123ae5
Merge pull request #102 from Adarnof/variable_api
...
Variable API requirements and key checking
2015-11-25 01:50:06 -05:00
Adarnof
35277b7f33
Manual conflict resoltuion for pull request #98
2015-11-25 02:59:13 +00:00
Brett Costabile
fbabc97e74
Merge pull request #100 from Adarnof/custom
...
Add ability to preserve customization between pulls
2015-11-24 21:06:48 -05:00
Adarnof
db7b6265e5
Moved templates to stock folder for uniformity.
...
Updated settings.py.example to reflect this.
2015-11-24 23:26:05 +00:00
Adarnof
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
2015-11-24 23:20:50 +00:00
Adarnof
0607ad9bde
Added a placeholder logo.
2015-11-24 05:58:52 +00:00
Adarnof
1d1d4f6851
Added missing gitignore
2015-11-24 05:55:48 +00:00
Adarnof
db9439e468
Removed old custom directories.
2015-11-24 05:54:33 +00:00
Adarnof
acc320a695
Relocated custom folders to a friendlier customization folder with appropriate readme
2015-11-24 05:52:22 +00:00
Adarnof
b669fafad6
Added a basic readme to explain how to use custom directories.
2015-11-24 05:18:15 +00:00
Adarnof
59af53537f
Includes a directory I forgot in my last commit. Oops.
2015-11-24 05:14:06 +00:00
Adarnof
745a5ceca8
Added empty directories for custom templates and images
...
Added template directories to settings.py to be searched first
Addresses issue #99
2015-11-24 05:12:42 +00:00
Adarnof
7dd9e670a8
Merge pull request #97 from Adarnof/check_exists
...
Added logic to check if corp or alliance exists
2015-11-23 23:11:01 -05:00
Adarnof
f3d2a9cca5
Added logic to check if corp or alliance exists
...
Prevents errors in celery task from prevention execution
Addresses issues #68 and #93
2015-11-24 02:45:36 +00:00
Adarnof
e49a642f21
Merge pull request #7 from R4stl1n/master
...
Update
2015-11-23 21:39:46 -05:00
Adarnof
6d952161c2
Merge pull request #94 from R4stl1n/celery_hotfix
...
Corrected nested loop in run_corp_update
2015-11-22 03:41:11 -05:00
Adarnof
aca70f3921
Merge pull request #92 from Kaezon/master
...
Vagrant Tweak
2015-11-19 01:09:50 -05:00
Brett Costabile
544041965e
Merge pull request #4 from Kaezon/vagrant-tweaking
...
Vagrant tweaking
2015-11-19 01:01:06 -05:00
Brett Costabile
fce99fb4dd
Merge remote-tracking branch 'refs/remotes/origin/master' into vagrant-tweaking
2015-11-19 00:59:24 -05:00
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
