Age | Commit message (Collapse) | Author |
|
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/_form.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/views/matches/show.html.erb
|
|
|
|
|
|
|
|
Conflicts:
app/models/pm.rb
app/views/pms/index.html.erb
app/views/pms/show.html.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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)
|
|
larger tournys.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/models/game.rb
|
|
|
|
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
|
|
|
|
|
|
|
|
|
|
|