summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2014-04-24Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-24TOMER WE ADDED YOUR DESIRED 5 TEAM SEEDguntasgrewal
2014-04-24text in graph is a bit bettertkimia
2014-04-24luke's typo fixtkimia
2014-04-24Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-24rename Tournament#tournament_stages to Tournament#stagesLuke Shumaker
2014-04-24do away with stages_orderedLuke Shumaker
2014-04-24Merge branch 'clean2'Luke Shumaker
2014-04-24run ./generate.shLuke Shumaker
2014-04-24Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
I've been updating the SVG to work for all team_nums in elimination
2014-04-24Added get_riot function which to gather, score, and place members in their ↵DavisLWebb
proper blue/purple teams. Also changed the user view so that once the remote_username for League of Legends was added the button would be removed (since we are only supporting league for the remote_usernames right now)
2014-04-24small visual fixestkimia
2014-04-24Changed the riot api function name and I am committing it now so I never ↵DavisLWebb
have to do it again
2014-04-24Merge branch 'master' of https://github.com/LukeShu/LeaguerDavisLWebb
2014-04-24Refined remote_usernames a bitDavisLWebb
2014-04-24Fixed Scoring for all 1v1 games. Scheduling needs to be fixed to proceed to ↵AndrewMurrell
larger tournys.
2014-04-24Fixed Spacing, Scoring, and began implementing statisticsAndrewMurrell
2014-04-23Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-23andrew wants me to push broken codeLuke Shumaker
2014-04-23Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-23More mailboxer progressnfoy
2014-04-23Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-23The users with permissions to send alerts can now create new alerts.guntasgrewal
2014-04-23Luke made the remote_username stuff workDavisLWebb
2014-04-23Merge branch 'clean2'DavisLWebb
Conflicts: app/models/game.rb
2014-04-23run ./generate.shDavisLWebb
2014-04-23Merge branch 'clean2'DavisLWebb
2014-04-23run ./generate.shDavisLWebb
2014-04-23save before setting settingsAndrewMurrell
2014-04-23Merge branch 'clean2'Luke Shumaker
Conflicts: app/assets/stylesheets/static.css.scss app/controllers/static_controller.rb
2014-04-23run ./generate.shLuke Shumaker
2014-04-23Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-23fix json urlLuke Shumaker
2014-04-23Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-23Beginnings of actual messageboxer apinfoy
2014-04-23simplify a line in tournaments_controllerLuke Shumaker
2014-04-23touch all the javascript files to shut up warningsLuke Shumaker
2014-04-23Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-23tournaments now have their game type when displayed. Not sure why I hadn't ↵tkimia
thought of that earlier
2014-04-23Fixed several user controller errorsDavisLWebb
2014-04-23started with advanced searchtkimia
2014-04-23remove test codeLuke Shumaker
2014-04-23Merge branch 'master' of https://github.com/LukeShu/LeaguerDavisLWebb
2014-04-23Updated remote_usernamesDavisLWebb
2014-04-23tournaments_controller: permit game settings throughLuke Shumaker
2014-04-23tournaments: unify params[:game] and params[:tournament][:game_id]Luke Shumaker
2014-04-23oopsLuke Shumaker
2014-04-23updated views for tournament and seedsAndrewMurrell
2014-04-23Fixed the Damned-able radio buttonsAndrewMurrell
2014-04-23I made a plus icon for a button for adding a thing.AndrewMurrell