Commit graph

162 commits

Author SHA1 Message Date
jamal
4742be0ea5 Added ember to Gemfile 2014-10-11 22:37:46 -04:00
Jamal Fanaian
e69f55b409 Merge pull request #7 from jamal/develop
Catch RecordNotFound exception
2014-10-11 20:22:06 -04:00
jamal
756da67058 Catch RecordNotFound exception 2014-10-11 19:39:14 -04:00
Luke Barratt
7852b616d6 Merge remote-tracking branch 'jamal/fix-comm-confirm' into develop 2014-10-11 23:33:04 +01:00
jamal
d8134cadb7 Add .leave-gather to the command button so it disables the leave confirm dialog 2014-10-11 18:27:45 -04:00
Luke Barratt
f50c209702 Merge remote-tracking branch 'jamal/self-captains' into develop
Conflicts:
	app/views/gathers/_status.html.erb
2014-10-11 23:13:57 +01:00
Luke Barratt
d2b70f4261 Merge remote-tracking branch 'jamal/develop' into develop 2014-10-11 23:11:06 +01:00
jamal
ebd60d19eb 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
bffbbcb572 Disable leave confirm when voting for map or server 2014-10-11 10:04:16 -04:00
jamal
4da97ce553 Fix double confirm when you click the 'Leave Gather' button 2014-10-11 09:13:07 -04:00
Luke Barratt
d0029b118f TravisCI: bundle all gems. Use poltergeist/phantomjs 2014-10-11 08:44:02 +01:00
Luke Barratt
a6566e4e29 Merge remote-tracking branch 'jamal/develop' into develop 2014-10-11 08:26:04 +01:00
Luke Barratt
50da98f12e Update travis: use parallel bundle install and cache dependencies 2014-10-11 08:25:06 +01:00
Luke Barratt
52e2ac4e1c Update travis config 2014-10-11 08:15:39 +01:00
jamal
d6b501ac46 Add state to gatherers and track when a gatherer has left or is away 2014-10-10 20:50:17 -04:00
Luke Barratt
73ac7d589b Bump docs & build config ruby versions 2014-10-09 23:52:32 +01:00
Luke Barratt
7804545c89 Bump Ruby and puma versions 2014-09-27 19:49:31 +01:00
Luke Barratt
38e2da1bf3 Update rules article constant 2014-09-27 19:21:25 +01:00
Luke Barratt
94840f5623 Hotfix: Rollback rules url helper 2014-08-29 00:21:23 +01:00
Luke Barratt
a081c910bd Tweak font weights 2014-08-28 23:33:35 +01:00
Luke Barratt
72ce102958 Fixes invalid CSS syntax 2014-08-28 23:13:07 +01:00
Luke Barratt
47c2bc4006 Added steam profile lookup API endpoint 2014-08-28 23:04:18 +01:00
Luke Barratt
0420de8983 Check for upcoming matches before showing the calendar 2014-08-28 23:04:18 +01:00
Luke Barratt
e57a3f569d Added site layout configuration for users 2014-08-28 23:04:18 +01:00
Luke Barratt
987a28d7d0 Remove TS3 Password 2014-08-28 23:04:18 +01:00
Luke Barratt
8edceab25c Increase Capybara timeout 2014-08-28 23:04:18 +01:00
Luke Barratt
a534f8acda Added missing env variable for TravicCI 2014-08-28 23:04:18 +01:00
Luke Barratt
976669c96c Get selenium working on travisci 2014-08-28 23:04:18 +01:00
Luke Barratt
086e3ade83 Fixes forum topic ordering by latest post 2014-08-28 23:04:18 +01:00
Luke Barratt
9304d72ee0 Don't bundle for deployment on CI 2014-08-28 23:04:18 +01:00
Luke Barratt
af521fc997 Fixes error when viewing team pages when not logged in 2014-08-28 23:04:17 +01:00
Luke Barratt
ade406e37a Bump rails and puma versions 2014-08-28 23:04:17 +01:00
Luke Barratt
8c4dd7b5e3 Bump ruby to 2.1.2
See:

http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/
2014-08-28 23:04:17 +01:00
Luke Barratt
1f4f26a5c9 Fixes body background 2014-08-28 23:04:17 +01:00
onyxserpent
111da6b5e3 Font changes to forum thread list (theoretically) 2014-08-12 23:30:21 -07:00
onyxserpent
ffccea6c76 Shoutbox rearrangement 2014-08-10 17:07:12 -07:00
onyxserpent
949bf54e8a Shoutbox rearrangement 2014-08-10 17:07:06 -07:00
onyxserpent
7d29079430 Fixed naming conventions 2014-08-10 16:41:32 -07:00
onyxserpent
f3805a5d56 Font changes 2014-08-10 16:39:53 -07:00
onyxserpent
2362961d76 Fixes wrapping issues with small screens/mobile 2014-08-10 16:34:26 -07:00
onyxserpent
45e4a092d4 Font changes 2014-08-10 16:30:21 -07:00
onyxserpent
3b19c18b0f Update _forums.scss
Font face changes
2014-08-10 16:28:52 -07:00
onyxserpent
cb02b292e8 Update _news.scss
Font face changes
2014-08-10 16:28:14 -07:00
onyxserpent
48bb0a7986 Update _variables.scss
Font face changes
2014-08-10 16:25:22 -07:00
onyxserpent
129296c059 Update _typography.scss
Font face changes
2014-08-10 16:20:50 -07:00
Ari Timonen
4f98a0ae04 Fix rules 2014-07-01 14:39:40 +03:00
Ari Timonen
1a02abbf5b Make versions private for privacy reasons 2014-06-10 13:34:43 +03:00
Luke Barratt
b27ef8c465 Fixes linking to latest posts in forums 2014-06-06 22:37:43 +01:00
Luke Barratt
3d6904cd5f Fixes word wrapping issues 2014-06-06 21:10:37 +01:00
Luke Barratt
4b3fc78d49 Properly compile assets 2014-05-30 21:54:01 +01:00