Ari Timonen
3f9ca0a4da
Fixed rules 2015
2015-04-04 15:49:53 +03:00
Ari Timonen
0379c0bbcc
Merge fixes
2015-04-03 23:55:22 +03:00
Ari Timonen
f7d7c429da
Fix timezone parsing for google calendar
2015-04-02 04:01:41 +03:00
jamal
d6e0a5d1d1
Revert "Fix some logic errors with captains"
...
Revert "Change Gather style to volunteer captains"
This reverts commits fb7d361
, d8134ca
, and ebd60d1
.
2014-12-08 09:35:40 -05:00
jamal
eee227cef5
Fix some logic errors with captains
2014-10-13 22:56:40 -04:00
Luke Barratt
cd6dcf7d26
Please please work travis :(
2014-10-12 12:02:13 +01:00
Luke Barratt
5664dd7081
Remove hacky before hook. Specify js: :true for javascript driver tests explicitly. Attempt to cache bundler on travis again.
2014-10-12 11:46:58 +01:00
Luke Barratt
4d3ba9e4d1
More travis guesswork :(
...
http://stackoverflow.com/questions/20713471/capybaraelementnotfound-on-all-specs-only-on-travis
2014-10-12 11:29:37 +01:00
Luke Barratt
b798c5b117
Fixes weird inconsistency causing a failed test using poltergeist on timecop
2014-10-12 10:58:52 +01:00
Jamal Fanaian
15763ae538
Merge pull request #7 from jamal/develop
...
Catch RecordNotFound exception
2014-10-11 20:22:06 -04:00
jamal
06f11232da
Catch RecordNotFound exception
2014-10-11 19:39:14 -04:00
Luke Barratt
748df2c0a4
Merge remote-tracking branch 'jamal/fix-comm-confirm' into develop
2014-10-11 23:33:04 +01:00
jamal
ca6630000c
Add .leave-gather to the command button so it disables the leave confirm dialog
2014-10-11 18:27:45 -04:00
Luke Barratt
2ef1b536cd
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
4c7041e4b3
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
59000309db
Bump Ruby and puma versions
2014-09-27 19:58:10 +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
89b3e94728
Update rules article constant
2014-09-27 19:11:19 +01:00
Luke Barratt
94840f5623
Hotfix: Rollback rules url helper
2014-08-29 00:21:23 +01:00
Luke Barratt
a8e6d20027
Hotfix: Rollback rules url helper
2014-08-28 23:43:15 +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
Luke Barratt
4f6cc69611
Added steam profile lookup API endpoint
2014-08-28 22:42:00 +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