396 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Luke Barratt	cc48f8ab32	Merge remote-tracking branch 'jamal/develop' into develop	2014-10-11 23:11:06 +01:00
jamal	aa0d0673b6	Change Gather style to volunteer captains ... This will change the gather format to allow for players to volunteer to be captain / commander. The gather will not change from the running state until 2 commanders have volunteered. Once commanders have volunteered the gather will switch to the picking state. The voting state is no longer used. Also, added a new sound alert that will be played when the gather is full but doesn't have 2 captains. This alert will loop every 10 seconds unless you're the commander. And changed the music to play once the gather switches to the picking state and only if the player doesn't have the gather page on focus.	2014-10-11 15:50:06 -04:00
jamal	450f821232	Disable leave confirm when voting for map or server	2014-10-11 10:04:16 -04:00
jamal	3589e226d3	Fix double confirm when you click the 'Leave Gather' button	2014-10-11 09:13:07 -04:00
onyxserpent	59ff1caee7	Put the bold hack thing here.	2014-10-11 01:26:08 -07:00
onyxserpent	942ad98d64	Actually didn't want the hack here.	2014-10-11 01:25:36 -07:00
onyxserpent	840e03fe3b	Moved the bold hack to here	2014-10-11 01:15:12 -07:00
onyxserpent	493daf1fc5	Moving the bold hack	2014-10-11 01:12:32 -07:00
Luke Barratt	ffb7793e88	TravisCI: bundle all gems. Use poltergeist/phantomjs	2014-10-11 08:44:02 +01:00
Luke Barratt	226ffcf8cb	Merge remote-tracking branch 'jamal/develop' into develop	2014-10-11 08:26:04 +01:00
Luke Barratt	c9b6532e7e	Update travis: use parallel bundle install and cache dependencies	2014-10-11 08:25:06 +01:00
Luke Barratt	6a4a64714c	Update travis config	2014-10-11 08:15:39 +01:00
jamal	6c2348bcb6	Add state to gatherers and track when a gatherer has left or is away	2014-10-10 20:50:17 -04:00
onyxserpent	7b5fa25ab1	Possibly fixing font weight issues in OSX Firefox	2014-10-09 20:28:33 -07:00
onyxserpent	115f4ff37e	Reverting font weight changes	2014-10-09 20:25:35 -07:00
onyxserpent	9825195f96	Reverting font weight changes	2014-10-09 20:25:00 -07:00
onyxserpent	41b138c2e3	Reverting font weight changes	2014-10-09 20:24:33 -07:00
onyxserpent	04b915e835	Reverting font weight changes	2014-10-09 20:23:53 -07:00
onyxserpent	4ef76bea99	Reverting font weight changes	2014-10-09 20:22:53 -07:00
onyxserpent	afeb41fcb9	Reverting font weight changes	2014-10-09 20:20:58 -07:00
onyxserpent	16c6473037	Reverting font weight changes	2014-10-09 20:19:01 -07:00
onyxserpent	9fd814127e	Reverting font weight changes	2014-10-09 20:18:13 -07:00
Luke Barratt	8bed4a1215	Bump docs & build config ruby versions	2014-10-09 23:52:32 +01:00
onyxserpent	6f01a4d524	Fixes wrapping issues with small screens/mobile ... Theoretically should work this time. Initially put the code int he wrong CSS class.	2014-09-29 18:32:50 -07:00
onyxserpent	2139587c37	Fixed incorrect font useage	2014-09-29 18:23:26 -07:00
onyxserpent	9ad2d48ddb	Copying font weight changes	2014-09-29 18:17:35 -07:00
onyxserpent	dba047226b	Copying font weight changes	2014-09-29 18:16:50 -07:00
onyxserpent	7e34d18134	Copying font weight changes	2014-09-29 18:16:15 -07:00
onyxserpent	1d44a298ef	Copying font weight changes	2014-09-29 18:13:39 -07:00
onyxserpent	bdedfbb2d2	Copying font weight changes	2014-09-29 18:12:43 -07:00
onyxserpent	37058b060b	Copying font weight changes	2014-09-29 18:11:05 -07:00
onyxserpent	cef0de61cd	Copying font weight changes	2014-09-29 18:10:23 -07:00
onyxserpent	0742fd757d	Copying font weight changes	2014-09-29 18:09:26 -07:00
Luke Barratt	847ea18f17	Bump Ruby and puma versions	2014-09-27 19:58:10 +01:00
Luke Barratt	0debd4a021	Bump Ruby and puma versions	2014-09-27 19:49:31 +01:00
Luke Barratt	eba5ec0baa	Update rules article constant	2014-09-27 19:21:25 +01:00
Luke Barratt	2535d5bc7a	Update rules article constant	2014-09-27 19:11:19 +01:00
Luke Barratt	fa4cf67322	Hotfix: Rollback rules url helper	2014-08-29 00:21:23 +01:00
Luke Barratt	127b5f6308	Hotfix: Rollback rules url helper	2014-08-28 23:43:15 +01:00
Luke Barratt	eeab976147	Tweak font weights	2014-08-28 23:33:35 +01:00
Luke Barratt	8c9452dba9	Fixes invalid CSS syntax	2014-08-28 23:13:07 +01:00
Luke Barratt	4b9f2e6d84	Added steam profile lookup API endpoint	2014-08-28 23:04:18 +01:00
Luke Barratt	b97b3173bc	Check for upcoming matches before showing the calendar	2014-08-28 23:04:18 +01:00
Luke Barratt	a83b5bc0f8	Added site layout configuration for users	2014-08-28 23:04:18 +01:00
Luke Barratt	3d0bda0a92	Remove TS3 Password	2014-08-28 23:04:18 +01:00
Luke Barratt	c9bda3870a	Increase Capybara timeout	2014-08-28 23:04:18 +01:00
Luke Barratt	756398bff9	Added missing env variable for TravicCI	2014-08-28 23:04:18 +01:00
Luke Barratt	006c0592b1	Get selenium working on travisci	2014-08-28 23:04:18 +01:00
Luke Barratt	230c6fe847	Fixes forum topic ordering by latest post	2014-08-28 23:04:18 +01:00
Luke Barratt	f19202e065	Don't bundle for deployment on CI	2014-08-28 23:04:18 +01:00