ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-30 14:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
454 commits 19 branches 0 tags 55 MiB
Commit graph

454 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barratt
d3219d160e 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
8326c81dc5 Fixes weird inconsistency causing a failed test using poltergeist on timecop 2014-10-12 10:58:52 +01:00
Jamal Fanaian
e69f55b409 Merge pull request #7 from jamal/develop 
Catch RecordNotFound exception
 2014-10-11 20:22:06 -04:00
onyxserpent
b5d003855d Kludge fix for boldness 2014-10-11 16:55:09 -07: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
onyxserpent
31cb2ba6a0 Put the bold hack thing here. 2014-10-11 01:26:08 -07:00
onyxserpent
888062726e Actually didn't want the hack here. 2014-10-11 01:25:36 -07:00
onyxserpent
8c8c5b8819 Moved the bold hack to here 2014-10-11 01:15:12 -07:00
onyxserpent
b57c982779 Moving the bold hack 2014-10-11 01:12:32 -07: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
onyxserpent
26cee800f6 Possibly fixing font weight issues in OSX Firefox 2014-10-09 20:28:33 -07:00
onyxserpent
6afa73dc91 Reverting font weight changes 2014-10-09 20:25:35 -07:00
onyxserpent
2269fcbb8a Reverting font weight changes 2014-10-09 20:25:00 -07:00
onyxserpent
cbcf30daff Reverting font weight changes 2014-10-09 20:24:33 -07:00
onyxserpent
fe3424b79a Reverting font weight changes 2014-10-09 20:23:53 -07:00
onyxserpent
e0b6c15c90 Reverting font weight changes 2014-10-09 20:22:53 -07:00
onyxserpent
f5d00cc2fc Reverting font weight changes 2014-10-09 20:20:58 -07:00
onyxserpent
77bff486f0 Reverting font weight changes 2014-10-09 20:19:01 -07:00
onyxserpent
1f954206de Reverting font weight changes 2014-10-09 20:18:13 -07:00
Luke Barratt
73ac7d589b Bump docs & build config ruby versions 2014-10-09 23:52:32 +01:00
onyxserpent
0b843d9fd8 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
3f3e705387 Fixed incorrect font useage 2014-09-29 18:23:26 -07:00
onyxserpent
d13e460bf7 Copying font weight changes 2014-09-29 18:17:35 -07:00
onyxserpent
a765901ab5 Copying font weight changes 2014-09-29 18:16:50 -07:00
onyxserpent
97c664ec81 Copying font weight changes 2014-09-29 18:16:15 -07:00
onyxserpent
9c4631fc23 Copying font weight changes 2014-09-29 18:13:39 -07:00
onyxserpent
819ffb5077 Copying font weight changes 2014-09-29 18:12:43 -07:00
onyxserpent
36dd502310 Copying font weight changes 2014-09-29 18:11:05 -07:00
onyxserpent
5d669ef7f5 Copying font weight changes 2014-09-29 18:10:23 -07:00
onyxserpent
2467c186ff Copying font weight changes 2014-09-29 18:09:26 -07: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