summaryrefslogtreecommitdiff
path: root/app/controllers
AgeCommit message (Collapse)Author
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-26Messages is working (besides default permissions)!nfoy
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-26Wrote a script the start the server called start deleted the old one. The ↵guntasgrewal
new one has 2 flag options -c and -s these correspond to starting the console or server respectively.
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-26Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-26Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-26Made tons of red. Scheduling works from lib.AndrewMurrell
2014-04-26run ./generate.shLuke Shumaker
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-26bracket creation is goodtkimia
2014-04-26brackets just get createdtkimia
2014-04-26prelim bracket controltkimia
2014-04-26Added updated Skeleton for match controller.AndrewMurrell
2014-04-24Mixed things up a bit on the matches controller and show view.AndrewMurrell
2014-04-24Merge branch 'clean2'nfoy
Conflicts: app/models/pm.rb app/views/pms/index.html.erb app/views/pms/show.html.erb
2014-04-24run ./generate.shnfoy
2014-04-24Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-24Mailboxer progress without generate changes.nfoy
2014-04-24TOMER WE ADDED YOUR DESIRED 5 TEAM SEEDguntasgrewal
2014-04-24rename Tournament#tournament_stages to Tournament#stagesLuke Shumaker
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-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'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-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-23Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 21:45:53 +0000