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

188 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ari Timonen
3c68f3f064 Downgrade ruby for compatibility 2015-04-04 16:44:12 +03:00
Ari Timonen
75658ea983 Fixed rules 2015 2015-04-04 15:49:53 +03:00
Ari Timonen
9f921d60e9 Merge fixes 2015-04-03 23:55:22 +03:00
Ari Timonen
52e840a041 Fix timezone parsing for google calendar 2015-04-02 04:01:41 +03:00
jamal
9642c478bb 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
09669fb7c7 Fix some logic errors with captains 2014-10-13 22:56:40 -04:00
Luke Barratt
e9398fad87 Please please work travis :( 2014-10-12 12:02:13 +01:00
Luke Barratt
978f020833 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
5a696d4bf6 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
984a864a9f Fixes weird inconsistency causing a failed test using poltergeist on timecop 2014-10-12 10:58:52 +01:00
Jamal Fanaian
1af4587ba3 Merge pull request #7 from jamal/develop 
Catch RecordNotFound exception
 2014-10-11 20:22:06 -04:00
jamal
e1b27ba247 Catch RecordNotFound exception 2014-10-11 19:39:14 -04:00
Luke Barratt
c2ab6bac8d Merge remote-tracking branch 'jamal/fix-comm-confirm' into develop 2014-10-11 23:33:04 +01:00
jamal
3ef9c72a4c Add .leave-gather to the command button so it disables the leave confirm dialog 2014-10-11 18:27:45 -04:00
Luke Barratt
0895072845 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
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
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
Luke Barratt
8bed4a1215 Bump docs & build config ruby versions 2014-10-09 23:52:32 +01: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
Luke Barratt
29dc3e0e29 Fixes error when viewing team pages when not logged in 2014-08-28 23:04:17 +01:00
Luke Barratt
277e660717 Bump rails and puma versions 2014-08-28 23:04:17 +01:00
Luke Barratt
4c79ac4a75 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
f287de542b Fixes body background 2014-08-28 23:04:17 +01:00
Luke Barratt
a676d4c423 Added steam profile lookup API endpoint 2014-08-28 22:42:00 +01:00
onyxserpent
2be656bcd1 Font changes to forum thread list (theoretically) 2014-08-12 23:30:21 -07:00
onyxserpent
d28749605b Shoutbox rearrangement 2014-08-10 17:07:12 -07:00
onyxserpent
f3e0e0e71b Shoutbox rearrangement 2014-08-10 17:07:06 -07:00