3335 Commits

Author SHA1 Message Date
tehfiend
22a263ad4d Fixed typo. 2015-02-08 23:00:42 -07:00
tehfiend
17baf97f76 Fixed typo. 2015-02-08 22:59:15 -07:00
Raynaldo Rivera
1fb0397e3c Merge pull request #55 from tyler274/HRapplication_error
Fix for hr_application bug
2015-01-30 19:49:59 -07:00
Tyler274
9d295edbf7 no message 2015-01-30 21:49:11 -05:00
Tyler274
e615239620 Revert "Fix for hr_application bug"
This reverts commit b19c81a1cba48057a5dccab632091a015fc56ffb.
2015-01-30 21:47:19 -05:00
Tyler274
b19c81a1cb Fix for hr_application bug 2015-01-29 00:05:05 -05:00
orbitroom
e794d389d7 set working directory
added code to allow it to be ran from outside of the working directory.
2015-01-20 19:00:13 -05:00
orbitroom
40c4eff8c7 loadMon.sh
allows automated control of the celery scripts when ran as a cron job in order to keep celery from crashing the server due to a loop.
2015-01-20 18:55:51 -05:00
Raynaldo Rivera
1ab216383a Merge pull request #32 from orbitroom/master
Added fleet Fittings Page
2015-01-14 14:01:41 -07:00
Raynaldo Rivera
051e340640 Merge pull request #49 from TrentBartlem/master
Adjust vagrant scripts; enable env variable override
2015-01-14 13:57:40 -07:00
Raynaldo Rivera
9f9a1f7369 Merge pull request #45 from tyler274/ThreadCleanupAndDate
Cleanup the threading, its a method in openfiremanager now to spawn a th...
2015-01-13 01:45:01 -07:00
Trent Bartlem
60f37439ef Merge branch 'master' of https://github.com/TrentBartlem/allianceauth 2015-01-11 10:53:49 +10:00
Trent Bartlem
a7700ffab3 Added environment variable overrides 2015-01-11 10:53:45 +10:00
Trent Bartlem
9d5c39caeb updated to match new services 2015-01-11 10:53:22 +10:00
Trent Bartlem
69b5fe42fd Added environment variable overrides 2015-01-11 10:52:34 +10:00
orbitroom
cd8de6d19e Update fleetfits.html.example 2015-01-08 17:59:27 -05:00
orbitroom
c9459a2b83 Changed formatting for in game browser
changed the break code syntax to allow for in game browser compatability
2015-01-08 08:22:22 -05:00
orbitroom
ead7e0d0b2 Added Better Examples
Added better Examples and changed the file extension so it will not overwrite the current fits.
2015-01-08 07:59:59 -05:00
orbitroom
71dc322545 Rename fleetfits.html to fleetfits.html.example 2015-01-08 07:58:11 -05:00
orbitroom
f523c2e52a Merge pull request #3 from R4stl1n/master
pull
2015-01-08 07:56:44 -05:00
Tyler274
e386586fd0 Cleanup the threading, its a method in openfiremanager now to spawn a threaded broadcast.
Also added date to the broadcast.
2015-01-07 15:19:51 -05:00
Raynaldo Rivera
d74ff5fc91 Merge pull request #44 from tyler274/patch-1
Fix typo
2015-01-07 12:38:29 -07:00
tyler274
90962c21e6 Fix typo 2015-01-07 14:37:30 -05:00
Raynaldo Rivera
52ce9dcd7c Merge pull request #43 from tyler274/broadcastThread
Attempt to solve the blocking problem when broadcasting to a large group...
2015-01-07 12:12:33 -07:00
Tyler274
fade178964 Attempt to solve the blocking problem when broadcasting to a large group by running the broadcast on its own thread.
Tested on my server and appeared to solve it, more intensive testing may be needed.
2015-01-07 14:05:52 -05:00
Trent Bartlem
97e2f1c09c updated to match new services 2015-01-04 23:59:18 +10:00
orbitroom
f56abac54f Merge pull request #2 from R4stl1n/master
update for services managers
2015-01-01 03:11:13 -05:00
Raynaldo Rivera
2c7ed9e9c3 Merge pull request #41 from TrentBartlem/master
Update mumble_manager.py
2014-12-31 13:45:21 -07:00
Raynaldo Rivera
0f508f3a1d Merge pull request #40 from TrentBartlem/patch-1
Update teamspeak3_manager.py
2014-12-31 13:45:10 -07:00
Trent Bartlem
fc84781db5 Update mumble_manager.py
Sanitise the whole thing, not just username.
2014-12-31 23:17:50 +10:00
Trent Bartlem
8729f5b838 Update teamspeak3_manager.py
Sanitise both username and corp ticker at the same time.
2014-12-31 23:06:08 +10:00
orbitroom
9abb5ff6ee Merge pull request #1 from R4stl1n/master
pull
2014-12-23 09:58:42 -05:00
Raynaldo Rivera
09d0583d29 Added a refresh primary 2014-12-22 17:30:26 -07:00
Raynaldo Rivera
ee76502c18 Merge pull request #38 from tehfiend/patch-1
Minor timer-board improvements
2014-12-20 18:18:29 -07:00
tehfiend
2469dba6b0 Update timermanagement.html
Minor improvements to timer-board:
- current EVE time is live
- added live count-down timers
- added local time
2014-12-20 11:18:23 -07:00
tehfiend
e02a6c25e2 Create dateformat.js
Used for format local time on timer-board.
2014-12-20 11:16:49 -07:00
tehfiend
b3e5259b6e Create countdown.js
Used to generate live countdown on timber-board.
2014-12-20 11:04:51 -07:00
orbitroom
9324a494f5 Updated Services Icon
Added Different Icon For Fleet Fittings
2014-12-14 02:26:53 -05:00
orbitroom
294f892f78 Updated to use exisiting style
Stays in frame of Auth
2014-12-14 02:22:06 -05:00
orbitroom
186fb71c58 Added Fleet Fits Page 2014-12-06 18:19:20 -05:00
orbitroom
9aaa88048d Added Fleet Fittings Page 2014-12-06 17:54:55 -05:00
orbitroom
b72e49516f Added Fleet Fittings Page 2014-12-06 17:53:52 -05:00
orbitroom
c0f01f3806 Added Fleet Fittings Page 2014-12-06 17:52:19 -05:00
Raynaldo Rivera
4be18a58b4 Merge remote-tracking branch 'origin/master' 2014-12-05 20:47:41 -07:00
Raynaldo Rivera
5bb189695f Added additional information to pings 2014-12-05 20:47:29 -07:00
Raynaldo Rivera
c68c5345f8 Merge pull request #26 from tehfiend/master
Update to op-timer for sorting
2014-12-04 18:07:29 -07:00
tehfiend
720a421197 Update models.py 2014-12-03 19:13:14 -07:00
tehfiend
40701af047 Sort op timers by date/time 2014-12-03 19:08:33 -07:00
tehfiend
a58ee5af3c Merge pull request #1 from R4stl1n/master
TS3 / SRP
2014-12-03 19:04:39 -07:00
Raynaldo Rivera
08f923624f Added fix for syncgroup not working 2014-11-29 19:14:00 -07:00