summaryrefslogtreecommitdiff
path: root/app/views
AgeCommit message (Collapse)Author
2014-04-27get the tournament creation page completeLuke Shumaker
2014-04-27Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-27misc form touch-upLuke Shumaker
2014-04-27Work on the tournament creation pageLuke Shumaker
2014-04-27Added a standings view and used spaceships.AndrewMurrell
2014-04-27Even better index page for messages.nfoy
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-26Messages now check if they're read/unread except when creating a message.nfoy
2014-04-26Some shit I didguntasgrewal
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-26Messages is working (besides default permissions)!nfoy
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-26run ./generate.shLuke Shumaker
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-26bracket creation is goodtkimia
2014-04-26Refactored show.html.erb for matchesAndrewMurrell
2014-04-26brackets just get createdtkimia
2014-04-26prelim bracket controltkimia
2014-04-25Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
Conflicts: app/views/matches/show.html.erb
2014-04-25Touch up s/scores/statistics/Luke Shumaker
2014-04-24Mixed things up a bit on the matches controller and show view.AndrewMurrell
2014-04-24Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
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/leaguertkimia
2014-04-24more fixes to the SVGtkimia
2014-04-24Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-24Mailboxer progress without generate changes.nfoy
2014-04-24luke's typo fixtkimia
2014-04-24rename Tournament#tournament_stages to Tournament#stagesLuke Shumaker
2014-04-24do away with stages_orderedLuke 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-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/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-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-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